diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/IR/ConstantRange.cpp | 6 | ||||
| -rw-r--r-- | llvm/unittests/IR/ConstantRangeTest.cpp | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/llvm/lib/IR/ConstantRange.cpp b/llvm/lib/IR/ConstantRange.cpp index eda31f73473..f07ec9d5a3f 100644 --- a/llvm/lib/IR/ConstantRange.cpp +++ b/llvm/lib/IR/ConstantRange.cpp @@ -1006,8 +1006,12 @@ ConstantRange::shl(const ConstantRange &Other) const { APInt max = getUnsignedMax(); APInt Other_umax = Other.getUnsignedMax(); + // If we are shifting by maximum amount of + // zero return return the original range. + if (Other_umax.isNullValue()) + return *this; // there's overflow! - if (Other_umax.uge(max.countLeadingZeros())) + if (Other_umax.ugt(max.countLeadingZeros())) return getFull(); // FIXME: implement the other tricky cases diff --git a/llvm/unittests/IR/ConstantRangeTest.cpp b/llvm/unittests/IR/ConstantRangeTest.cpp index c9273bcd13a..db298bc0d4e 100644 --- a/llvm/unittests/IR/ConstantRangeTest.cpp +++ b/llvm/unittests/IR/ConstantRangeTest.cpp @@ -704,6 +704,8 @@ TEST_F(ConstantRangeTest, UDiv) { } TEST_F(ConstantRangeTest, Shl) { + ConstantRange Some2(APInt(16, 0xfff), APInt(16, 0x8000)); + ConstantRange WrapNullMax(APInt(16, 0x1), APInt(16, 0x0)); EXPECT_EQ(Full.shl(Full), Full); EXPECT_EQ(Full.shl(Empty), Empty); EXPECT_EQ(Full.shl(One), Full); // TODO: [0, (-1 << 0xa) + 1) @@ -720,6 +722,10 @@ TEST_F(ConstantRangeTest, Shl) { EXPECT_EQ(Some.shl(Some), Full); // TODO: [0xa << 0xa, 0xfc01) EXPECT_EQ(Some.shl(Wrap), Full); // TODO: [0xa, 0x7ff << 0x5 + 1) EXPECT_EQ(Wrap.shl(Wrap), Full); + EXPECT_EQ( + Some2.shl(ConstantRange(APInt(16, 0x1))), + ConstantRange(APInt(16, 0xfff << 0x1), APInt(16, 0x7fff << 0x1) + 1)); + EXPECT_EQ(One.shl(WrapNullMax), Full); } TEST_F(ConstantRangeTest, Lshr) { |
