summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Wodnicki <pawel@32bitmicro.com>2012-11-26 16:49:56 +0000
committerPawel Wodnicki <pawel@32bitmicro.com>2012-11-26 16:49:56 +0000
commit077cee586eda8b0edcca1ff07e823104eff718e7 (patch)
tree58dd5a6fb9d56a7585d9a3f88ef2838057d37282
parent12c349d44181f8083ee9120ddd3b2664c0a1fe8f (diff)
downloadllvm-077cee586eda8b0edcca1ff07e823104eff718e7.tar.gz
llvm-077cee586eda8b0edcca1ff07e823104eff718e7.tar.bz2
llvm-077cee586eda8b0edcca1ff07e823104eff718e7.tar.xz
Merging r168186: into the 3.2 release branch.
InstructionSimplify should be able to simplify A+B==B+A to 'true' but wasn't due to the same logic bug that caused PR14361. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168593 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Analysis/InstructionSimplify.cpp16
-rw-r--r--test/Transforms/InstSimplify/compare.ll9
2 files changed, 23 insertions, 2 deletions
diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp
index b3d62487fc..c24c18f807 100644
--- a/lib/Analysis/InstructionSimplify.cpp
+++ b/lib/Analysis/InstructionSimplify.cpp
@@ -2065,8 +2065,20 @@ static Value *SimplifyICmpInst(unsigned Predicate, Value *LHS, Value *RHS,
if (A && C && (A == C || A == D || B == C || B == D) &&
NoLHSWrapProblem && NoRHSWrapProblem) {
// Determine Y and Z in the form icmp (X+Y), (X+Z).
- Value *Y = (A == C || A == D) ? B : A;
- Value *Z = (C == A || C == B) ? D : C;
+ Value *Y, *Z;
+ if (A == C) {
+ Y = B;
+ Z = D;
+ } else if (A == D) {
+ Y = B;
+ Z = C;
+ } else if (B == C) {
+ Y = A;
+ Z = D;
+ } else if (B == D) {
+ Y = A;
+ Z = C;
+ }
if (Value *V = SimplifyICmpInst(Pred, Y, Z, Q, MaxRecurse-1))
return V;
}
diff --git a/test/Transforms/InstSimplify/compare.ll b/test/Transforms/InstSimplify/compare.ll
index ced74bd4be..ce2bb799c8 100644
--- a/test/Transforms/InstSimplify/compare.ll
+++ b/test/Transforms/InstSimplify/compare.ll
@@ -266,6 +266,15 @@ define i1 @add5(i32 %x, i32 %y) {
; CHECK: ret i1 true
}
+define i1 @add6(i64 %A, i64 %B) {
+; CHECK: @add6
+ %s1 = add i64 %A, %B
+ %s2 = add i64 %B, %A
+ %cmp = icmp eq i64 %s1, %s2
+ ret i1 %cmp
+; CHECK: ret i1 true
+}
+
define i1 @addpowtwo(i32 %x, i32 %y) {
; CHECK: @addpowtwo
%l = lshr i32 %x, 1