mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 19:26:06 +00:00
Code Issues Projects Releases Wiki Activity

[Support] Recycler: Match dealloc size and enforce min size (#121889)

Browse Source 
Address sanitizer found mismatching deallocation size in Recycler.
This commit is contained in:
Akshat Oke 2025-01-09 14:22:27 +05:30 committed by GitHub
parent f22441c14d
commit f07b10b7c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/Support/Recycler.h
View File

@ -72,7 +72,7 @@ public:
void clear(AllocatorType &Allocator) {
while (FreeList) {
T *t = reinterpret_cast<T *>(pop_val());
Allocator.Deallocate(t);
Allocator.Deallocate(t, Size, Align);
}
}
@ -89,6 +89,8 @@ public:
"Recycler allocation alignment is less than object align!");
static_assert(sizeof(SubClass) <= Size,
"Recycler allocation size is less than object size!");
static_assert(Size >= sizeof(FreeNode) &&
"Recycler allocation size must be at least sizeof(FreeNode)");
return FreeList ? reinterpret_cast<SubClass *>(pop_val())
: static_cast<SubClass *>(Allocator.Allocate(Size, Align));
}

24
llvm/unittests/Support/RecyclerTest.cpp
View File

@ -14,6 +14,10 @@ using namespace llvm;
namespace {
struct Object1 {
char Data[1];
};
struct Object8 {
char Data[8];
};
@ -22,12 +26,32 @@ class DecoratedMallocAllocator : public MallocAllocator {
public:
int DeallocCount = 0;
void Deallocate(const void *Ptr, size_t Size, size_t Alignment) {
DeallocCount++;
MallocAllocator::Deallocate(Ptr, Size, Alignment);
}
template <typename T> void Deallocate(T *Ptr) {
DeallocCount++;
MallocAllocator::Deallocate(Ptr);
}
};
TEST(RecyclerTest, RecycleAllocation) {
DecoratedMallocAllocator Allocator;
// Recycler needs size to be atleast 8 bytes.
Recycler<Object1, 8, 8> R;
Object1 *A1 = R.Allocate(Allocator);
Object1 *A2 = R.Allocate(Allocator);
R.Deallocate(Allocator, A2);
Object1 *A3 = R.Allocate(Allocator);
EXPECT_EQ(A2, A3); // reuse the deallocated object.
R.Deallocate(Allocator, A1);
R.Deallocate(Allocator, A3);
R.clear(Allocator); // Should deallocate A1 and A3.
EXPECT_EQ(Allocator.DeallocCount, 2);
}
TEST(RecyclerTest, MoveConstructor) {
DecoratedMallocAllocator Allocator;
Recycler<Object8> R;