[llvm-commits] [llvm] r54372 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/2008-07-08-AndICmp.ll

[Bill Wendling]

Author: void
Date: Tue Aug  5 16:23:45 2008
New Revision: 54372

URL: http://llvm.org/viewvc/llvm-project?rev=54372&view=rev
Log:
Revert r53282. This was causing a miscompile on Linux. Also, the transformation
looks bogus. Please see PR2629 for details on why this is breaking things.

Removed:
    llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54372&r1=54371&r2=54372&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Aug  5 16:23:45 2008
@@ -3586,22 +3586,6 @@
     }
   }
   
-  
-  { // (icmp ugt/ult A, C) & (icmp B, C) --> (icmp (A|B), C)
-    // where C is a power of 2
-    Value *A, *B;
-    ConstantInt *C1, *C2;
-    ICmpInst::Predicate LHSCC, RHSCC;
-    if (match(&I, m_And(m_ICmp(LHSCC, m_Value(A), m_ConstantInt(C1)),
-                        m_ICmp(RHSCC, m_Value(B), m_ConstantInt(C2)))))
-      if (C1 == C2 && LHSCC == RHSCC && C1->getValue().isPowerOf2() &&
-          (LHSCC == ICmpInst::ICMP_ULT || LHSCC == ICmpInst::ICMP_UGT)) {
-        Instruction *NewOr = BinaryOperator::CreateOr(A, B);
-        InsertNewInstBefore(NewOr, I);
-        return new ICmpInst(LHSCC, NewOr, C1);
-      }
-  }
-
   if (ICmpInst *RHS = dyn_cast<ICmpInst>(Op1)) {
     // (icmp1 A, B) & (icmp2 A, B) --> (icmp3 A, B)
     if (Instruction *R = AssociativeOpt(I, FoldICmpLogical(*this, RHS)))

Removed: llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll?rev=54371&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll (removed)
@@ -1,10 +0,0 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep icmp | count 1
-; PR2330
-
-define i1 @foo(i32 %a, i32 %b) nounwind {
-entry:
-	icmp ult i32 %a, 8		; <i1>:0 [#uses=1]
-	icmp ult i32 %b, 8		; <i1>:1 [#uses=1]
-	and i1 %1, %0		; <i1>:2 [#uses=1]
-	ret i1 %2
-}