diff options
| -rw-r--r-- | llvm/include/llvm/ADT/APInt.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp | 2 | ||||
| -rw-r--r-- | llvm/unittests/ADT/APIntTest.cpp | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/llvm/include/llvm/ADT/APInt.h b/llvm/include/llvm/ADT/APInt.h index 699f429fd3c..8adbfdfeecb 100644 --- a/llvm/include/llvm/ADT/APInt.h +++ b/llvm/include/llvm/ADT/APInt.h @@ -1934,8 +1934,8 @@ inline bool isMask(const APInt &Value) { /// \brief Return true if the argument APInt value contains a sequence of ones /// with the remainder zero. -inline bool isShiftedMask(unsigned numBits, const APInt &APIVal) { - return isMask(numBits, (APIVal - APInt(numBits, 1)) | APIVal); +inline bool isShiftedMask(const APInt &APIVal) { + return (APIVal != 0) && isMask((APIVal - 1) | APIVal); } /// \brief Compute GCD of two APInt values. diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp index 13f3f31fdf9..2c6a455483d 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp @@ -309,7 +309,7 @@ Value *InstCombiner::insertRangeTest(Value *V, const APInt &Lo, const APInt &Hi, static bool isRunOfOnes(ConstantInt *Val, uint32_t &MB, uint32_t &ME) { const APInt& V = Val->getValue(); uint32_t BitWidth = Val->getType()->getBitWidth(); - if (!APIntOps::isShiftedMask(BitWidth, V)) return false; + if (!APIntOps::isShiftedMask(V)) return false; // look for the first zero bit after the run of ones MB = BitWidth - ((V - 1) ^ V).countLeadingZeros(); diff --git a/llvm/unittests/ADT/APIntTest.cpp b/llvm/unittests/ADT/APIntTest.cpp index 51c6347cbe8..bf7d8d83339 100644 --- a/llvm/unittests/ADT/APIntTest.cpp +++ b/llvm/unittests/ADT/APIntTest.cpp @@ -1576,26 +1576,26 @@ TEST(APIntTest, isMask) { } TEST(APIntTest, isShiftedMask) { - EXPECT_FALSE(APIntOps::isShiftedMask(32, APInt(32, 0x01010101))); - EXPECT_TRUE(APIntOps::isShiftedMask(32, APInt(32, 0xf0000000))); - EXPECT_TRUE(APIntOps::isShiftedMask(32, APInt(32, 0xffff0000))); - EXPECT_FALSE(APIntOps::isShiftedMask(32, APInt(32, 0xff << 1))); // BUG + EXPECT_FALSE(APIntOps::isShiftedMask(APInt(32, 0x01010101))); + EXPECT_TRUE(APIntOps::isShiftedMask(APInt(32, 0xf0000000))); + EXPECT_TRUE(APIntOps::isShiftedMask(APInt(32, 0xffff0000))); + EXPECT_TRUE(APIntOps::isShiftedMask(APInt(32, 0xff << 1))); for (int N : { 1, 2, 3, 4, 7, 8, 16, 32, 64, 127, 128, 129, 256 }) { - EXPECT_TRUE(APIntOps::isShiftedMask(N, APInt(N, 0))); // BUG + EXPECT_FALSE(APIntOps::isShiftedMask(APInt(N, 0))); APInt One(N, 1); for (int I = 1; I < N; ++I) { APInt MaskVal = One.shl(I) - 1; - EXPECT_FALSE(APIntOps::isShiftedMask(N, MaskVal)); // BUG + EXPECT_TRUE(APIntOps::isShiftedMask(MaskVal)); } for (int I = 1; I < N - 1; ++I) { APInt MaskVal = One.shl(I); - EXPECT_FALSE(APIntOps::isShiftedMask(N, MaskVal)); // BUG + EXPECT_TRUE(APIntOps::isShiftedMask(MaskVal)); } for (int I = 1; I < N; ++I) { APInt MaskVal = APInt::getHighBitsSet(N, I); - EXPECT_TRUE(APIntOps::isShiftedMask(N, MaskVal)); + EXPECT_TRUE(APIntOps::isShiftedMask(MaskVal)); } } } |
