SmallPtrSet: Copy all the elements when swapping, not just numelements.
This fixes a build failure in webkit. Copying all elements shouldn't be
necessary, I'll look out for a better fix soon.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152252 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/SmallPtrSet.cpp b/lib/Support/SmallPtrSet.cpp
index dd516d3..92ffa49 100644
--- a/lib/Support/SmallPtrSet.cpp
+++ b/lib/Support/SmallPtrSet.cpp
@@ -241,7 +241,7 @@
// If only RHS is small, copy the small elements into LHS and move the pointer
// from LHS to RHS.
if (!this->isSmall() && RHS.isSmall()) {
- std::copy(RHS.SmallArray, RHS.SmallArray+RHS.NumElements, this->SmallArray);
+ std::copy(RHS.SmallArray, RHS.SmallArray+CurArraySize, this->SmallArray);
std::swap(this->NumElements, RHS.NumElements);
std::swap(this->CurArraySize, RHS.CurArraySize);
RHS.CurArray = this->CurArray;
@@ -254,8 +254,7 @@
// If only LHS is small, copy the small elements into RHS and move the pointer
// from RHS to LHS.
if (this->isSmall() && !RHS.isSmall()) {
- std::copy(this->SmallArray, this->SmallArray+this->NumElements,
- RHS.SmallArray);
+ std::copy(this->SmallArray, this->SmallArray+CurArraySize, RHS.SmallArray);
std::swap(RHS.NumElements, this->NumElements);
std::swap(RHS.CurArraySize, this->CurArraySize);
this->CurArray = RHS.CurArray;
@@ -268,8 +267,8 @@
// Both a small, just swap the small elements.
assert(this->isSmall() && RHS.isSmall());
assert(this->CurArraySize == RHS.CurArraySize);
- unsigned MaxElems = std::max(this->NumElements, RHS.NumElements);
- std::swap_ranges(this->SmallArray, this->SmallArray+MaxElems, RHS.SmallArray);
+ std::swap_ranges(this->SmallArray, this->SmallArray+CurArraySize,
+ RHS.SmallArray);
std::swap(this->NumElements, RHS.NumElements);
}