GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hash_set_crash_fix' of https://github.com/VitaminCpp/FlaxEngine into VitaminCpp-hash_set_crash_fix

Browse Source
This commit is contained in:
Wojtek Figat
2025-12-14 21:52:40 +01:00
parent 5e5293bf7b 63def54dad
commit 4846d4b024
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Core/Collections/HashSetBase.h
View File

@@ -408,28 +408,37 @@ protected:
} }
else else
{ {
const int32 elementsCount = _elementsCount;
// Rebuild entire table completely // Rebuild entire table completely
const int32 oldSize = _size;
AllocationData oldAllocation; AllocationData oldAllocation;
AllocationUtils::MoveToEmpty<BucketType, AllocationType>(oldAllocation, _allocation, _size, _size); AllocationUtils::MoveToEmpty<BucketType, AllocationType>(oldAllocation, _allocation, oldSize, oldSize);
_allocation.Allocate(_size); _allocation.Allocate(_size);
BucketType* data = _allocation.Get(); BucketType* data = _allocation.Get();
for (int32 i = 0; i < _size; ++i) for (int32 i = 0; i < _size; ++i)
data[i]._state = HashSetBucketState::Empty; data[i]._state = HashSetBucketState::Empty;
BucketType* oldData = oldAllocation.Get(); BucketType* oldData = oldAllocation.Get();
FindPositionResult pos; FindPositionResult pos;
for (int32 i = 0; i < _size; ++i) for (int32 i = 0; i < oldSize; ++i)
{ {
BucketType& oldBucket = oldData[i]; BucketType& oldBucket = oldData[i];
if (oldBucket.IsOccupied()) if (oldBucket.IsOccupied())
{ {
FindPosition(oldBucket.GetKey(), pos); FindPosition(oldBucket.GetKey(), pos);
if (pos.FreeSlotIndex == -1)
{
// Grow and retry to handle pathological cases (eg. heavy collisions)
EnsureCapacity(_size + 1, true);
FindPosition(oldBucket.GetKey(), pos);
}
ASSERT(pos.FreeSlotIndex != -1); ASSERT(pos.FreeSlotIndex != -1);
BucketType& bucket = _allocation.Get()[pos.FreeSlotIndex]; BucketType& bucket = _allocation.Get()[pos.FreeSlotIndex];
bucket = MoveTemp(oldBucket); bucket = MoveTemp(oldBucket);
} }
} }
for (int32 i = 0; i < _size; ++i) for (int32 i = 0; i < oldSize; ++i)
oldData[i].Free(); oldData[i].Free();
_elementsCount = elementsCount;
} }
_deletedCount = 0; _deletedCount = 0;
} }