From 92431c83ec03ef809cd7f9583093020839d290e8 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 9 Feb 2021 14:00:59 +0000 Subject: [PATCH] Change `default_temp_allocator_proc` behaviour to use the `default_allocator` when the backing data has not been set. --- core/runtime/default_allocators.odin | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/runtime/default_allocators.odin b/core/runtime/default_allocators.odin index b9d18524f..518cdf287 100644 --- a/core/runtime/default_allocators.odin +++ b/core/runtime/default_allocators.odin @@ -65,12 +65,7 @@ default_temp_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode s := (^Default_Temp_Allocator)(allocator_data); if s.data == nil { - a := context.allocator; - if !(context.allocator.procedure != default_temp_allocator_proc && - context.allocator.data != allocator_data) { - a = default_allocator(); - } - default_temp_allocator_init(s, DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, a); + default_temp_allocator_init(s, DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, default_allocator()); } size := size;