From da8ebc6b43cbc587bb072c7fbd9b6fed4baa7644 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Mon, 9 Jul 2007 18:51:15 +0000 Subject: [PATCH] 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 --- lib/Support/SmallPtrSet.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/Support/SmallPtrSet.cpp b/lib/Support/SmallPtrSet.cpp index 81c4bc752fb..5ad243033fc 100644 --- a/lib/Support/SmallPtrSet.cpp +++ b/lib/Support/SmallPtrSet.cpp @@ -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(FindBucketFor(Elt)) = Elt; + if (Elt != getTombstoneMarker() && Elt != getEmptyMarker()) { + if (isSmall()) + SmallArray[NumElements++] = Elt; + else + *const_cast(FindBucketFor(Elt)) = Elt; + } } + + if (!isSmall()) + NumElements = RHS.NumElements; }