[llvm] r362823 - Revert "[ADT] Enable set_difference() to be used on StringSet"

[Vlad Tsyrklevich via llvm-commits]

Author: vlad.tsyrklevich
Date: Fri Jun  7 11:34:29 2019
New Revision: 362823

URL: http://llvm.org/viewvc/llvm-project?rev=362823&view=rev
Log:
Revert "[ADT] Enable set_difference() to be used on StringSet"

This reverts commit 0bddef79019a23ab14fcdb27028e55e484674c88, it was
causing ASan failures on the sanitizer bots:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/32800

Removed:
    llvm/trunk/unittests/ADT/StringSetTest.cpp
Modified:
    llvm/trunk/include/llvm/ADT/StringMap.h
    llvm/trunk/include/llvm/ADT/StringSet.h
    llvm/trunk/unittests/ADT/CMakeLists.txt
    llvm/trunk/unittests/ADT/StringMapTest.cpp

Modified: llvm/trunk/include/llvm/ADT/StringMap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=362823&r1=362822&r2=362823&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/StringMap.h (original)
+++ llvm/trunk/include/llvm/ADT/StringMap.h Fri Jun  7 11:34:29 2019
@@ -359,11 +359,6 @@ public:
     return find(Key) == end() ? 0 : 1;
   }
 
-  template <typename InputTy>
-  size_type count(const StringMapEntry<InputTy> &MapEntry) const {
-    return count(MapEntry.getKey());
-  }
-
   /// insert - Insert the specified key/value pair into the map.  If the key
   /// already exists in the map, return false and ignore the request, otherwise
   /// insert it and return true.

Modified: llvm/trunk/include/llvm/ADT/StringSet.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringSet.h?rev=362823&r1=362822&r2=362823&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/StringSet.h (original)
+++ llvm/trunk/include/llvm/ADT/StringSet.h Fri Jun  7 11:34:29 2019
@@ -45,12 +45,6 @@ namespace llvm {
       for (auto It = Begin; It != End; ++It)
         base::insert(std::make_pair(*It, '\0'));
     }
-
-    template <typename ValueTy>
-    std::pair<typename base::iterator, bool>
-    insert(const StringMapEntry<ValueTy> &MapEntry) {
-      return insert(MapEntry.getKey());
-    }
   };
 
 } // end namespace llvm

Modified: llvm/trunk/unittests/ADT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/CMakeLists.txt?rev=362823&r1=362822&r2=362823&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/CMakeLists.txt (original)
+++ llvm/trunk/unittests/ADT/CMakeLists.txt Fri Jun  7 11:34:29 2019
@@ -65,7 +65,6 @@ add_llvm_unittest(ADTTests
   StringExtrasTest.cpp
   StringMapTest.cpp
   StringRefTest.cpp
-  StringSetTest.cpp
   StringSwitchTest.cpp
   TinyPtrVectorTest.cpp
   TripleTest.cpp

Modified: llvm/trunk/unittests/ADT/StringMapTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/StringMapTest.cpp?rev=362823&r1=362822&r2=362823&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/StringMapTest.cpp (original)
+++ llvm/trunk/unittests/ADT/StringMapTest.cpp Fri Jun  7 11:34:29 2019
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/DataTypes.h"
 #include "gtest/gtest.h"
@@ -280,6 +281,20 @@ TEST_F(StringMapTest, IterMapKeys) {
   llvm::sort(Keys);
 
   SmallVector<StringRef, 4> Expected = {"A", "B", "C", "D"};
+  EXPECT_EQ(Expected, Keys);
+}
+
+TEST_F(StringMapTest, IterSetKeys) {
+  StringSet<> Set;
+  Set.insert("A");
+  Set.insert("B");
+  Set.insert("C");
+  Set.insert("D");
+
+  auto Keys = to_vector<4>(Set.keys());
+  llvm::sort(Keys);
+
+  SmallVector<StringRef, 4> Expected = {"A", "B", "C", "D"};
   EXPECT_EQ(Expected, Keys);
 }
 

Removed: llvm/trunk/unittests/ADT/StringSetTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/StringSetTest.cpp?rev=362822&view=auto
==============================================================================
--- llvm/trunk/unittests/ADT/StringSetTest.cpp (original)
+++ llvm/trunk/unittests/ADT/StringSetTest.cpp (removed)
@@ -1,43 +0,0 @@
-//===- llvm/unittest/ADT/StringSetTest.cpp - StringSet unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringSet.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-
-// Test fixture
-class StringSetTest : public testing::Test {};
-
-TEST_F(StringSetTest, IterSetKeys) {
-  StringSet<> Set;
-  Set.insert("A");
-  Set.insert("B");
-  Set.insert("C");
-  Set.insert("D");
-
-  auto Keys = to_vector<4>(Set.keys());
-  llvm::sort(Keys);
-
-  SmallVector<StringRef, 4> Expected = {"A", "B", "C", "D"};
-  EXPECT_EQ(Expected, Keys);
-}
-
-TEST_F(StringSetTest, InsertAndCountStringMapEntry) {
-  // Test insert(StringMapEntry) and count(StringMapEntry)
-  // which are required for set_difference(StringSet, StringSet).
-  StringSet<> Set;
-  StringMapEntry<StringRef> Element(1, "A");
-  Set.insert(Element);
-  size_t Count = Set.count(Element);
-  size_t Expected = 1;
-  EXPECT_EQ(Expected, Count);
-}
-
-} // end anonymous namespace