From f03e62a8008a8ad279a6ed157fb507095177d17a Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Wed, 7 Mar 2012 22:48:42 +0000 Subject: Copy the right amount of elements. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152254 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/SmallPtrSet.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/Support/SmallPtrSet.cpp') diff --git a/lib/Support/SmallPtrSet.cpp b/lib/Support/SmallPtrSet.cpp index 92ffa49833..68d9c29411 100644 --- a/lib/Support/SmallPtrSet.cpp +++ b/lib/Support/SmallPtrSet.cpp @@ -241,7 +241,8 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) { // If only RHS is small, copy the small elements into LHS and move the pointer // from LHS to RHS. if (!this->isSmall() && RHS.isSmall()) { - std::copy(RHS.SmallArray, RHS.SmallArray+CurArraySize, this->SmallArray); + std::copy(RHS.SmallArray, RHS.SmallArray+RHS.CurArraySize, + this->SmallArray); std::swap(this->NumElements, RHS.NumElements); std::swap(this->CurArraySize, RHS.CurArraySize); RHS.CurArray = this->CurArray; @@ -254,7 +255,8 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) { // If only LHS is small, copy the small elements into RHS and move the pointer // from RHS to LHS. if (this->isSmall() && !RHS.isSmall()) { - std::copy(this->SmallArray, this->SmallArray+CurArraySize, RHS.SmallArray); + std::copy(this->SmallArray, this->SmallArray+this->CurArraySize, + RHS.SmallArray); std::swap(RHS.NumElements, this->NumElements); std::swap(RHS.CurArraySize, this->CurArraySize); this->CurArray = RHS.CurArray; @@ -267,7 +269,7 @@ void SmallPtrSetImpl::swap(SmallPtrSetImpl &RHS) { // Both a small, just swap the small elements. assert(this->isSmall() && RHS.isSmall()); assert(this->CurArraySize == RHS.CurArraySize); - std::swap_ranges(this->SmallArray, this->SmallArray+CurArraySize, + std::swap_ranges(this->SmallArray, this->SmallArray+this->CurArraySize, RHS.SmallArray); std::swap(this->NumElements, RHS.NumElements); } -- cgit v1.2.3