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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54372 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index c5f4dea0f0f3bd9ba257d61fdce8ca1397fef56c..d15b6cf18bdd77a923eec15e60f168976448132e 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -3586,22 +3586,6 @@ Instruction *InstCombiner::visitAnd(BinaryOperator &I) {
     }
   }
   
-  
-  { // (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)))

diff --git a/test/Transforms/InstCombine/2008-07-08-AndICmp.ll b/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
deleted file mode 100644 (file)
index c600241..0000000
--- a/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
+++ /dev/null
@@ -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
-}