diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-01-20 01:15:41 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-01-20 01:15:41 +0000 |
| commit | 63bf29b5b1c741038d6d502d62721cac0d2760b4 (patch) | |
| tree | ab667f7f63e56198396cd700bd7a440622b7059e | |
| parent | 8289b05c4cc9c41f5c6c2e3807399551f2934fa9 (diff) | |
| download | llvm-63bf29b5b1c741038d6d502d62721cac0d2760b4.tar.gz llvm-63bf29b5b1c741038d6d502d62721cac0d2760b4.tar.bz2 llvm-63bf29b5b1c741038d6d502d62721cac0d2760b4.tar.xz | |
another fix for PR3354
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62561 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 5 | ||||
| -rw-r--r-- | test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 1a4f57320f..d891eebf33 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1559,6 +1559,11 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI) { // fold the conditions into logical ops and one cond br. if (&BB->front() != BI) return false; + + + if (ConstantExpr *CE = dyn_cast<ConstantExpr>(BI->getCondition())) + if (CE->canTrap()) + return false; int PBIOp, BIOp; if (PBI->getSuccessor(0) == BI->getSuccessor(0)) diff --git a/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll b/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll index 0bc6bdb895..1a6f485f66 100644 --- a/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll +++ b/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 2 +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 4 ; PR3354 ; Do not merge bb1 into the entry block, it might trap. @@ -18,3 +18,14 @@ bb6: unwind } +define i32 @test2(i32 %tmp21, i32 %tmp24, i1 %tmp34) { + br i1 %tmp34, label %bb5, label %bb6 + +bb5: ; preds = %bb4 + br i1 icmp sgt (i32 sdiv (i32 32767, i32 0), i32 0), label %bb6, label %bb7 +bb6: + ret i32 42 +bb7: + unwind +} + |