From 69a88f72e90c8d51666bbca8867362d79c35302f Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 20 Apr 2017 02:03:09 +0000 Subject: [PATCH] [APInt] Add back the asserts that check that the APInt shift methods aren't called with values larger than BitWidth. The underlying tcShiftRight/tcShiftLeft functions support the larger bit widths but the APInt interface shouldn't rely on that. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@300811 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/APInt.h | 6 ++++-- unittests/ADT/APIntTest.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/llvm/ADT/APInt.h b/include/llvm/ADT/APInt.h index b87cf89bba5..2fafeafb6ad 100644 --- a/include/llvm/ADT/APInt.h +++ b/include/llvm/ADT/APInt.h @@ -844,8 +844,9 @@ public: /// /// \returns *this after shifting left by ShiftAmt APInt &operator<<=(unsigned ShiftAmt) { + assert(ShiftAmt <= BitWidth && "Invalid shift amount"); if (isSingleWord()) { - if (ShiftAmt >= BitWidth) + if (ShiftAmt == BitWidth) VAL = 0; else VAL <<= ShiftAmt; @@ -890,8 +891,9 @@ public: /// Logical right-shift this APInt by ShiftAmt in place. void lshrInPlace(unsigned ShiftAmt) { + assert(ShiftAmt <= BitWidth && "Invalid shift amount"); if (isSingleWord()) { - if (ShiftAmt >= BitWidth) + if (ShiftAmt == BitWidth) VAL = 0; else VAL >>= ShiftAmt; diff --git a/unittests/ADT/APIntTest.cpp b/unittests/ADT/APIntTest.cpp index 0f1d2d6d8f9..7d451836ad9 100644 --- a/unittests/ADT/APIntTest.cpp +++ b/unittests/ADT/APIntTest.cpp @@ -2021,7 +2021,7 @@ TEST(APIntTest, LogicalRightShift) { // Ensure we handle large shifts of multi-word. const APInt neg_one(128, static_cast(-1), true); - EXPECT_EQ(0, neg_one.lshr(257)); + EXPECT_EQ(0, neg_one.lshr(128)); } TEST(APIntTest, LeftShift) { @@ -2054,7 +2054,7 @@ TEST(APIntTest, LeftShift) { // Ensure we handle large shifts of multi-word. const APInt neg_one(128, static_cast(-1), true); - EXPECT_EQ(0, neg_one.shl(257)); + EXPECT_EQ(0, neg_one.shl(128)); } } // end anonymous namespace -- 2.50.1