Reverting r247972 (and subordinate commit r247972) as the 32-bit left-shift is undefi...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247983 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/SmallBitVector.h b/include/llvm/ADT/SmallBitVector.h
index 39d2e14a63d5562aaae75b77e150c6c76be0fba4..ae3d645396fdb1f808634a44a15fbd9e3bbd0120 100644 (file)
--- a/include/llvm/ADT/SmallBitVector.h
+++ b/include/llvm/ADT/SmallBitVector.h
@@ -553,15 +553,17 @@ public:
 private:
   template<bool AddBits, bool InvertMask>
   void applyMask(const uint32_t *Mask, unsigned MaskWords) {
-    uintptr_t M = Mask[0];
-    if (MaskWords != 1) {
-      assert(NumBaseBits == 64 && MaskWords == 2 &&
-             "Mask is larger than base!");
-      M |= uintptr_t(Mask[1]) << 32;
+    if (NumBaseBits == 64 && MaskWords >= 2) {
+      uint64_t M = Mask[0] | (uint64_t(Mask[1]) << 32);
+      if (InvertMask) M = ~M;
+      if (AddBits) setSmallBits(getSmallBits() | M);
+      else         setSmallBits(getSmallBits() & ~M);
+    } else {
+      uint32_t M = Mask[0];
+      if (InvertMask) M = ~M;
+      if (AddBits) setSmallBits(getSmallBits() | M);
+      else         setSmallBits(getSmallBits() & ~M);
     }
-    if (InvertMask) M = ~M;
-    if (AddBits) setSmallBits(getSmallBits() | M);
-    else         setSmallBits(getSmallBits() & ~M);
   }
 };
 

diff --git a/unittests/ADT/BitVectorTest.cpp b/unittests/ADT/BitVectorTest.cpp
index 95ff93fa9c4c8a35957f57b2115678169b52394e..3deaff0fe3569b447451a95ebea6bd162614f1a7 100644 (file)
--- a/unittests/ADT/BitVectorTest.cpp
+++ b/unittests/ADT/BitVectorTest.cpp
@@ -235,12 +235,12 @@ TYPED_TEST(BitVectorTest, PortableBitMask) {
   const uint32_t Mask1[] = { 0x80000000, 6, 5 };
 
   A.resize(10);
-  A.setBitsInMask(Mask1, 1);
+  A.setBitsInMask(Mask1, 3);
   EXPECT_EQ(10u, A.size());
   EXPECT_FALSE(A.test(0));
 
   A.resize(32);
-  A.setBitsInMask(Mask1, 1);
+  A.setBitsInMask(Mask1, 3);
   EXPECT_FALSE(A.test(0));
   EXPECT_TRUE(A.test(31));
   EXPECT_EQ(1u, A.count());