summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Lin <stephenwlin@gmail.com>2013-07-26 17:55:00 +0000
committerStephen Lin <stephenwlin@gmail.com>2013-07-26 17:55:00 +0000
commit3b6bb79578bcc09b6a588af488da4f6e6d958f01 (patch)
tree09e3f64816aee539acfb2159da3c5d8c5bedb3f3
parentd4afa8bbabd83e2b68afcc61e44fadb9e7964b07 (diff)
downloadllvm-3b6bb79578bcc09b6a588af488da4f6e6d958f01.tar.gz
llvm-3b6bb79578bcc09b6a588af488da4f6e6d958f01.tar.bz2
llvm-3b6bb79578bcc09b6a588af488da4f6e6d958f01.tar.xz
Correct case of m_UIToFp to m_UIToFP to match instruction name, add m_SIToFP for consistency.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187225 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Support/PatternMatch.h9
-rw-r--r--lib/Transforms/InstCombine/InstCombineMulDivRem.cpp8
2 files changed, 12 insertions, 5 deletions
diff --git a/include/llvm/Support/PatternMatch.h b/include/llvm/Support/PatternMatch.h
index 95d9d782ec..35a9c07b75 100644
--- a/include/llvm/Support/PatternMatch.h
+++ b/include/llvm/Support/PatternMatch.h
@@ -696,10 +696,17 @@ m_ZExt(const OpTy &Op) {
/// m_UIToFP
template<typename OpTy>
inline CastClass_match<OpTy, Instruction::UIToFP>
-m_UIToFp(const OpTy &Op) {
+m_UIToFP(const OpTy &Op) {
return CastClass_match<OpTy, Instruction::UIToFP>(Op);
}
+/// m_SIToFP
+template<typename OpTy>
+inline CastClass_match<OpTy, Instruction::SIToFP>
+m_SIToFP(const OpTy &Op) {
+ return CastClass_match<OpTy, Instruction::SIToFP>(Op);
+}
+
//===----------------------------------------------------------------------===//
// Matchers for unary operators
//
diff --git a/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index 780e0eb0dc..cc6a301540 100644
--- a/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -560,10 +560,10 @@ Instruction *InstCombiner::visitFMul(BinaryOperator &I) {
if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
Value *LHS = Op0, *RHS = Op1;
Value *B, *C;
- if (!match(RHS, m_UIToFp(m_Value(C))))
+ if (!match(RHS, m_UIToFP(m_Value(C))))
std::swap(LHS, RHS);
- if (match(RHS, m_UIToFp(m_Value(C))) && C->getType()->isIntegerTy(1)) {
+ if (match(RHS, m_UIToFP(m_Value(C))) && C->getType()->isIntegerTy(1)) {
B = LHS;
Value *Zero = ConstantFP::getNegativeZero(B->getType());
return SelectInst::Create(C, B, Zero);
@@ -574,10 +574,10 @@ Instruction *InstCombiner::visitFMul(BinaryOperator &I) {
if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
Value *LHS = Op0, *RHS = Op1;
Value *A, *C;
- if (!match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))))
+ if (!match(RHS, m_FSub(m_FPOne(), m_UIToFP(m_Value(C)))))
std::swap(LHS, RHS);
- if (match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))) &&
+ if (match(RHS, m_FSub(m_FPOne(), m_UIToFP(m_Value(C)))) &&
C->getType()->isIntegerTy(1)) {
A = LHS;
Value *Zero = ConstantFP::getNegativeZero(A->getType());