The correct fix for PR612, which also fixes

Transforms/LowerInvoke/2005-08-03-InvokeWithPHIUse.ll


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22628 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-08-03 18:51:44 +00:00
parent 999b814a6d
commit f1adce42b2

View File

@ -283,10 +283,20 @@ bool LowerInvoke::insertExpensiveEHSupport(Function &F) {
// Create the receiver block if there is a critical edge to the normal
// destination.
SplitCriticalEdge(II, 0, this);
BasicBlock::iterator InsertLoc = II->getNormalDest()->begin();
while (isa<PHINode>(InsertLoc)) ++InsertLoc;
// There should not be any PHI nodes in II->getNormalDest() now. It has
// a single predecessor, so any PHI nodes are unneeded. Remove them now
// by replacing them with their single input value.
assert(II->getNormalDest()->getSinglePredecessor() &&
"Split crit edge doesn't have a single predecessor!");
BasicBlock::iterator InsertLoc = II->getNormalDest()->begin();
while (PHINode *PN = dyn_cast<PHINode>(InsertLoc)) {
PN->replaceAllUsesWith(PN->getIncomingValue(0));
PN->eraseFromParent();
InsertLoc = II->getNormalDest()->begin();
}
// Insert a normal call instruction on the normal execution path.
std::string Name = II->getName(); II->setName("");
CallInst *NewCall = new CallInst(II->getCalledValue(),