[PATCH] D111113: [APInt] Make insertBits and concat work with zero width APInts.
Chris Lattner via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Oct 5 08:42:11 PDT 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rGcc697fc292b0: [APInt] Make insertBits and concat work with zero width APInts. (authored by lattner).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D111113/new/
https://reviews.llvm.org/D111113
Files:
llvm/lib/Support/APInt.cpp
llvm/unittests/ADT/APIntTest.cpp
Index: llvm/unittests/ADT/APIntTest.cpp
===================================================================
--- llvm/unittests/ADT/APIntTest.cpp
+++ llvm/unittests/ADT/APIntTest.cpp
@@ -1874,6 +1874,10 @@
i63.insertBits(iSrc, 4);
EXPECT_EQ(static_cast<int64_t>(0x012345600123456Full), i63.getSExtValue());
+ // Zero width insert is a noop.
+ i31.insertBits(APInt::getZeroWidth(), 1);
+ EXPECT_EQ(static_cast<int64_t>(0x00123456ull), i31.getSExtValue());
+
// Insert single word src into one word of dst.
APInt i120(120, UINT64_MAX, true);
i120.insertBits(iSrc, 8);
@@ -2587,7 +2591,7 @@
EXPECT_EQ(0xFFFFFFFF, val.truncOrSelf(64));
}
-TEST(APIntTest, concatMSB) {
+TEST(APIntTest, concat) {
APInt Int1(4, 0x1ULL);
APInt Int3(4, 0x3ULL);
@@ -2597,6 +2601,11 @@
APInt I64(64, 0x3ULL);
EXPECT_EQ(I64, I64.concat(I64).lshr(64).trunc(64));
+
+ APInt I65(65, 0x3ULL);
+ APInt I0 = APInt::getZeroWidth();
+ EXPECT_EQ(I65, I65.concat(I0));
+ EXPECT_EQ(I65, I0.concat(I65));
}
TEST(APIntTest, multiply) {
Index: llvm/lib/Support/APInt.cpp
===================================================================
--- llvm/lib/Support/APInt.cpp
+++ llvm/lib/Support/APInt.cpp
@@ -345,7 +345,7 @@
/// In the slow case, we know the result is large.
APInt APInt::concatSlowCase(const APInt &NewLSB) const {
unsigned NewWidth = getBitWidth() + NewLSB.getBitWidth();
- APInt Result = NewLSB.zext(NewWidth);
+ APInt Result = NewLSB.zextOrSelf(NewWidth);
Result.insertBits(*this, NewLSB.getBitWidth());
return Result;
}
@@ -360,9 +360,13 @@
void APInt::insertBits(const APInt &subBits, unsigned bitPosition) {
unsigned subBitWidth = subBits.getBitWidth();
- assert(0 < subBitWidth && (subBitWidth + bitPosition) <= BitWidth &&
+ assert(subBitWidth >= 0 && (subBitWidth + bitPosition) <= BitWidth &&
"Illegal bit insertion");
+ // inserting no bits is a noop.
+ if (subBitWidth == 0)
+ return;
+
// Insertion is a direct copy.
if (subBitWidth == BitWidth) {
*this = subBits;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D111113.377266.patch
Type: text/x-patch
Size: 2050 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211005/046bc513/attachment.bin>
More information about the llvm-commits
mailing list