From 6fda71e05edc6447f780dee7fff8bd4bf543f39e Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Fri, 20 Jun 2014 00:23:03 +0000
Subject: Revert "Add StringMap::insert(pair) consistent with the standard
 associative container concept."

This reverts commit r211309.

It looks like it broke some bots:

http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/15563/steps/compile/logs/stdio

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211328 91177308-0d34-0410-b5e6-96231b3b80d8
---
 unittests/ADT/StringMapTest.cpp | 38 --------------------------------------
 1 file changed, 38 deletions(-)

(limited to 'unittests')

diff --git a/unittests/ADT/StringMapTest.cpp b/unittests/ADT/StringMapTest.cpp
index 215d3dfa02..70eec873ed 100644
--- a/unittests/ADT/StringMapTest.cpp
+++ b/unittests/ADT/StringMapTest.cpp
@@ -10,7 +10,6 @@
 #include "gtest/gtest.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/DataTypes.h"
-#include <tuple>
 using namespace llvm;
 
 namespace {
@@ -204,43 +203,6 @@ TEST_F(StringMapTest, InsertTest) {
   assertSingleItemMap();
 }
 
-// Test insert(pair<K, V>) method
-TEST_F(StringMapTest, InsertPairTest) {
-  bool Inserted;
-  StringMap<uint32_t>::iterator NewIt;
-  std::tie(NewIt, Inserted) =
-      testMap.insert(std::make_pair(testKeyFirst, testValue));
-  EXPECT_EQ(1u, testMap.size());
-  EXPECT_EQ(testValue, testMap[testKeyFirst]);
-  EXPECT_EQ(testKeyFirst, NewIt->first());
-  EXPECT_EQ(testValue, NewIt->second);
-  EXPECT_TRUE(Inserted);
-
-  StringMap<uint32_t>::iterator ExistingIt;
-  std::tie(ExistingIt, Inserted) =
-      testMap.insert(std::make_pair(testKeyFirst, testValue + 1));
-  EXPECT_EQ(1u, testMap.size());
-  EXPECT_EQ(testValue, testMap[testKeyFirst]);
-  EXPECT_FALSE(Inserted);
-  EXPECT_EQ(NewIt, ExistingIt);
-}
-
-// Test insert(pair<K, V>) method when rehashing occurs
-TEST_F(StringMapTest, InsertRehashingPairTest) {
-  // Check that the correct iterator is returned when the inserted element is
-  // moved to a different bucket during internal rehashing. This depends on
-  // the particular key, and the implementation of StringMap and HashString.
-  // Changes to those might result in this test not actually checking that.
-  StringMap<uint32_t> t(1);
-  EXPECT_EQ(1u, t.getNumBuckets());
-
-  StringMap<uint32_t>::iterator It =
-    t.insert(std::make_pair("abcdef", 42)).first;
-  EXPECT_EQ(2u, t.getNumBuckets());
-  EXPECT_EQ("abcdef", It->first());
-  EXPECT_EQ(42u, It->second);
-}
-
 // Create a non-default constructable value
 struct StringMapTestStruct {
   StringMapTestStruct(int i) : i(i) {}
-- 
cgit v1.2.3