maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Improve StringMap unittests: reintroduce move count, but shield against std::pair internals 

From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 264418
This commit is contained in:
Mehdi Amini 2016-03-25 16:36:00 +00:00
parent c1384c138c
commit 169eda643c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/unittests/ADT/StringMapTest.cpp
View File

@ -391,14 +391,21 @@ TEST(StringMapCustomTest, InitialSizeTest) {
for (auto Size : {1, 32, 67}) { for (auto Size : {1, 32, 67}) {
StringMap<CountCtorCopyAndMove> Map(Size); StringMap<CountCtorCopyAndMove> Map(Size);
auto NumBuckets = Map.getNumBuckets(); auto NumBuckets = Map.getNumBuckets();
// Prepare the elts in a vector. We do this as a pre-step to shield us
// against the internals of std::pair which can introduce spurious move/copy
std::vector<std::pair<std::string, CountCtorCopyAndMove>> Elts;
for (int i = 0; i < Size; ++i)
Elts.emplace_back(Twine(i).str(), CountCtorCopyAndMove());
CountCtorCopyAndMove::Move = 0; CountCtorCopyAndMove::Move = 0;
CountCtorCopyAndMove::Copy = 0; CountCtorCopyAndMove::Copy = 0;
for (int i = 0; i < Size; ++i) for (int i = 0; i < Size; ++i)
Map.insert(std::make_pair(Twine(i).str(), CountCtorCopyAndMove())); Map.insert(Elts[i]);
// This relies on move-construction elision, and cannot be reliably tested. // After the inital copy, the map will move the Elts in the Entry.
// EXPECT_EQ((unsigned)Size * 3, CountCtorCopyAndMove::Move); EXPECT_EQ((unsigned)Size, CountCtorCopyAndMove::Move);
// No copy is expected. // We copy once the pair from the Elts vector
EXPECT_EQ(0u, CountCtorCopyAndMove::Copy); EXPECT_EQ((unsigned)Size, CountCtorCopyAndMove::Copy);
// Check that the map didn't grow // Check that the map didn't grow
EXPECT_EQ(Map.getNumBuckets(), NumBuckets); EXPECT_EQ(Map.getNumBuckets(), NumBuckets);
} }