Revert r108136 until I figure out why it broke selfhost.

llvm-svn: 108139

1 files changed, 0 insertions, 17 deletions

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
index 3bfeba11cc2..8586054fce0 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
@@ -1584,14 +1584,6 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
     if ((match(A, m_Not(m_Specific(B))) &&
          match(D, m_Not(m_Specific(C)))))
       return BinaryOperator::CreateXor(C, B);
-
-    // (A & ~C) | (B & C) -> ((B ^ A) & C) ^ A
-    if (Op0->hasOneUse() && Op1->hasOneUse() &&
-        match(C, m_Not(m_Specific(D)))) {
-      Value *Xor = Builder->CreateXor(B, A, "xor");
-      Value *And = Builder->CreateAnd(Xor, D, "and");
-      return BinaryOperator::CreateXor(And, A);
-    }
   }
   
   // (X >> Z) | (Y >> Z)  -> (X|Y) >> Z  for all shifts.
@@ -1928,15 +1920,6 @@ Instruction *InstCombiner::visitXor(BinaryOperator &I) {
         return BinaryOperator::CreateAnd(NewOp, X);
       }
     }
-
-    // (A & ~C) ^ (B & C) -> ((B ^ A) & C) ^ A
-    if (Op0->hasOneUse() && Op1->hasOneUse() &&
-        match(Op0I, m_And(m_Value(A), m_Not(m_Value(D)))) &&
-        match(Op1I, m_And(m_Value(B), m_Value(D)))) {
-      Value *Xor = Builder->CreateXor(B, A, "xor");
-      Value *And = Builder->CreateAnd(Xor, D, "and");
-      return BinaryOperator::CreateXor(And, A);
-    }
   }
     
   // (icmp1 A, B) ^ (icmp2 A, B) --> (icmp3 A, B)