Fix an error in the assignment operator that was causing an infinite loop in GVNPRE.cpp.

Patch by Chis Lattner.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@38467 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2007-07-09 18:51:15 +00:00
parent ba7721633c
commit da8ebc6b43

View File

@ -182,6 +182,8 @@ void SmallPtrSetImpl::CopyFrom(const SmallPtrSetImpl &RHS) {
if (!isSmall())
delete [] CurArray;
NumElements = NumTombstones = 0;
// Get a power of two larger than twice the RHS size.
CurArraySize = 1 << Log2_32(RHS.size()*4);
@ -199,12 +201,18 @@ void SmallPtrSetImpl::CopyFrom(const SmallPtrSetImpl &RHS) {
// Now that we know we have enough space, and that the current array is empty,
// copy over all the elements from the RHS.
for (void **BucketPtr = RHS.CurArray, **E = RHS.CurArray+RHS.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;
if (Elt != getTombstoneMarker() && Elt != getEmptyMarker()) {
if (isSmall())
SmallArray[NumElements++] = Elt;
else
*const_cast<void**>(FindBucketFor(Elt)) = Elt;
}
}
if (!isSmall())
NumElements = RHS.NumElements;
}