mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Prevent infinite growth of SmallPtrSet instances.
Rehash but don't grow when full of tombstones. Patch by José Fonseca! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128566 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
aea4fe2862
commit
e10fff6f88
@ -133,7 +133,7 @@ private:
|
||||
void shrink_and_clear();
|
||||
|
||||
/// Grow - Allocate a larger backing store for the buckets and move it over.
|
||||
void Grow();
|
||||
void Grow(unsigned NewSize);
|
||||
|
||||
void operator=(const SmallPtrSetImpl &RHS); // DO NOT IMPLEMENT.
|
||||
protected:
|
||||
|
@ -52,10 +52,14 @@ bool SmallPtrSetImpl::insert_imp(const void * Ptr) {
|
||||
// Otherwise, hit the big set case, which will call grow.
|
||||
}
|
||||
|
||||
// If more than 3/4 of the array is full, grow.
|
||||
if (NumElements*4 >= CurArraySize*3 ||
|
||||
CurArraySize-(NumElements+NumTombstones) < CurArraySize/8)
|
||||
Grow();
|
||||
if (NumElements*4 >= CurArraySize*3) {
|
||||
// If more than 3/4 of the array is full, grow.
|
||||
Grow(CurArraySize < 64 ? 128 : CurArraySize*2);
|
||||
} else if (CurArraySize-(NumElements+NumTombstones) < CurArraySize/8) {
|
||||
// If fewer of 1/8 of the array is empty (meaning that many are filled with
|
||||
// tombstones), rehash.
|
||||
Grow(CurArraySize);
|
||||
}
|
||||
|
||||
// Okay, we know we have space. Find a hash bucket.
|
||||
const void **Bucket = const_cast<const void**>(FindBucketFor(Ptr));
|
||||
@ -125,10 +129,9 @@ const void * const *SmallPtrSetImpl::FindBucketFor(const void *Ptr) const {
|
||||
|
||||
/// Grow - Allocate a larger backing store for the buckets and move it over.
|
||||
///
|
||||
void SmallPtrSetImpl::Grow() {
|
||||
void SmallPtrSetImpl::Grow(unsigned NewSize) {
|
||||
// Allocate at twice as many buckets, but at least 128.
|
||||
unsigned OldSize = CurArraySize;
|
||||
unsigned NewSize = OldSize < 64 ? 128 : OldSize*2;
|
||||
|
||||
const void **OldBuckets = CurArray;
|
||||
bool WasSmall = isSmall();
|
||||
|
Loading…
Reference in New Issue
Block a user