aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-01-14 21:01:16 +0000
committerChris Lattner <sabre@nondot.org>2009-01-14 21:01:16 +0000
commitc27ce6ddecba8c91571cc94eecd94ea67e9b1f40 (patch)
treeac3c07b17ce2fe308142012d9033743588d4749d /lib/Transforms
parentd6f9e27952ecbd415c83c9005b8eca21b7587935 (diff)
downloadexternal_llvm-c27ce6ddecba8c91571cc94eecd94ea67e9b1f40.zip
external_llvm-c27ce6ddecba8c91571cc94eecd94ea67e9b1f40.tar.gz
external_llvm-c27ce6ddecba8c91571cc94eecd94ea67e9b1f40.tar.bz2
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
Diffstat (limited to 'lib/Transforms')
-rw-r--r--lib/Transforms/Scalar/SCCP.cpp5
1 files changed, 2 insertions, 3 deletions
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 @@ bool IPSCCP::runOnModule(Module &M) {
} 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 @@ bool IPSCCP::runOnModule(Module &M) {
Inst->replaceAllUsesWith(Const);
// Delete the instruction.
- if (!isa<CallInst>(Inst))
+ if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst))
Inst->eraseFromParent();
// Hey, we just changed something!