replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use realloc() to (potentially) resize the contents of SmallPtrSet in place. 

llvm-svn: 39926
This commit is contained in:
Owen Anderson 2007-07-16 21:27:44 +00:00
parent 7d138433e9
commit 81990a3fc3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ public:
} }
~SmallPtrSetImpl() { ~SmallPtrSetImpl() {
if (!isSmall()) if (!isSmall())
delete[] CurArray; free(CurArray);
} }
bool empty() const { return size() == 0; } bool empty() const { return size() == 0; }

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

@ -114,7 +114,8 @@ void SmallPtrSetImpl::Grow() {
bool WasSmall = isSmall(); bool WasSmall = isSmall();
// Install the new array. Clear all the buckets to empty. // Install the new array. Clear all the buckets to empty.
CurArray = new void*[NewSize+1]; CurArray = (void**)malloc(sizeof(void*) * (NewSize+1));
assert(CurArray && "Failed to allocate memory?");
CurArraySize = NewSize; CurArraySize = NewSize;
memset(CurArray, -1, NewSize*sizeof(void*)); memset(CurArray, -1, NewSize*sizeof(void*));
@ -140,7 +141,7 @@ void SmallPtrSetImpl::Grow() {
*const_cast<void**>(FindBucketFor(Elt)) = Elt; *const_cast<void**>(FindBucketFor(Elt)) = Elt;
} }
delete [] OldBuckets; free(OldBuckets);
NumTombstones = 0; NumTombstones = 0;
} }
} }
@ -156,7 +157,8 @@ SmallPtrSetImpl::SmallPtrSetImpl(const SmallPtrSetImpl& that) {
memcpy(CurArray, that.CurArray, sizeof(void*)*(CurArraySize+1)); memcpy(CurArray, that.CurArray, sizeof(void*)*(CurArraySize+1));
} else { } else {
CurArraySize = that.NumElements < 64 ? 128 : that.CurArraySize*2; CurArraySize = that.NumElements < 64 ? 128 : that.CurArraySize*2;
CurArray = new void*[CurArraySize+1]; CurArray = (void**)malloc(sizeof(void*) * (CurArraySize+1));
assert(CurArray && "Failed to allocate memory?");
memset(CurArray, -1, CurArraySize*sizeof(void*)); memset(CurArray, -1, CurArraySize*sizeof(void*));
// The end pointer, always valid, is set to a valid element to help the // The end pointer, always valid, is set to a valid element to help the
@ -183,17 +185,14 @@ void SmallPtrSetImpl::CopyFrom(const SmallPtrSetImpl &RHS) {
NumElements = RHS.NumElements; NumElements = RHS.NumElements;
NumTombstones = RHS.NumTombstones; NumTombstones = RHS.NumTombstones;
// If we're not currently small, and we don't have the same heap size,
// free our heap allocated storage
if (!isSmall() && CurArraySize != RHS.CurArraySize)
delete [] CurArray;
// If we're becoming small, prepare to insert into our stack space // If we're becoming small, prepare to insert into our stack space
if (RHS.isSmall()) if (RHS.isSmall())
CurArray = &SmallArray[0]; CurArray = &SmallArray[0];
// Otherwise, allocate new heap space (unless we were the same size) // Otherwise, allocate new heap space (unless we were the same size)
else if (CurArraySize != RHS.CurArraySize) else if (CurArraySize != RHS.CurArraySize) {
CurArray = new void*[RHS.CurArraySize+1]; CurArray = (void**)realloc(CurArray, sizeof(void*)*(RHS.CurArraySize+1));
assert(CurArray && "Failed to allocate memory?");
}
// Copy over the new array size // Copy over the new array size
CurArraySize = RHS.CurArraySize; CurArraySize = RHS.CurArraySize;