Use SparseT[] and add test

llvm · Nov 19, 2024 · 4d29a87 · 4d29a87
1 parent 8a5db30
commit 4d29a87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/llvm/include/llvm/ADT/SparseSet.h b/llvm/include/llvm/ADT/SparseSet.h
@@ -133,7 +133,7 @@ class SparseSet {
   struct Deleter {
     void operator()(SparseT *S) { free(S); }
   };
-  std::unique_ptr<SparseT, Deleter> Sparse;
+  std::unique_ptr<SparseT[], Deleter> Sparse;
 
   unsigned Universe = 0;
   KeyFunctorT KeyIndexOf;
@@ -209,7 +209,7 @@ class SparseSet {
     assert(Idx < Universe && "Key out of range");
     assert(Sparse != nullptr && "Invalid sparse type");
     const unsigned Stride = std::numeric_limits<SparseT>::max() + 1u;
-    for (unsigned i = Sparse.get()[Idx], e = size(); i < e; i += Stride) {
+    for (unsigned i = Sparse[Idx], e = size(); i < e; i += Stride) {
       const unsigned FoundIdx = ValIndexOf(Dense[i]);
       assert(FoundIdx < Universe && "Invalid key in set. Did object mutate?");
       if (Idx == FoundIdx)
@@ -259,7 +259,7 @@ class SparseSet {
     iterator I = findIndex(Idx);
     if (I != end())
       return std::make_pair(I, false);
-    Sparse.get()[Idx] = size();
+    Sparse[Idx] = size();
     Dense.push_back(Val);
     return std::make_pair(end() - 1, true);
   }
@@ -296,7 +296,7 @@ class SparseSet {
       *I = Dense.back();
       unsigned BackIdx = ValIndexOf(Dense.back());
       assert(BackIdx < Universe && "Invalid key in set. Did object mutate?");
-      Sparse.get()[BackIdx] = I - begin();
+      Sparse[BackIdx] = I - begin();
     }
     // This depends on SmallVector::pop_back() not invalidating iterators.
     // std::vector::pop_back() doesn't give that guarantee.

diff --git a/llvm/unittests/ADT/SparseSetTest.cpp b/llvm/unittests/ADT/SparseSetTest.cpp
@@ -204,4 +204,16 @@ TEST(SparseSetTest, PopBack) {
   for (unsigned i = 0; i < UpperBound; ++i)
     ASSERT_TRUE(Set.insert(i).second);
 }
+
+TEST(SparseSetTest, MoveConstructor) {
+  USet Set;
+  Set.setUniverse(2);
+  Set.insert(1);
+  EXPECT_FALSE(Set.empty());
+  // Move and check original is empty.
+  USet OtherSet(std::move(Set));
+  EXPECT_TRUE(Set.empty());
+  EXPECT_TRUE(OtherSet.contains(1));
+}
+
 } // namespace