From eab06fa3c9928345615cb261a9d70e86b262fd46 Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Tue, 13 Mar 2012 18:01:37 +0000
Subject: Teach globalopt how to evaluate an invoke with a non-void return
 type.

llvm-svn: 152634
---
 llvm/lib/Transforms/IPO/GlobalOpt.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'llvm/lib/Transforms/IPO/GlobalOpt.cpp')

diff --git a/llvm/lib/Transforms/IPO/GlobalOpt.cpp b/llvm/lib/Transforms/IPO/GlobalOpt.cpp
index cd0dcbfe729..a32e5509545 100644
--- a/llvm/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/llvm/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;
   }
-- 
cgit v1.2.3