[llvm-commits] [llvm] r152252 - /llvm/trunk/lib/Support/SmallPtrSet.cpp

[Benjamin Kramer]

Author: d0k
Date: Wed Mar  7 16:33:21 2012
New Revision: 152252

URL: http://llvm.org/viewvc/llvm-project?rev=152252&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Support/SmallPtrSet.cpp

Modified: llvm/trunk/lib/Support/SmallPtrSet.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/SmallPtrSet.cpp?rev=152252&r1=152251&r2=152252&view=diff
==============================================================================
--- llvm/trunk/lib/Support/SmallPtrSet.cpp (original)
+++ llvm/trunk/lib/Support/SmallPtrSet.cpp Wed Mar  7 16:33:21 2012
@@ -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);
 }