replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure moved-from container is cleared on move 

In all cases except for this optimistic attempt to reuse memory, the
moved-from TinyPtrVector was left `empty()` at the end of this
assignment. Though using a container after it's been moved from can be a
bit sketchy, it's probably best to just be consistent here.

llvm-svn: 320408
This commit is contained in:
George Burgess IV 2017-12-11 19:22:59 +00:00
parent ec128ace8a
commit 8c5886b45f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/include/llvm/ADT/TinyPtrVector.h
View File

@ -97,6 +97,7 @@ public:
if (RHS.Val.template is<EltTy>()) {
V->clear();
V->push_back(RHS.front());
RHS.Val = (EltTy)nullptr;
return *this;
}
delete V;

6
llvm/unittests/ADT/TinyPtrVectorTest.cpp
View File

@ -152,6 +152,12 @@ TYPED_TEST(TinyPtrVectorTest, CopyAndMoveCtorTest) {
TypeParam Move(std::move(Copy2));
this->expectValues(Move, this->testArray(42));
this->expectValues(Copy2, this->testArray(0));
TypeParam MultipleElements(this->testArray(2));
TypeParam SingleElement(this->testArray(1));
MultipleElements = std::move(SingleElement);
this->expectValues(MultipleElements, this->testArray(1));
this->expectValues(SingleElement, this->testArray(0));
}
TYPED_TEST(TinyPtrVectorTest, CopyAndMoveTest) {