[llvm] r197277 - Remove APInt::extractBit since it is already implemented via operator[]. Change tests for extractBit to test operator[].
Michael Gottesman
mgottesman at apple.com
Fri Dec 13 14:00:19 PST 2013
Author: mgottesman
Date: Fri Dec 13 16:00:19 2013
New Revision: 197277
URL: http://llvm.org/viewvc/llvm-project?rev=197277&view=rev
Log:
Remove APInt::extractBit since it is already implemented via operator[]. Change tests for extractBit to test operator[].
Modified:
llvm/trunk/include/llvm/ADT/APInt.h
llvm/trunk/lib/Support/APInt.cpp
llvm/trunk/unittests/ADT/APIntTest.cpp
Modified: llvm/trunk/include/llvm/ADT/APInt.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APInt.h?rev=197277&r1=197276&r2=197277&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/APInt.h (original)
+++ llvm/trunk/include/llvm/ADT/APInt.h Fri Dec 13 16:00:19 2013
@@ -1244,9 +1244,6 @@ public:
/// as "bitPosition".
void flipBit(unsigned bitPosition);
- /// \brief Returns true if the bit in bitPosition is set.
- bool extractBit(unsigned bitPosition) const;
-
/// @}
/// \name Value Characterization Functions
/// @{
@@ -1517,7 +1514,7 @@ public:
// UINT32_MAX. Finally extractBit of MSB - 1 will be UINT32_MAX implying
// that we get BitWidth - 1.
unsigned lg = logBase2();
- return lg + unsigned(extractBit(std::min(lg - 1, BitWidth - 1)));
+ return lg + unsigned((*this)[std::min(lg - 1, BitWidth - 1)]);
}
/// \returns the log base 2 of this APInt if its an exact power of two, -1
Modified: llvm/trunk/lib/Support/APInt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APInt.cpp?rev=197277&r1=197276&r2=197277&view=diff
==============================================================================
--- llvm/trunk/lib/Support/APInt.cpp (original)
+++ llvm/trunk/lib/Support/APInt.cpp Fri Dec 13 16:00:19 2013
@@ -607,14 +607,6 @@ void APInt::flipBit(unsigned bitPosition
else setBit(bitPosition);
}
-bool APInt::extractBit(unsigned bitPosition) const {
- assert(bitPosition < BitWidth && "Out of the bit-width range!");
- if (isSingleWord())
- return VAL & maskBit(bitPosition);
- else
- return pVal[whichWord(bitPosition)] & maskBit(bitPosition);
-}
-
unsigned APInt::getBitsNeeded(StringRef str, uint8_t radix) {
assert(!str.empty() && "Invalid string length");
assert((radix == 10 || radix == 8 || radix == 16 || radix == 2 ||
Modified: llvm/trunk/unittests/ADT/APIntTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/APIntTest.cpp?rev=197277&r1=197276&r2=197277&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/APIntTest.cpp (original)
+++ llvm/trunk/unittests/ADT/APIntTest.cpp Fri Dec 13 16:00:19 2013
@@ -598,13 +598,13 @@ TEST(APIntTest, tcDecrement) {
}
}
-TEST(APIntTest, extractBit) {
+TEST(APIntTest, arrayAccess) {
// Single word check.
uint64_t E1 = 0x2CA7F46BF6569915ULL;
APInt A1(64, E1);
for (unsigned i = 0, e = 64; i < e; ++i) {
EXPECT_EQ(bool(E1 & (1ULL << i)),
- A1.extractBit(i));
+ A1[i]);
}
// Multiword check.
@@ -618,7 +618,7 @@ TEST(APIntTest, extractBit) {
for (unsigned i = 0; i < 4; ++i) {
for (unsigned j = 0; j < integerPartWidth; ++j) {
EXPECT_EQ(bool(E2[i] & (1ULL << j)),
- A2.extractBit(i*integerPartWidth + j));
+ A2[i*integerPartWidth + j]);
}
}
}
More information about the llvm-commits
mailing list