summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-03-25 00:28:58 +0000
committerChris Lattner <sabre@nondot.org>2009-03-25 00:28:58 +0000
commitc3b2111d975a39d19f0c5d635e2961a4449c5a71 (patch)
tree726ceba3a0f1071e13a4d8b6daaaaabfbbbc83d8
parenta6e85a19c6eb96ced06abec12fdfc75e4df0fad5 (diff)
downloadbcm5719-llvm-c3b2111d975a39d19f0c5d635e2961a4449c5a71.tar.gz
bcm5719-llvm-c3b2111d975a39d19f0c5d635e2961a4449c5a71.zip
Fix PR3874 by restoring a condition I removed, but making it more
precise than it used to be. llvm-svn: 67662
-rw-r--r--llvm/lib/Transforms/Scalar/InstructionCombining.cpp3
-rw-r--r--llvm/test/Transforms/InstCombine/2009-03-24-InfLoop.ll9
2 files changed, 11 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
index f631d614573..1f80444632d 100644
--- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -6582,7 +6582,8 @@ Instruction *InstCombiner::visitICmpInstWithInstAndIntCst(ICmpInst &ICI,
// preferable because it allows the C<<Y expression to be hoisted out
// of a loop if Y is invariant and X is not.
if (Shift && Shift->hasOneUse() && RHSV == 0 &&
- ICI.isEquality() && !Shift->isArithmeticShift()) {
+ ICI.isEquality() && !Shift->isArithmeticShift() &&
+ !isa<Constant>(Shift->getOperand(0))) {
// Compute C << Y.
Value *NS;
if (Shift->getOpcode() == Instruction::LShr) {
diff --git a/llvm/test/Transforms/InstCombine/2009-03-24-InfLoop.ll b/llvm/test/Transforms/InstCombine/2009-03-24-InfLoop.ll
new file mode 100644
index 00000000000..6d5a7bf77d2
--- /dev/null
+++ b/llvm/test/Transforms/InstCombine/2009-03-24-InfLoop.ll
@@ -0,0 +1,9 @@
+; PR3874
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis
+ define i1 @test(i32 %x) {
+ %A = lshr i32 3968, %x
+ %B = and i32 %A, 1
+ %C = icmp eq i32 %B, 0
+ ret i1 %C
+ }
+
OpenPOWER on IntegriCloud