[llvm-branch-commits] [llvm-branch] r168594 - in /llvm/branches/release_32: ./ lib/Analysis/InstructionSimplify.cpp lib/Transforms/InstCombine/InstCombineCompares.cpp

[Pawel Wodnicki]

Author: pawel
Date: Mon Nov 26 10:52:27 2012
New Revision: 168594

URL: http://llvm.org/viewvc/llvm-project?rev=168594&view=rev
Log:
Merging r168196: into the 3.2 release branch.

Make this easier to understand, as suggested by Chandler.

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Analysis/InstructionSimplify.cpp
    llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineCompares.cpp

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 26 10:52:27 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168186,168189,168197-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168035,168181,168186,168189,168196-168198,168227,168280,168291,168316,168319-168320,168346,168352,168354,168361,168364,168512

Modified: llvm/branches/release_32/lib/Analysis/InstructionSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Analysis/InstructionSimplify.cpp?rev=168594&r1=168593&r2=168594&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Analysis/InstructionSimplify.cpp (original)
+++ llvm/branches/release_32/lib/Analysis/InstructionSimplify.cpp Mon Nov 26 10:52:27 2012
@@ -2067,15 +2067,20 @@
       // Determine Y and Z in the form icmp (X+Y), (X+Z).
       Value *Y, *Z;
       if (A == C) {
+        // C + B == C + D  ->  B == D
         Y = B;
         Z = D;
       } else if (A == D) {
+        // D + B == C + D  ->  B == C
         Y = B;
         Z = C;
       } else if (B == C) {
+        // A + C == C + D  ->  A == D
         Y = A;
         Z = D;
-      } else if (B == D) {
+      } else {
+        assert(B == D);
+        // A + D == C + D  ->  A == C
         Y = A;
         Z = C;
       }

Modified: llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineCompares.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=168594&r1=168593&r2=168594&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineCompares.cpp (original)
+++ llvm/branches/release_32/lib/Transforms/InstCombine/InstCombineCompares.cpp Mon Nov 26 10:52:27 2012
@@ -2358,15 +2358,20 @@
       // Determine Y and Z in the form icmp (X+Y), (X+Z).
       Value *Y, *Z;
       if (A == C) {
+        // C + B == C + D  ->  B == D
         Y = B;
         Z = D;
       } else if (A == D) {
+        // D + B == C + D  ->  B == C
         Y = B;
         Z = C;
       } else if (B == C) {
+        // A + C == C + D  ->  A == D
         Y = A;
         Z = D;
-      } else if (B == D) {
+      } else {
+        assert(B == D);
+        // A + D == C + D  ->  A == C
         Y = A;
         Z = C;
       }