diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2009-11-17 20:46:00 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2009-11-17 20:46:00 +0000 |
| commit | 82ef39981df3f6d75e2ba52517452ff8df4a8415 (patch) | |
| tree | 63999011492d0083fe71726cebdb08a74aff746e /lib | |
| parent | 0a4f0a3bd881d83fed218587dbe0d1beb885b7a3 (diff) | |
| download | external_llvm-82ef39981df3f6d75e2ba52517452ff8df4a8415.zip external_llvm-82ef39981df3f6d75e2ba52517452ff8df4a8415.tar.gz external_llvm-82ef39981df3f6d75e2ba52517452ff8df4a8415.tar.bz2 | |
Never call UpdateTerminator() when AnalyzeBranch would fail.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89139 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/PHIElimination.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp index fc65742..bd716c2 100644 --- a/lib/CodeGen/PHIElimination.cpp +++ b/lib/CodeGen/PHIElimination.cpp @@ -445,9 +445,21 @@ bool llvm::PHIElimination::isLiveIn(unsigned Reg, const MachineBasicBlock &MBB, MachineBasicBlock *PHIElimination::SplitCriticalEdge(MachineBasicBlock *A, MachineBasicBlock *B) { assert(A && B && "Missing MBB end point"); - ++NumSplits; MachineFunction *MF = A->getParent(); + + // We may need to update A's terminator, but we can't do that if AnalyzeBranch + // fails. + if (A->isLayoutSuccessor(B)) { + const TargetInstrInfo *TII = MF->getTarget().getInstrInfo(); + MachineBasicBlock *TBB = 0, *FBB = 0; + SmallVector<MachineOperand, 4> Cond; + if (!TII->AnalyzeBranch(*A, TBB, FBB, Cond)) + return NULL; + } + + ++NumSplits; + MachineBasicBlock *NMBB = MF->CreateMachineBasicBlock(); MF->push_back(NMBB); DEBUG(errs() << "PHIElimination splitting critical edge:" |