Skip to content

[ADT] Consolidate the grow() logic in DenseMapBase (NFC) #168316

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −21
Open

[ADT] Consolidate the grow() logic in DenseMapBase (NFC) #168316

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
39 changes: 18 additions & 21 deletions llvm/include/llvm/ADT/DenseMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,12 @@ class DenseMapBase : public DebugEpochBase {

void grow(unsigned MinNumBuckets) {
unsigned NumBuckets = DerivedT::roundUpNumBuckets(MinNumBuckets);
derived().grow(NumBuckets);
DerivedT Tmp(NumBuckets, ExactBucketCount{});
Tmp.moveFrom(derived());
if (derived().maybeMoveFast(std::move(Tmp)))
return;
initWithExactBucketCount(NumBuckets);
moveFrom(Tmp);
}

template <typename LookupKeyT>
Expand Down Expand Up @@ -848,10 +853,9 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
static_cast<unsigned>(NextPowerOf2(MinNumBuckets - 1)));
}

void grow(unsigned AtLeast) {
DenseMap Tmp(AtLeast, typename BaseT::ExactBucketCount{});
Tmp.moveFrom(*this);
swapImpl(Tmp);
bool maybeMoveFast(DenseMap &&Other) {
swapImpl(Other);
return true;
}

// Plan how to shrink the bucket table. Return:
Expand Down Expand Up @@ -1120,23 +1124,16 @@ class SmallDenseMap
static_cast<unsigned>(NextPowerOf2(MinNumBuckets - 1)));
}

void grow(unsigned NumBuckets) {
SmallDenseMap Tmp(NumBuckets, typename BaseT::ExactBucketCount{});
Tmp.moveFrom(*this);
bool maybeMoveFast(SmallDenseMap &&Other) {
if (Other.Small)
return false;

if (Tmp.Small) {
// Use moveFrom in those rare cases where we stay in the small mode. This
// can happen when we have many tombstones.
Small = true;
this->BaseT::initEmpty();
this->moveFrom(Tmp);
} else {
Small = false;
NumEntries = Tmp.NumEntries;
NumTombstones = Tmp.NumTombstones;
*getLargeRep() = std::move(*Tmp.getLargeRep());
Tmp.getLargeRep()->NumBuckets = 0;
}
Small = false;
NumEntries = Other.NumEntries;
NumTombstones = Other.NumTombstones;
*getLargeRep() = std::move(*Other.getLargeRep());
Other.getLargeRep()->NumBuckets = 0;
return true;
}

// Plan how to shrink the bucket table. Return:
Expand Down
Loading