mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-08 21:32:39 +00:00
Fix Regression/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll,
and the failure on make_dparser last night. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18766 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
16483e50e2
commit
7613437db9
@ -1164,21 +1164,20 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
|
||||
// is a conditional branch, see if we can hoist any code from this block up
|
||||
// into our predecessor.
|
||||
if (OnlyPred)
|
||||
if (BranchInst *BI = dyn_cast<BranchInst>(OnlyPred->getTerminator())) {
|
||||
// This is guaranteed to be a condbr at this point.
|
||||
assert(BI->isConditional() && "Should have folded bb into pred!");
|
||||
// Get the other block.
|
||||
BasicBlock *OtherBB = BI->getSuccessor(BI->getSuccessor(0) == BB);
|
||||
PI = pred_begin(OtherBB);
|
||||
++PI;
|
||||
if (PI == pred_end(OtherBB)) {
|
||||
// We have a conditional branch to two blocks that are only reachable
|
||||
// from the condbr. We know that the condbr dominates the two blocks,
|
||||
// so see if there is any identical code in the "then" and "else"
|
||||
// blocks. If so, we can hoist it up to the branching block.
|
||||
Changed |= HoistThenElseCodeToIf(BI);
|
||||
if (BranchInst *BI = dyn_cast<BranchInst>(OnlyPred->getTerminator()))
|
||||
if (BI->isConditional()) {
|
||||
// Get the other block.
|
||||
BasicBlock *OtherBB = BI->getSuccessor(BI->getSuccessor(0) == BB);
|
||||
PI = pred_begin(OtherBB);
|
||||
++PI;
|
||||
if (PI == pred_end(OtherBB)) {
|
||||
// We have a conditional branch to two blocks that are only reachable
|
||||
// from the condbr. We know that the condbr dominates the two blocks,
|
||||
// so see if there is any identical code in the "then" and "else"
|
||||
// blocks. If so, we can hoist it up to the branching block.
|
||||
Changed |= HoistThenElseCodeToIf(BI);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)
|
||||
if (BranchInst *BI = dyn_cast<BranchInst>((*PI)->getTerminator()))
|
||||
|
Loading…
x
Reference in New Issue
Block a user