Revert "[ADT] Fix for ImmutableMapRef"

This reverts commit a6336eab0c507b665dda63fa9db1292a2cdee409.

This commit broke check-llvm under ASan:

See http://lab.llvm.org:8011/#/builders/5/builds/446 for more details.

diff --git a/llvm/include/llvm/ADT/ImmutableMap.h b/llvm/include/llvm/ADT/ImmutableMap.h
index 81b21a7..30689d2 100644 (file)
--- a/llvm/include/llvm/ADT/ImmutableMap.h
+++ b/llvm/include/llvm/ADT/ImmutableMap.h
@@ -355,7 +355,7 @@ public:
   unsigned getHeight() const { return Root ? Root->getHeight() : 0; }
 
   static inline void Profile(FoldingSetNodeID &ID, const ImmutableMapRef &M) {
-    ID.AddPointer(M.Root.get());
+    ID.AddPointer(M.Root);
   }
 
   inline void Profile(FoldingSetNodeID &ID) const { return Profile(ID, *this); }

diff --git a/llvm/unittests/ADT/ImmutableMapTest.cpp b/llvm/unittests/ADT/ImmutableMapTest.cpp
index 4541ea9..fa61816 100644 (file)
--- a/llvm/unittests/ADT/ImmutableMapTest.cpp
+++ b/llvm/unittests/ADT/ImmutableMapTest.cpp
@@ -46,47 +46,4 @@ TEST(ImmutableMapTest, MultiElemIntMapTest) {
   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());
-  }
-
 }