From 2295fdc1aeccf061e97c16a3754cf902ba0b9063 Mon Sep 17 00:00:00 2001 From: Yingwei Zheng Date: Tue, 1 Oct 2024 10:47:38 +0800 Subject: [PATCH] [ConstantFPRange] Address review comments. NFC. --- llvm/lib/IR/ConstantFPRange.cpp | 6 +++--- llvm/unittests/IR/ConstantFPRangeTest.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/IR/ConstantFPRange.cpp b/llvm/lib/IR/ConstantFPRange.cpp index 9f9e4f69a4079d..84bad5502a9a45 100644 --- a/llvm/lib/IR/ConstantFPRange.cpp +++ b/llvm/lib/IR/ConstantFPRange.cpp @@ -112,7 +112,7 @@ ConstantFPRange ConstantFPRange::getNonNaN(const fltSemantics &Sem) { /// Return [-inf, V) or [-inf, V] static ConstantFPRange makeLessThan(APFloat V, FCmpInst::Predicate Pred) { const fltSemantics &Sem = V.getSemantics(); - if (!(Pred & FCmpInst::FCMP_OEQ)) { + if (FCmpInst::isFalseWhenEqual(FCmpInst::getOrderedPredicate(Pred))) { if (V.isNegInfinity()) return ConstantFPRange::getEmpty(Sem); V.next(/*nextDown=*/true); @@ -124,7 +124,7 @@ static ConstantFPRange makeLessThan(APFloat V, FCmpInst::Predicate Pred) { /// Return (V, +inf] or [V, +inf] static ConstantFPRange makeGreaterThan(APFloat V, FCmpInst::Predicate Pred) { const fltSemantics &Sem = V.getSemantics(); - if (!(Pred & FCmpInst::FCMP_OEQ)) { + if (FCmpInst::isFalseWhenEqual(FCmpInst::getOrderedPredicate(Pred))) { if (V.isPosInfinity()) return ConstantFPRange::getEmpty(Sem); V.next(/*nextDown=*/false); @@ -136,7 +136,7 @@ static ConstantFPRange makeGreaterThan(APFloat V, FCmpInst::Predicate Pred) { /// Make sure that +0/-0 are both included in the range. static ConstantFPRange extendZeroIfEqual(const ConstantFPRange &CR, FCmpInst::Predicate Pred) { - if (!(Pred & FCmpInst::FCMP_OEQ)) + if (FCmpInst::isFalseWhenEqual(FCmpInst::getOrderedPredicate(Pred))) return CR; APFloat Lower = CR.getLower(); diff --git a/llvm/unittests/IR/ConstantFPRangeTest.cpp b/llvm/unittests/IR/ConstantFPRangeTest.cpp index 1fe9231392d622..17a08207fe1ba0 100644 --- a/llvm/unittests/IR/ConstantFPRangeTest.cpp +++ b/llvm/unittests/IR/ConstantFPRangeTest.cpp @@ -459,7 +459,7 @@ TEST_F(ConstantFPRangeTest, makeAllowedFCmpRegion) { Optimal = Optimal.unionWith(ConstantFPRange(V)); }); - ASSERT_TRUE(Res.contains(Optimal)) + EXPECT_TRUE(Res.contains(Optimal)) << "Wrong result for makeAllowedFCmpRegion(" << Pred << ", " << CR << "). Expected " << Optimal << ", but got " << Res; EXPECT_EQ(Res, Optimal)