replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug in the set(I,E)/reset(I,E) methods that I recently added. The boundary condition for checking if I and E were in the same word were incorrect, and, beyond that, the mask computation was not using a wide enough constant. 

llvm-svn: 166015
This commit is contained in:
Owen Anderson 2012-10-16 06:04:27 +00:00
parent 2a3f77585f
commit 04b8daa970
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/ADT/BitVector.h
View File

@ -244,9 +244,9 @@ public:
if (I == E) return *this;
if (I / BITWORD_SIZE == (E-1) / BITWORD_SIZE) {
BitWord EMask = 1 << (E % BITWORD_SIZE);
BitWord IMask = 1 << (I % BITWORD_SIZE);
if (I / BITWORD_SIZE == E / BITWORD_SIZE) {
BitWord EMask = 1UL << (E % BITWORD_SIZE);
BitWord IMask = 1UL << (I % BITWORD_SIZE);
BitWord Mask = EMask - IMask;
Bits[I / BITWORD_SIZE] |= Mask;
return *this;
@ -282,9 +282,9 @@ public:
if (I == E) return *this;
if (I / BITWORD_SIZE == (E-1) / BITWORD_SIZE) {
BitWord EMask = 1 << (E % BITWORD_SIZE);
BitWord IMask = 1 << (I % BITWORD_SIZE);
if (I / BITWORD_SIZE == E / BITWORD_SIZE) {
BitWord EMask = 1UL << (E % BITWORD_SIZE);
BitWord IMask = 1UL << (I % BITWORD_SIZE);
BitWord Mask = EMask - IMask;
Bits[I / BITWORD_SIZE] &= ~Mask;
return *this;

10
llvm/unittests/ADT/BitVectorTest.cpp
View File

@ -322,6 +322,16 @@ TYPED_TEST(BitVectorTest, RangeOps) {
EXPECT_FALSE(D.test(0));
EXPECT_TRUE( D.test(1));
EXPECT_TRUE( D.test(2));
TypeParam E;
E.resize(128);
E.reset();
E.set(1, 33);
EXPECT_FALSE(E.test(0));
EXPECT_TRUE( E.test(1));
EXPECT_TRUE( E.test(32));
EXPECT_FALSE(E.test(33));
}
}
#endif