When inserting code, make sure not to insert it before PHI nodes. This

fixes PR612 and Transforms/LowerInvoke/2005-08-03-InvokeWithPHI.ll

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22626 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp
index fe22b4be847985ca30cffa610d9ca45df3d44163..96d5b98c6bdeef5b99efb5b9b3971977b5d6e88a 100644 (file)
--- a/lib/Transforms/Utils/LowerInvoke.cpp
+++ b/lib/Transforms/Utils/LowerInvoke.cpp
@@ -283,7 +283,9 @@ bool LowerInvoke::insertExpensiveEHSupport(Function &F) {
       // Create the receiver block if there is a critical edge to the normal
       // destination.
       SplitCriticalEdge(II, 0, this);
-      Instruction *InsertLoc = II->getNormalDest()->begin();
+      BasicBlock::iterator InsertLoc = II->getNormalDest()->begin();
+      while (isa<PHINode>(InsertLoc)) ++InsertLoc;
+      
 
       // Insert a normal call instruction on the normal execution path.
       std::string Name = II->getName(); II->setName("");