Skip to content

[ADT] Use llvm::copy in SmallPtrSet.cpp (NFC) #153930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2025
Merged

[ADT] Use llvm::copy in SmallPtrSet.cpp (NFC) #153930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions llvm/include/llvm/ADT/SmallPtrSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ class SmallPtrSetImplBase : public DebugEpochBase {
return make_range(CurArray, EndPointer());
}

iterator_range<const void *const *> buckets() const {
return make_range(CurArray, EndPointer());
}

/// insert_imp - This returns true if the pointer was new to the set, false if
/// it was already in the set. This is hidden from the client so that the
/// derived class can check that the right type of pointer is passed in.
Expand Down
10 changes: 5 additions & 5 deletions llvm/lib/Support/SmallPtrSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/MemAlloc.h"
#include <algorithm>
Expand Down Expand Up @@ -190,7 +191,7 @@ void SmallPtrSetImplBase::copyHelper(const SmallPtrSetImplBase &RHS) {
CurArraySize = RHS.CurArraySize;

// Copy over the contents from the other set
std::copy(RHS.CurArray, RHS.EndPointer(), CurArray);
llvm::copy(RHS.buckets(), CurArray);

NumEntries = RHS.NumEntries;
NumTombstones = RHS.NumTombstones;
Expand All @@ -214,7 +215,7 @@ void SmallPtrSetImplBase::moveHelper(const void **SmallStorage,
if (RHS.isSmall()) {
// Copy a small RHS rather than moving.
CurArray = SmallStorage;
std::copy(RHS.CurArray, RHS.CurArray + RHS.NumEntries, CurArray);
llvm::copy(RHS.small_buckets(), CurArray);
} else {
CurArray = RHS.CurArray;
RHS.CurArray = RHSSmallStorage;
Expand Down Expand Up @@ -252,7 +253,7 @@ void SmallPtrSetImplBase::swap(const void **SmallStorage,
// 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.CurArray, RHS.CurArray + RHS.NumEntries, SmallStorage);
llvm::copy(RHS.small_buckets(), SmallStorage);
std::swap(RHS.CurArraySize, this->CurArraySize);
std::swap(this->NumEntries, RHS.NumEntries);
std::swap(this->NumTombstones, RHS.NumTombstones);
Expand All @@ -266,8 +267,7 @@ void SmallPtrSetImplBase::swap(const void **SmallStorage,
// 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->CurArray, this->CurArray + this->NumEntries,
RHSSmallStorage);
llvm::copy(this->small_buckets(), RHSSmallStorage);
std::swap(RHS.CurArraySize, this->CurArraySize);
std::swap(RHS.NumEntries, this->NumEntries);
std::swap(RHS.NumTombstones, this->NumTombstones);
Expand Down