Speculatively revert r108429 to fix the clang self-host.

[oota-llvm.git] / lib / Transforms / InstCombine / InstCombineAndOrXor.cpp

diff --git a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
index 57cd76dab0925d35be22172867f92d68e1c25972..5876f408343b6ef8f43bbde608980ab7f9849151 100644 (file)
--- a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
+++ b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
@@ -473,7 +473,7 @@ Value *InstCombiner::FoldAndOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
       return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
     }
     
-    // (icmp ne (A & C1) 0) & (icmp ne (A & C2), 0) -->
+    // (icmp ne (A & C1), 0) & (icmp ne (A & C2), 0) -->
     // (icmp eq (A & (C1|C2)), (C1|C2))
     if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
       Instruction *I1 = dyn_cast<Instruction>(Val);
@@ -483,7 +483,8 @@ Value *InstCombiner::FoldAndOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
           I1->getOperand(0) == I1->getOperand(0)) {
         ConstantInt *CI1 = dyn_cast<ConstantInt>(I1->getOperand(1));
         ConstantInt *CI2 = dyn_cast<ConstantInt>(I2->getOperand(1));
-        if (CI1 && CI2) {
+        if (CI1 && !CI1->isZero() && CI2 && !CI2->isZero() &&
+            CI1->getValue().operator&(CI2->getValue()) == 0) {
           Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
           Value *NewAnd = Builder->CreateAnd(I1->getOperand(0), ConstOr);
           return Builder->CreateICmp(ICmpInst::ICMP_EQ, NewAnd, ConstOr);