From 7d3b4e92ab1487248b1c164ec53361b5ddb5683a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 16 Nov 2008 03:54:57 +0000 Subject: [PATCH] if we're going to use a macro, use it maximally. no functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59380 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/InstructionCombining.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index c7123637083..16607bd62d5 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -4359,56 +4359,56 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) { // (A & (C0?-1:0)) | (B & ~(C0?-1:0)) -> C0 ? A : B, and commuted variants Value *C0 = 0; - if (match(A, m_Select(m_Value(C0), m_ConstantInt(-1), m_ConstantInt(0)))) { + if (match(A, SELECT_MATCH(C0, -1, 0))) { Value *C1 = 0; if (match(D, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, C, B); if (match(B, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, C, D); } - if (match(B, m_Select(m_Value(C0), m_ConstantInt(-1), m_ConstantInt(0)))) { + if (match(B, SELECT_MATCH(C0, -1, 0))) { Value *C1 = 0; if (match(C, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, A, D); if (match(A, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, C, D); } - if (match(C, m_Select(m_Value(C0), m_ConstantInt(-1), m_ConstantInt(0)))) { + if (match(C, SELECT_MATCH(C0, -1, 0))) { Value *C1 = 0; if (match(D, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, A, B); if (match(B, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, A, D); } - if (match(D, m_Select(m_Value(C0), m_ConstantInt(-1), m_ConstantInt(0)))) { + if (match(D, SELECT_MATCH(C0, -1, 0))) { Value *C1 = 0; if (match(C, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, A, B); if (match(A, m_Not(SELECT_MATCH(C1, -1, 0))) && C1 == C0) return SelectInst::Create(C1, C, B); } - if (match(A, m_Select(m_Value(C0), m_ConstantInt(0), m_ConstantInt(-1)))) { + if (match(A, SELECT_MATCH(C0, 0, -1))) { Value *C1 = 0; if (match(D, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, B, C); if (match(B, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, D, C); } - if (match(B, m_Select(m_Value(C0), m_ConstantInt(0), m_ConstantInt(-1)))) { + if (match(B, SELECT_MATCH(C0, 0, -1))) { Value *C1 = 0; if (match(C, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, D, A); if (match(A, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, D, C); } - if (match(C, m_Select(m_Value(C0), m_ConstantInt(0), m_ConstantInt(-1)))) { + if (match(C, SELECT_MATCH(C0, 0, -1))) { Value *C1 = 0; if (match(D, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, B, A); if (match(B, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, D, A); } - if (match(D, m_Select(m_Value(C0), m_ConstantInt(0), m_ConstantInt(-1)))) { + if (match(D, SELECT_MATCH(C0, 0, -1))) { Value *C1 = 0; if (match(C, m_Not(SELECT_MATCH(C1, 0, -1))) && C1 == C0) return SelectInst::Create(C1, B, A);