Fix bugs in the last change

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

diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp
index 8f69c1ee161ab6e215aac9a0294dbda42499309a..22377b759c8ad3597e48e716632e6c2acefa92e0 100644 (file)
--- a/lib/Transforms/Utils/InlineFunction.cpp
+++ b/lib/Transforms/Utils/InlineFunction.cpp
@@ -68,7 +68,7 @@ bool InlineFunction(CallSite CS) {
     for (BasicBlock::iterator I = InvokeDest->begin();
          PHINode *PN = dyn_cast<PHINode>(I); ++I) {
       // Save the value to use for this edge...
-      InvokeDestPHIValues.push_back(PN->getIncomingValueForBlock(OrigBB));
+      InvokeDestPHIValues.push_back(PN->getIncomingValueForBlock(AfterCallBB));
     }
 
     // Remove (unlink) the InvokeInst from the function...
@@ -252,7 +252,7 @@ bool InlineFunction(CallSite CS) {
     // PHI node) now.
     for (BasicBlock::iterator I = InvokeDest->begin();
          PHINode *PN = dyn_cast<PHINode>(I); ++I)
-      PN->removeIncomingValue(OrigBB);
+      PN->removeIncomingValue(AfterCallBB);
   }
   // Now that the function is correct, make it a little bit nicer.  In
   // particular, move the basic blocks inserted from the end of the function