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

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.

llvm-svn: 152252
This commit is contained in:
Benjamin Kramer 2012-03-07 22:33:21 +00:00
parent a8b3dbf20f
commit 6e8d4b8eb4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Support/SmallPtrSet.cpp
View File

@ -241,7 +241,7 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// If only RHS is small, copy the small elements into LHS and move the pointer // If only RHS is small, copy the small elements into LHS and move the pointer
// from LHS to RHS. // from LHS to RHS.
if (!this->isSmall() && RHS.isSmall()) { 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->NumElements, RHS.NumElements);
std::swap(this->CurArraySize, RHS.CurArraySize); std::swap(this->CurArraySize, RHS.CurArraySize);
RHS.CurArray = this->CurArray; RHS.CurArray = this->CurArray;
@ -254,8 +254,7 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// If only LHS is small, copy the small elements into RHS and move the pointer // If only LHS is small, copy the small elements into RHS and move the pointer
// from RHS to LHS. // from RHS to LHS.
if (this->isSmall() && !RHS.isSmall()) { if (this->isSmall() && !RHS.isSmall()) {
std::copy(this->SmallArray, this->SmallArray+this->NumElements, std::copy(this->SmallArray, this->SmallArray+CurArraySize, RHS.SmallArray);
RHS.SmallArray);
std::swap(RHS.NumElements, this->NumElements); std::swap(RHS.NumElements, this->NumElements);
std::swap(RHS.CurArraySize, this->CurArraySize); std::swap(RHS.CurArraySize, this->CurArraySize);
this->CurArray = RHS.CurArray; this->CurArray = RHS.CurArray;
@ -268,8 +267,8 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) {
// Both a small, just swap the small elements. // Both a small, just swap the small elements.
assert(this->isSmall() && RHS.isSmall()); assert(this->isSmall() && RHS.isSmall());
assert(this->CurArraySize == RHS.CurArraySize); assert(this->CurArraySize == RHS.CurArraySize);
unsigned MaxElems = std::max(this->NumElements, RHS.NumElements); std::swap_ranges(this->SmallArray, this->SmallArray+CurArraySize,
std::swap_ranges(this->SmallArray, this->SmallArray+MaxElems, RHS.SmallArray); RHS.SmallArray);
std::swap(this->NumElements, RHS.NumElements); std::swap(this->NumElements, RHS.NumElements);
} }