diff options
| -rw-r--r-- | lib/Transforms/Scalar/InstructionCombining.cpp | 22 | ||||
| -rw-r--r-- | test/Transforms/InstCombine/and-not-or.ll | 4 |
2 files changed, 7 insertions, 19 deletions
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 11c5f75297..bc8744480c 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -3980,22 +3980,12 @@ Instruction *InstCombiner::visitAnd(BinaryOperator &I) { } // (A&((~A)|B)) -> A&B - if (match(Op0, m_Or(m_Not(m_Value(A)), m_Value(B)))) { - if (A == Op1) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op0, m_Or(m_Value(A), m_Not(m_Value(B))))) { - if (B == Op1) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op1, m_Or(m_Not(m_Value(A)), m_Value(B)))) { - if (A == Op0) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op1, m_Or(m_Value(A), m_Not(m_Value(B))))) { - if (B == Op0) - return BinaryOperator::CreateAnd(A, B); - } + if (match(Op0, m_Or(m_Not(m_Specific(Op1)), m_Value(A))) || + match(Op0, m_Or(m_Value(A), m_Not(m_Specific(Op1))))) + return BinaryOperator::CreateAnd(A, Op1); + if (match(Op1, m_Or(m_Not(m_Specific(Op0)), m_Value(A))) || + match(Op1, m_Or(m_Value(A), m_Not(m_Specific(Op0))))) + return BinaryOperator::CreateAnd(A, Op0); } if (ICmpInst *RHS = dyn_cast<ICmpInst>(Op1)) { diff --git a/test/Transforms/InstCombine/and-not-or.ll b/test/Transforms/InstCombine/and-not-or.ll index b183b216e9..9e9f397c4b 100644 --- a/test/Transforms/InstCombine/and-not-or.ll +++ b/test/Transforms/InstCombine/and-not-or.ll @@ -1,6 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %y, %x} | count 2 -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %x, %y} | count 2 -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor} +; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %x, %y} | count 4 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {or} define i32 @func1(i32 %x, i32 %y) nounwind { |