Speculatively revert r108614, "Another attempt at getting the clang self-host to

like my instcombine patch.", in an attempt to fix Clang i386 bootstrap.
 - Also PR7719.

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

diff --git a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
index 35b55428f0c80e6733fdc46f1bb0bdc2ae78f083..3f4a857c41a5ad53ee9b1ba854c99688b9eea215 100644 (file)
--- a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
+++ b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
@@ -472,22 +472,6 @@ Value *InstCombiner::FoldAndOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
       Value *NewOr = Builder->CreateOr(Val, Val2);
       return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
     }
-    
-    // (icmp ne (A & C1), 0) & (icmp ne (A & C2), 0) -->
-    // (icmp eq (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
-    if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
-      Value *Op1 = 0, *Op2 = 0;
-      ConstantInt *CI1 = 0, *CI2 = 0;
-      if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
-          match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
-        if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
-            CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
-          Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
-          Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
-          return Builder->CreateICmp(ICmpInst::ICMP_EQ, NewAnd, ConstOr);
-        }
-      }
-    }
   }
   
   // From here on, we only handle:
@@ -1174,22 +1158,6 @@ Value *InstCombiner::FoldOrOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
     return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
   }
   
-  // (icmp eq (A & C1), 0) | (icmp eq (A & C2), 0) -->
-  // (icmp ne (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
-  if (LHSCC == ICmpInst::ICMP_EQ && LHSCst->isZero()) {
-    Value *Op1 = 0, *Op2 = 0;
-    ConstantInt *CI1 = 0, *CI2 = 0;
-    if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
-        match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
-      if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
-          CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
-        Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
-        Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
-        return Builder->CreateICmp(ICmpInst::ICMP_NE, NewAnd, ConstOr);
-      }
-    }
-  }
-  
   // From here on, we only handle:
   //    (icmp1 A, C1) | (icmp2 A, C2) --> something simpler.
   if (Val != Val2) return 0;

diff --git a/test/Transforms/InstCombine/bit-checks.ll b/test/Transforms/InstCombine/bit-checks.ll
deleted file mode 100644 (file)
index d774c09..0000000
--- a/test/Transforms/InstCombine/bit-checks.ll
+++ /dev/null
@@ -1,26 +0,0 @@
-; This test makes sure that these instructions are properly eliminated.
-;
-; RUN: opt < %s -instcombine -S | \
-; RUN:    not grep {tobool}
-; END.
-define i32 @main(i32 %argc, i8** %argv) nounwind ssp {
-entry:
-  %and = and i32 %argc, 1                         ; <i32> [#uses=1]
-  %tobool = icmp ne i32 %and, 0                   ; <i1> [#uses=1]
-  %and2 = and i32 %argc, 2                        ; <i32> [#uses=1]
-  %tobool3 = icmp ne i32 %and2, 0                 ; <i1> [#uses=1]
-  %or.cond = and i1 %tobool, %tobool3             ; <i1> [#uses=1]
-  %retval.0 = select i1 %or.cond, i32 2, i32 1    ; <i32> [#uses=1]
-  ret i32 %retval.0
-}
-
-define i32 @main2(i32 %argc, i8** nocapture %argv) nounwind readnone ssp {
-entry:
-  %and = and i32 %argc, 1                         ; <i32> [#uses=1]
-  %tobool = icmp eq i32 %and, 0                   ; <i1> [#uses=1]
-  %and2 = and i32 %argc, 2                        ; <i32> [#uses=1]
-  %tobool3 = icmp eq i32 %and2, 0                 ; <i1> [#uses=1]
-  %or.cond = or i1 %tobool, %tobool3              ; <i1> [#uses=1]
-  %storemerge = select i1 %or.cond, i32 0, i32 1  ; <i32> [#uses=1]
-  ret i32 %storemerge
-}
\ No newline at end of file