6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-31 08:16:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix PR1329.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36016 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeff Cohen
2007-04-14 21:50:21 +00:00
parent bbb2a7a2cf
commit ac58a16f85
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/ADT/SmallPtrSet.h
View File

@@ -53,6 +53,9 @@ protected:
unsigned NumElements; unsigned NumElements;
unsigned NumTombstones; unsigned NumTombstones;
void *SmallArray[1]; // Must be last ivar. void *SmallArray[1]; // Must be last ivar.
// Helper to copy construct a SmallPtrSet.
SmallPtrSetImpl(const SmallPtrSetImpl& that);
public: public:
SmallPtrSetImpl(unsigned SmallSize) { SmallPtrSetImpl(unsigned SmallSize) {
assert(SmallSize && (SmallSize & (SmallSize-1)) == 0 && assert(SmallSize && (SmallSize & (SmallSize-1)) == 0 &&
@@ -214,6 +217,7 @@ class SmallPtrSet : public SmallPtrSetImpl {
void *SmallArray[SmallSizePowTwo]; void *SmallArray[SmallSizePowTwo];
public: public:
SmallPtrSet() : SmallPtrSetImpl(NextPowerOfTwo<SmallSizePowTwo>::Val) {} SmallPtrSet() : SmallPtrSetImpl(NextPowerOfTwo<SmallSizePowTwo>::Val) {}
SmallPtrSet(const SmallPtrSet &that) : SmallPtrSetImpl(that) {}
template<typename It> template<typename It>
SmallPtrSet(It I, It E) SmallPtrSet(It I, It E)

28
lib/Support/SmallPtrSet.cpp
View File

@@ -141,5 +141,33 @@ void SmallPtrSetImpl::Grow() {
} }
delete [] OldBuckets; 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;
}
} }
} }