From 22261f9e719a012efd871fe04138c3b6e4c8e88c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 14 Sep 2025 17:21:33 +0100 Subject: Fix `temporary_allocator` --- src/common_memory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common_memory.cpp') diff --git a/src/common_memory.cpp b/src/common_memory.cpp index 0b95e1242..3658c0ffe 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -481,7 +481,7 @@ gb_internal gbAllocator permanent_allocator() { } gb_internal gbAllocator temporary_allocator() { - return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Permanent}; + return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Temporary}; } -- cgit v1.2.3 From 7db57e2d9c7d6032334d73f1056478fa23ee4b3a Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 14 Sep 2025 17:24:22 +0100 Subject: Temporarily disable `TEMPORARY_ALLOCATOR_GUARD` --- src/common_memory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common_memory.cpp') diff --git a/src/common_memory.cpp b/src/common_memory.cpp index 3658c0ffe..f169d7974 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -488,8 +488,8 @@ gb_internal gbAllocator temporary_allocator() { #define TEMP_ARENA_GUARD(arena) ArenaTempGuard GB_DEFER_3(_arena_guard_){arena} -// #define TEMPORARY_ALLOCATOR_GUARD() -#define TEMPORARY_ALLOCATOR_GUARD() TEMP_ARENA_GUARD(get_arena(ThreadArena_Temporary)) +// #define TEMPORARY_ALLOCATOR_GUARD() TEMP_ARENA_GUARD(get_arena(ThreadArena_Temporary)) +#define TEMPORARY_ALLOCATOR_GUARD() #define PERMANENT_ALLOCATOR_GUARD() -- cgit v1.2.3 From 11be0cb4ab41c52591a90ca07e7a04062487369e Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 14 Sep 2025 17:37:17 +0100 Subject: Use `permanent_allocator()` instead of `temporary_allocator()` temporarily to fix a bug --- src/common_memory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common_memory.cpp') diff --git a/src/common_memory.cpp b/src/common_memory.cpp index f169d7974..addd43687 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -481,7 +481,8 @@ gb_internal gbAllocator permanent_allocator() { } gb_internal gbAllocator temporary_allocator() { - return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Temporary}; + // return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Temporary}; + return permanent_allocator(); } -- cgit v1.2.3