diff options
| -rw-r--r-- | include/llvm/CodeGen/MachineBasicBlock.h | 6 | ||||
| -rw-r--r-- | lib/CodeGen/MachineBasicBlock.cpp | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index 023f9b6564..7e3ce6bd7c 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -327,9 +327,9 @@ public: /// 'Old', change the code and CFG so that it branches to 'New' instead. void ReplaceUsesOfBlockWith(MachineBasicBlock *Old, MachineBasicBlock *New); - /// BranchesToLandingPad - The basic block branches only to a landing pad or - /// to another basic block which branches only to a landing pad. No other - /// instructions are present other than the unconditional branch. + /// BranchesToLandingPad - The basic block is a landing pad or branches only + /// to a landing pad. No other instructions are present other than the + /// unconditional branch. bool BranchesToLandingPad(const MachineBasicBlock *MBB) const; /// CorrectExtraCFGEdges - Various pieces of code can cause excess edges in diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp index 684af34494..7ce723e019 100644 --- a/lib/CodeGen/MachineBasicBlock.cpp +++ b/lib/CodeGen/MachineBasicBlock.cpp @@ -449,24 +449,19 @@ void MachineBasicBlock::ReplaceUsesOfBlockWith(MachineBasicBlock *Old, addSuccessor(New); } -/// BranchesToLandingPad - The basic block branches only to a landing pad or to -/// another basic block which branches only to a landing pad. No other -/// instructions are present other than the unconditional branch. +/// BranchesToLandingPad - The basic block is a landing pad or branches only to +/// a landing pad. No other instructions are present other than the +/// unconditional branch. bool MachineBasicBlock::BranchesToLandingPad(const MachineBasicBlock *MBB) const { SmallSet<const MachineBasicBlock*, 32> Visited; const MachineBasicBlock *CurMBB = MBB; - while (!Visited.count(CurMBB) && !CurMBB->isLandingPad()) { - if (CurMBB->size() != 1 || CurMBB->succ_empty() || CurMBB->succ_size() != 1) + while (!CurMBB->isLandingPad()) { + if (CurMBB->succ_size() != 1) break; - const TargetInstrInfo *TII = - CurMBB->getParent()->getTarget().getInstrInfo(); - if (!TII->isUnpredicatedTerminator(CurMBB->begin())) - break; - - Visited.insert(CurMBB); + if (!Visited.insert(CurMBB)) break; CurMBB = *CurMBB->succ_begin(); } @@ -516,8 +511,8 @@ bool MachineBasicBlock::CorrectExtraCFGEdges(MachineBasicBlock *DestA, } else if (MBB == DestB) { DestB = 0; ++SI; - } else if (BranchesToLandingPad(MBB) && - MBB != OrigDestA && MBB != OrigDestB) { + } else if (MBB != OrigDestA && MBB != OrigDestB && + BranchesToLandingPad(MBB)) { ++SI; } else { // Otherwise, this is a superfluous edge, remove it. |