1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp
index cd0dcbfe72..a32e550954 100644
--- a/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/lib/Transforms/IPO/GlobalOpt.cpp
@@ -2561,11 +2561,6 @@ bool Evaluator::EvaluateBlock(BasicBlock::iterator CurInst,
           return false;
         delete ValueStack.pop_back_val();
         InstResult = RetVal;
-
-        if (InvokeInst *II = dyn_cast<InvokeInst>(CurInst)) {
-          NextBB = II->getNormalDest();
-          return true;
-        }
       }
     } else if (isa<TerminatorInst>(CurInst)) {
       if (BranchInst *BI = dyn_cast<BranchInst>(CurInst)) {
@@ -2610,6 +2605,12 @@ bool Evaluator::EvaluateBlock(BasicBlock::iterator CurInst,
       setVal(CurInst, InstResult);
     }
 
+    // If we just processed an invoke, we finished evaluating the block.
+    if (InvokeInst *II = dyn_cast<InvokeInst>(CurInst)) {
+      NextBB = II->getNormalDest();
+      return true;
+    }
+
     // Advance program counter.
     ++CurInst;
   }