Fix SimplifyCFG/2005-12-03-IncorrectPHIFold.ll

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24581 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-12-03 18:25:58 +00:00
parent 9e6924fc0f
commit 8e75ee212f

View File

@ -82,7 +82,7 @@ static bool CanPropagatePredecessorsForPHIs(BasicBlock *BB, BasicBlock *Succ) {
// //
if (isa<PHINode>(Succ->front())) { if (isa<PHINode>(Succ->front())) {
std::set<BasicBlock*> BBPreds(pred_begin(BB), pred_end(BB)); std::set<BasicBlock*> BBPreds(pred_begin(BB), pred_end(BB));
for (pred_iterator PI = pred_begin(Succ), PE = pred_end(Succ);\ for (pred_iterator PI = pred_begin(Succ), PE = pred_end(Succ);
PI != PE; ++PI) PI != PE; ++PI)
if (std::find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) { if (std::find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) {
// Loop over all of the PHI nodes checking to see if there are // Loop over all of the PHI nodes checking to see if there are
@ -115,19 +115,25 @@ static bool CanPropagatePredecessorsForPHIs(BasicBlock *BB, BasicBlock *Succ) {
} }
if (IsSafe) return true; if (IsSafe) return true;
// If the PHI nodes in BB are only used by instructions in Succ, we are ok. // If the PHI nodes in BB are only used by instructions in Succ, we are ok if
IsSafe = true; // BB and Succ have no common predecessors.
for (BasicBlock::iterator I = BB->begin(); isa<PHINode>(I) && IsSafe; ++I) { for (BasicBlock::iterator I = BB->begin(); isa<PHINode>(I) && IsSafe; ++I) {
PHINode *PN = cast<PHINode>(I); PHINode *PN = cast<PHINode>(I);
for (Value::use_iterator UI = PN->use_begin(), E = PN->use_end(); UI != E; for (Value::use_iterator UI = PN->use_begin(), E = PN->use_end(); UI != E;
++UI) ++UI)
if (cast<Instruction>(*UI)->getParent() != Succ) { if (cast<Instruction>(*UI)->getParent() != Succ)
IsSafe = false; return false;
break;
}
} }
return IsSafe; // Scan the predecessor sets of BB and Succ, making sure there are no common
// predecessors. Common predecessors would cause us to build a phi node with
// differing incoming values, which is not legal.
std::set<BasicBlock*> BBPreds(pred_begin(BB), pred_end(BB));
for (pred_iterator PI = pred_begin(Succ), E = pred_end(Succ); PI != E; ++PI)
if (BBPreds.count(*PI))
return false;
return true;
} }
/// TryToSimplifyUncondBranchFromEmptyBlock - BB contains an unconditional /// TryToSimplifyUncondBranchFromEmptyBlock - BB contains an unconditional