From b269cadf5680e688286660a507fd64d4f3145710 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Mon, 18 Sep 2023 01:15:42 -0700 Subject: [PATCH] util: Make DECLARE_LINEAR_ALLOC_* macros assume no destructors MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Linear allocator doesn't support calling custom destructors to its child allocations nor freeing individual child allocations. So the destructor callback and the delete operator don't apply to objects using linear allocator. Reviewed-by: Marek Olšák Part-of: --- src/util/ralloc.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/util/ralloc.h b/src/util/ralloc.h index 47a0f40..1759692 100644 --- a/src/util/ralloc.h +++ b/src/util/ralloc.h @@ -517,7 +517,7 @@ void gc_sweep_end(gc_ctx *ctx); * * which is more idiomatic in C++ than calling ralloc. */ -#define DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(TYPE, ALLOC_FUNC) \ +#define DECLARE_RALLOC_CXX_OPERATORS_TEMPLATE(TYPE, ALLOC_FUNC) \ private: \ static void _ralloc_destructor(void *p) \ { \ @@ -545,16 +545,27 @@ public: \ } #define DECLARE_RALLOC_CXX_OPERATORS(type) \ - DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, ralloc_size) + DECLARE_RALLOC_CXX_OPERATORS_TEMPLATE(type, ralloc_size) #define DECLARE_RZALLOC_CXX_OPERATORS(type) \ - DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, rzalloc_size) + DECLARE_RALLOC_CXX_OPERATORS_TEMPLATE(type, rzalloc_size) + + +#define DECLARE_LINEAR_ALLOC_CXX_OPERATORS_TEMPLATE(TYPE, ALLOC_FUNC) \ +public: \ + static void* operator new(size_t size, void *mem_ctx) \ + { \ + void *p = ALLOC_FUNC(mem_ctx, size); \ + assert(p != NULL); \ + static_assert(HAS_TRIVIAL_DESTRUCTOR(TYPE)); \ + return p; \ + } #define DECLARE_LINEAR_ALLOC_CXX_OPERATORS(type) \ - DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_alloc_child) + DECLARE_LINEAR_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_alloc_child) #define DECLARE_LINEAR_ZALLOC_CXX_OPERATORS(type) \ - DECLARE_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_zalloc_child) + DECLARE_LINEAR_ALLOC_CXX_OPERATORS_TEMPLATE(type, linear_zalloc_child) /** * Do a fast allocation from the linear buffer, also known as the child node -- 2.7.4