From df4881c68a4b738d3acf4c528067703699379641 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 31 Mar 2009 08:42:40 +0000 Subject: [PATCH] Really temporarily revert r68073. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68100 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/MachineBasicBlock.h | 9 --------- lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp | 7 +------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index f962273d2be..1ba7e798f83 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -253,15 +253,6 @@ public: /// it returns end() iterator getFirstTerminator(); - /// isOnlyReachableViaFallthough - Return true if this basic block has - /// exactly one predecessor and the control transfer mechanism between - /// the predecessor and this block is a fall-through. - bool isOnlyReachableByFallthrough() const { - return !pred_empty() && - next(pred_begin()) == pred_end() && - (*pred_begin())->getFirstTerminator() == (*pred_begin())->end(); - } - void pop_front() { Insts.pop_front(); } void pop_back() { Insts.pop_back(); } void push_back(MachineInstr *MI) { Insts.push_back(MI); } diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index d8a33957d5c..3bdcf88365f 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -238,12 +238,7 @@ bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) { for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E; ++I) { // Print a label for the basic block. - if (!VerboseAsm && (I->pred_empty() || I->isOnlyReachableByFallthrough())) { - // This is an entry block or a block that's only reachable via a - // fallthrough edge. In non-VerboseAsm mode, don't print the label. - assert((I->pred_empty() || (*I->pred_begin())->isLayoutSuccessor(I)) && - "Fall-through predecessor not adjacent to its successor!"); - } else { + if (!I->pred_empty()) { printBasicBlockLabel(I, true, true, VerboseAsm); O << '\n'; }