From 5078f94690ec346b97b30c6b3d4a0f74d7ab1349 Mon Sep 17 00:00:00 2001 From: Chuang-Yu Cheng Date: Fri, 17 Jun 2016 00:04:39 +0000 Subject: [PATCH] Use m_APInt in SimplifyCFG Switch from m_Constant to m_APInt per David's request. NFC. Author: Thomas Jablin (tjablin) Reviewers: majnemer cycheng http://reviews.llvm.org/D21440 llvm-svn: 272977 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 4f0dc5a6b35d..43e823d601e4 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -442,7 +442,7 @@ private: } Value *RHSVal; - ConstantInt *RHSC; + const APInt *RHSC; // Pattern match a special case // (x & ~2^z) == y --> x == y || x == y|2^z @@ -487,8 +487,8 @@ private: ); */ if (match(ICI->getOperand(0), - m_And(m_Value(RHSVal), m_ConstantInt(RHSC)))) { - APInt Mask = ~RHSC->getValue(); + m_And(m_Value(RHSVal), m_APInt(RHSC)))) { + APInt Mask = ~*RHSC; if (Mask.isPowerOf2() && (C->getValue() & ~Mask) == C->getValue()) { // If we already have a value for the switch, it has to match! if (!setValueOnce(RHSVal)) @@ -519,8 +519,8 @@ private: // Shift the range if the compare is fed by an add. This is the range // compare idiom as emitted by instcombine. Value *CandidateVal = I->getOperand(0); - if (match(I->getOperand(0), m_Add(m_Value(RHSVal), m_ConstantInt(RHSC)))) { - Span = Span.subtract(RHSC->getValue()); + if (match(I->getOperand(0), m_Add(m_Value(RHSVal), m_APInt(RHSC)))) { + Span = Span.subtract(*RHSC); CandidateVal = RHSVal; }