Browse Source

Merge branch 'odin-lang:master' into os-get-current-directory-allocator-arg

Yuriy Grynevych 11 months ago
parent
commit
80622bcb3a
1 changed files with 6 additions and 1 deletions
  1. 6 1
      core/os/os2/allocators.odin

+ 6 - 1
core/os/os2/allocators.odin

@@ -22,9 +22,14 @@ global_default_temp_allocator_index: uint
 
 @(require_results)
 temp_allocator :: proc() -> runtime.Allocator {
+	arena := &global_default_temp_allocator_arenas[global_default_temp_allocator_index]
+	if arena.backing_allocator.procedure == nil {
+		arena.backing_allocator = heap_allocator()
+	}
+
 	return runtime.Allocator{
 		procedure = temp_allocator_proc,
-		data      = &global_default_temp_allocator_arenas[global_default_temp_allocator_index],
+		data      = arena,
 	}
 }