Fix PR1329.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36016 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/ADT/SmallPtrSet.h b/include/llvm/ADT/SmallPtrSet.h
index 6bd4d09..40e9bb4 100644
--- a/include/llvm/ADT/SmallPtrSet.h
+++ b/include/llvm/ADT/SmallPtrSet.h
@@ -53,6 +53,9 @@
unsigned NumElements;
unsigned NumTombstones;
void *SmallArray[1]; // Must be last ivar.
+
+ // Helper to copy construct a SmallPtrSet.
+ SmallPtrSetImpl(const SmallPtrSetImpl& that);
public:
SmallPtrSetImpl(unsigned SmallSize) {
assert(SmallSize && (SmallSize & (SmallSize-1)) == 0 &&
@@ -214,6 +217,7 @@
void *SmallArray[SmallSizePowTwo];
public:
SmallPtrSet() : SmallPtrSetImpl(NextPowerOfTwo<SmallSizePowTwo>::Val) {}
+ SmallPtrSet(const SmallPtrSet &that) : SmallPtrSetImpl(that) {}
template<typename It>
SmallPtrSet(It I, It E)
diff --git a/lib/Support/SmallPtrSet.cpp b/lib/Support/SmallPtrSet.cpp
index 98d5bc9..61fad5e 100644
--- a/lib/Support/SmallPtrSet.cpp
+++ b/lib/Support/SmallPtrSet.cpp
@@ -141,5 +141,33 @@
}
delete [] OldBuckets;
+ NumTombstones = 0;
+ }
+}
+
+SmallPtrSetImpl::SmallPtrSetImpl(const SmallPtrSetImpl& that) {
+ NumElements = that.NumElements;
+ NumTombstones = 0;
+ if (that.isSmall()) {
+ CurArraySize = that.CurArraySize;
+ CurArray = &SmallArray[0];
+ memcpy(CurArray, that.CurArray, sizeof(void*)*CurArraySize);
+ } else {
+ CurArraySize = that.NumElements < 64 ? 128 : that.NumElements*2;
+ CurArray = new void*[CurArraySize+1];
+ memset(CurArray, -1, CurArraySize*sizeof(void*));
+
+ // The end pointer, always valid, is set to a valid element to help the
+ // iterator.
+ CurArray[CurArraySize] = 0;
+
+ // Copy over all valid entries.
+ for (void **BucketPtr = that.CurArray, **E = that.CurArray+CurArraySize;
+ BucketPtr != E; ++BucketPtr) {
+ // Copy over the element if it is valid.
+ void *Elt = *BucketPtr;
+ if (Elt != getTombstoneMarker() && Elt != getEmptyMarker())
+ *const_cast<void**>(FindBucketFor(Elt)) = Elt;
+ }
}
}