[PATCH] D89486: [ADT] Fix for ImmutableMapRef

[Balogh, Ádám via Phabricator via llvm-commits]

baloghadamsoftware created this revision.
baloghadamsoftware added a reviewer: chandlerc.
baloghadamsoftware added a project: LLVM.
Herald added subscribers: martong, gamesh411, Szelethus, dexonsmith, dkrupp, rnkovacs.
baloghadamsoftware requested review of this revision.

The `Root` member of `ImmutableMapRef` was changed recently from a plain pointer to `IntrusiveRefCntPtr`. However, the `Profile` member function
was not adjusted. This results in comilation error whenever the `Profile` method is used on an `ImmutableMapRef`. This patch fixes this issue and also adds unit tests for `ImmutableMapRef`. See bug 47863 <https://bugs.llvm.org/show_bug.cgi?id=47863>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D89486

Files:
  llvm/include/llvm/ADT/ImmutableMap.h
  llvm/unittests/ADT/ImmutableMapTest.cpp


Index: llvm/unittests/ADT/ImmutableMapTest.cpp
===================================================================
--- llvm/unittests/ADT/ImmutableMapTest.cpp
+++ llvm/unittests/ADT/ImmutableMapTest.cpp
@@ -46,4 +46,47 @@
   EXPECT_EQ(3U, S2.getHeight());
 }
 
+TEST(ImmutableMapTest, EmptyIntMapRefTest) {
+  using int_int_map = ImmutableMapRef<int, int>;
+  ImmutableMapRef<int, int>::FactoryTy *f =
+    new ImmutableMapRef<int, int>::FactoryTy();
+
+  EXPECT_TRUE(int_int_map::getEmptyMap(f) == int_int_map::getEmptyMap(f));
+  EXPECT_FALSE(int_int_map::getEmptyMap(f) != int_int_map::getEmptyMap(f));
+  EXPECT_TRUE(int_int_map::getEmptyMap(f).isEmpty());
+
+  int_int_map S = int_int_map::getEmptyMap(f);
+  EXPECT_EQ(0u, S.getHeight());
+  EXPECT_TRUE(S.begin() == S.end());
+  EXPECT_FALSE(S.begin() != S.end());
+}
+
+TEST(ImmutableMapTest, MultiElemIntMapRefTest) {
+  ImmutableMapRef<int, int>::FactoryTy *f =
+    new ImmutableMapRef<int, int>::FactoryTy();
+
+  ImmutableMapRef<int, int> S = ImmutableMapRef<int, int>::getEmptyMap(f);
+
+  ImmutableMapRef<int, int> S2 = S.add(3, 10).add(4, 11).add(5, 12);
+
+  EXPECT_TRUE(S.isEmpty());
+  EXPECT_FALSE(S2.isEmpty());
+
+  EXPECT_EQ(nullptr, S.lookup(3));
+  EXPECT_EQ(nullptr, S.lookup(9));
+
+  EXPECT_EQ(10, *S2.lookup(3));
+  EXPECT_EQ(11, *S2.lookup(4));
+  EXPECT_EQ(12, *S2.lookup(5));
+
+  EXPECT_EQ(5, S2.getMaxElement()->first);
+  EXPECT_EQ(3U, S2.getHeight());
+}
+
+  TEST(ImmutableMapTest, MapOfMapRefsTest) {
+  ImmutableMap<int, ImmutableMapRef<int, int>>::Factory f;
+
+  EXPECT_TRUE(f.getEmptyMap() == f.getEmptyMap());
+  }
+
 }
Index: llvm/include/llvm/ADT/ImmutableMap.h
===================================================================
--- llvm/include/llvm/ADT/ImmutableMap.h
+++ llvm/include/llvm/ADT/ImmutableMap.h
@@ -355,7 +355,7 @@
   unsigned getHeight() const { return Root ? Root->getHeight() : 0; }
 
   static inline void Profile(FoldingSetNodeID &ID, const ImmutableMapRef &M) {
-    ID.AddPointer(M.Root);
+    ID.AddPointer(M.Root.get());
   }
 
   inline void Profile(FoldingSetNodeID &ID) const { return Profile(ID, *this); }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89486.298412.patch
Type: text/x-patch
Size: 2130 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201015/55ba38f0/attachment.bin>