maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Recommit "[APInt] Add back the asserts that check that the APInt shift methods aren't called with values larger than BitWidth." 

This includes a fix to clamp a right shift of larger than BitWidth in DAG combining.

llvm-svn: 300816
This commit is contained in:
Craig Topper 2017-04-20 03:49:18 +00:00
parent 9df8ef5538
commit 4db0c69373
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/ADT/APInt.h
View File

@ -847,8 +847,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;
@ -893,8 +894,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;

5
llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
View File

@ -861,11 +861,12 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
InnerOp.getOpcode() == ISD::SRL &&
InnerOp.hasOneUse() &&
isa<ConstantSDNode>(InnerOp.getOperand(1))) {
uint64_t InnerShAmt = cast<ConstantSDNode>(InnerOp.getOperand(1))
unsigned InnerShAmt = cast<ConstantSDNode>(InnerOp.getOperand(1))
->getZExtValue();
if (InnerShAmt < ShAmt &&
InnerShAmt < InnerBits &&
NewMask.lshr(InnerBits - InnerShAmt + ShAmt) == 0 &&
NewMask.lshr(std::min(InnerBits - InnerShAmt + ShAmt,
BitWidth)) == 0 &&
NewMask.trunc(ShAmt) == 0) {
SDValue NewSA =
TLO.DAG.getConstant(ShAmt - InnerShAmt, dl,

4
llvm/unittests/ADT/APIntTest.cpp
View File

@ -2021,7 +2021,7 @@ TEST(APIntTest, LogicalRightShift) {
// Ensure we handle large shifts of multi-word.
const APInt neg_one(128, static_cast<uint64_t>(-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<uint64_t>(-1), true);
EXPECT_EQ(0, neg_one.shl(257));
EXPECT_EQ(0, neg_one.shl(128));
}
} // end anonymous namespace