Fix PR3325, a miscompilation of invokes by IPSCCP.  Patch by Jay Foad!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62244 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index 954bc00..dfb4795 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -1749,8 +1749,7 @@
       } else {
         for (BasicBlock::iterator BI = BB->begin(), E = BB->end(); BI != E; ) {
           Instruction *Inst = BI++;
-          if (Inst->getType() == Type::VoidTy ||
-              isa<TerminatorInst>(Inst))
+          if (Inst->getType() == Type::VoidTy)
             continue;
           
           LatticeVal &IV = Values[Inst];
@@ -1766,7 +1765,7 @@
           Inst->replaceAllUsesWith(Const);
           
           // Delete the instruction.
-          if (!isa<CallInst>(Inst))
+          if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst))
             Inst->eraseFromParent();
 
           // Hey, we just changed something!