RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:37:46 +00:00
Code Issues Activity Actions

LibJS: Actually invoke the type-isolating cell allocators

Browse source 
Due to a `requires` mistake, we were always using the fallback
size-based cell allocators.

Also, now that we start using them, make them NeverDestroyed so
we don't try to deallocate them on program exit.
This commit is contained in:
Andreas Kling 2023-12-23 20:00:21 +01:00
parent f953a70965
commit 6c1fcc5f7e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibJS/Heap/CellAllocator.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/IntrusiveList.h> #include <AK/IntrusiveList.h>
#include <AK/NeverDestroyed.h>
#include <AK/NonnullOwnPtr.h> #include <AK/NonnullOwnPtr.h>
#include <LibJS/Forward.h> #include <LibJS/Forward.h>
#include <LibJS/Heap/HeapBlock.h> #include <LibJS/Heap/HeapBlock.h>
@ -61,7 +62,7 @@ class TypeIsolatingCellAllocator {
public: public:
using CellType = T; using CellType = T;
CellAllocator allocator { sizeof(T) }; NeverDestroyed<CellAllocator> allocator { sizeof(T) };
}; };
} }

4
Userland/Libraries/LibJS/Heap/Heap.h
View file

@ -101,9 +101,9 @@ private:
Cell* allocate_cell() Cell* allocate_cell()
{ {
will_allocate(sizeof(T)); will_allocate(sizeof(T));
if constexpr (requires { T::cell_allocator.allocate_cell(*this); }) { if constexpr (requires { T::cell_allocator.allocator.get().allocate_cell(*this); }) {
if constexpr (IsSame<T, typename decltype(T::cell_allocator)::CellType>) { if constexpr (IsSame<T, typename decltype(T::cell_allocator)::CellType>) {
return T::cell_allocator.allocate_cell(*this); return T::cell_allocator.allocator.get().allocate_cell(*this);
} }
} }
return allocator_for_size(sizeof(T)).allocate_cell(*this); return allocator_for_size(sizeof(T)).allocate_cell(*this);