Commit 298f6380 authored by Craig Topper's avatar Craig Topper
Browse files

Fix an off by 1 bug that prevented SmallPtrSet from using all of its 'small'... 

Fix an off by 1 bug that prevented SmallPtrSet from using all of its 'small' capacity. Then fix the early return in the move constructor that prevented 'small' moves from clearing the NumElements in the moved from object. The directed test missed this because it was always testing large moves due to the off by 1 bug.

llvm-svn: 216044
parent b8083476

llvm/lib/Support/SmallPtrSet.cpp

+5 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ bool SmallPtrSetImplBase::insert_imp(const void * Ptr) { 
        return false;

    

    // Nope, there isn't.  If we stay small, just 'pushback' now.

    if (NumElements < CurArraySize-1) {

    if (NumElements < CurArraySize) {

      SmallArray[NumElements++] = Ptr;

      return true;

    }
@@ -200,12 +200,11 @@ SmallPtrSetImplBase::SmallPtrSetImplBase(const void **SmallStorage, 
  if (that.isSmall()) {

    CurArray = SmallArray;

    memcpy(CurArray, that.CurArray, sizeof(void *) * CurArraySize);

    return;

  }



  } else {

    // Otherwise, we steal the large memory allocation and no copy is needed.

    CurArray = that.CurArray;

    that.CurArray = that.SmallArray;

  }



  // Make the "that" object small and empty.

  that.CurArraySize = SmallSize;