aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-06-14 19:45:43 +0000
committerChris Lattner <sabre@nondot.org>2010-06-14 19:45:43 +0000
commite58867e55e472d81bbf5b1d26310a5b3918d2fb6 (patch)
tree923c53da4c118bdfa4116816dc23efd184ab8440
parent12b8bc1b01c53d08d4d2774407035fd483577d7c (diff)
downloadexternal_llvm-e58867e55e472d81bbf5b1d26310a5b3918d2fb6.zip
external_llvm-e58867e55e472d81bbf5b1d26310a5b3918d2fb6.tar.gz
external_llvm-e58867e55e472d81bbf5b1d26310a5b3918d2fb6.tar.bz2
jump threading can't split a critical edge from an indirectbr. This
fixes PR7356. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105950 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Transforms/Scalar/JumpThreading.cpp7
-rw-r--r--test/Transforms/JumpThreading/crash.ll22
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/JumpThreading.cpp b/lib/Transforms/Scalar/JumpThreading.cpp
index 0352c6e..1a64b2c 100644
--- a/lib/Transforms/Scalar/JumpThreading.cpp
+++ b/lib/Transforms/Scalar/JumpThreading.cpp
@@ -870,9 +870,14 @@ bool JumpThreading::SimplifyPartiallyRedundantLoad(LoadInst *LI) {
// Add all the unavailable predecessors to the PredsToSplit list.
for (pred_iterator PI = pred_begin(LoadBB), PE = pred_end(LoadBB);
- PI != PE; ++PI)
+ PI != PE; ++PI) {
+ // If the predecessor is an indirect goto, we can't split the edge.
+ if (isa<IndirectBrInst>((*PI)->getTerminator()))
+ return false;
+
if (!AvailablePredSet.count(*PI))
PredsToSplit.push_back(*PI);
+ }
// Split them out to their own block.
UnavailablePred =
diff --git a/test/Transforms/JumpThreading/crash.ll b/test/Transforms/JumpThreading/crash.ll
index 21620be..378c51a 100644
--- a/test/Transforms/JumpThreading/crash.ll
+++ b/test/Transforms/JumpThreading/crash.ll
@@ -341,3 +341,25 @@ if.end12: ; preds = %if.then, %lbl_51
ret void
}
+
+
+; PR7356
+define i32 @test13(i32* %P, i8* %Ptr) {
+entry:
+ indirectbr i8* %Ptr, [label %BrBlock, label %B2]
+
+B2:
+ store i32 4, i32 *%P
+ br label %BrBlock
+
+BrBlock:
+ %L = load i32* %P
+ %C = icmp eq i32 %L, 42
+ br i1 %C, label %T, label %F
+
+T:
+ ret i32 123
+F:
+ ret i32 1422
+}
+