RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-11 13:37:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove my bogus MapVector::erase() with a narrower ::pop_back(), and add a unit test.

Browse Source 
llvm-svn: 175538
This commit is contained in:
Douglas Gregor 2013-02-19 18:26:07 +00:00
parent 3b0f6f5216
commit 567c8d3dc3
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/ADT/MapVector.h
View File

@ -119,14 +119,11 @@ public:
(Vector.begin() + Pos->second);
}
/// \brief Erase entry with the given key.
void erase(const KeyT &key) {
typename MapType::iterator Pos = Map.find(key);
if (Pos == Map.end())
return;
Vector.erase(Vector.begin() + Pos->second);
/// \brief Remove the last element from the vector.
void pop_back() {
typename MapType::iterator Pos = Map.find(Vector.back().first);
Map.erase(Pos);
Vector.pop_back();
}
};

16
unittests/ADT/MapVectorTest.cpp
View File

@ -13,7 +13,7 @@
using namespace llvm;
TEST(MapVectorTest, insert) {
TEST(MapVectorTest, insert_pop) {
MapVector<int, int> MV;
std::pair<MapVector<int, int>::iterator, bool> R;
@ -38,4 +38,18 @@ TEST(MapVectorTest, insert) {
EXPECT_EQ(MV.size(), 2u);
EXPECT_EQ(MV[1], 2);
EXPECT_EQ(MV[4], 5);
MV.pop_back();
EXPECT_EQ(MV.size(), 1u);
EXPECT_EQ(MV[1], 2);
R = MV.insert(std::make_pair(4, 7));
ASSERT_NE(R.first, MV.end());
EXPECT_EQ(R.first->first, 4);
EXPECT_EQ(R.first->second, 7);
EXPECT_TRUE(R.second);
EXPECT_EQ(MV.size(), 2u);
EXPECT_EQ(MV[1], 2);
EXPECT_EQ(MV[4], 7);
}