diff options
| -rw-r--r-- | include/llvm/CodeGen/MachineBasicBlock.h | 4 | ||||
| -rw-r--r-- | lib/CodeGen/BranchFolding.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index ed2219b..1cb6e0b 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -165,10 +165,6 @@ public: /// this basic block is entered via an exception handler. void setIsLandingPad() { IsLandingPad = true; } - /// isAccessable - Returns true if the block is alive. That is, if it has - /// predecessors or is an eh landing pad. - bool isAccessable() const { return !pred_empty() || isLandingPad(); } - // Code Layout methods. /// moveBefore/moveAfter - move 'this' block before or after the specified diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 6c04341..d6bedb8 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -67,7 +67,7 @@ FunctionPass *llvm::createBranchFoldingPass() { return new BranchFolder(); } /// RemoveDeadBlock - Remove the specified dead machine basic block from the /// function, updating the CFG. void BranchFolder::RemoveDeadBlock(MachineBasicBlock *MBB) { - assert(!MBB->isAccessable() && "MBB must be dead!"); + assert(MBB->pred_empty() && "MBB must be dead!"); DOUT << "\nRemoving MBB: " << *MBB; MachineFunction *MF = MBB->getParent(); @@ -440,7 +440,7 @@ bool BranchFolder::OptimizeBranches(MachineFunction &MF) { OptimizeBlock(MBB); // If it is dead, remove it. - if (!MBB->isAccessable()) { + if (MBB->pred_empty()) { RemoveDeadBlock(MBB); MadeChange = true; ++NumDeadBlocks; @@ -618,14 +618,14 @@ void BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) { // explicitly. if (MBB->empty()) { // Dead block? Leave for cleanup later. - if (!MBB->isAccessable()) return; + if (MBB->pred_empty()) return; if (FallThrough == MBB->getParent()->end()) { // TODO: Simplify preds to not branch here if possible! } else { // Rewrite all predecessors of the old block to go to the fallthrough // instead. - while (MBB->isAccessable()) { + while (!MBB->pred_empty()) { MachineBasicBlock *Pred = *(MBB->pred_end()-1); ReplaceUsesOfBlockWith(Pred, MBB, FallThrough, TII); } |