Allow folding of basic blocks that have PHI nodes in them, fixing "bug":

test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3128 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-07-29 21:26:30 +00:00
parent 781e6f5f89
commit 91b65c0b42

View File

@ -143,7 +143,7 @@ bool SimplifyCFG(BasicBlock *BB) {
// pred, and if there is only one distinct successor of the predecessor, and
// if there are no PHI nodes.
//
if (!isa<PHINode>(BB->front()) && !BB->hasConstantReferences()) {
if (!BB->hasConstantReferences()) {
pred_iterator PI(pred_begin(BB)), PE(pred_end(BB));
BasicBlock *OnlyPred = *PI++;
for (; PI != PE; ++PI) // Search all predecessors, see if they are all same
@ -168,6 +168,16 @@ bool SimplifyCFG(BasicBlock *BB) {
//cerr << "Merging: " << BB << "into: " << OnlyPred;
TerminatorInst *Term = OnlyPred->getTerminator();
// Resolve any PHI nodes at the start of the block. They are all
// guaranteed to have exactly one entry if they exist.
//
while (PHINode *PN = dyn_cast<PHINode>(&BB->front())) {
assert(PN->getNumIncomingValues() == 1 && "Only one pred!");
PN->replaceAllUsesWith(PN->getIncomingValue(0));
BB->getInstList().pop_front(); // Delete the phi node...
}
// Delete the unconditional branch from the predecessor...
OnlyPred->getInstList().pop_back();