diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-06-23 01:29:48 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-06-23 01:29:48 -0400 |
| commit | 036cc48a829ff4625394995fbe22b7a884370103 (patch) | |
| tree | 9776349a355575ffc75d7503ca7ebfe3469ba49c /std/debug.zig | |
| parent | 5e58aa4884995476179f5e74014c16f771e61ba3 (diff) | |
| parent | 9153b17c922e3166a824d300781ca4e6da015787 (diff) | |
| download | zig-036cc48a829ff4625394995fbe22b7a884370103.tar.gz zig-036cc48a829ff4625394995fbe22b7a884370103.zip | |
Merge remote-tracking branch 'origin/master' into copy-elision-3
Diffstat (limited to 'std/debug.zig')
| -rw-r--r-- | std/debug.zig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/std/debug.zig b/std/debug.zig index ae9a5227c9..223f93d1ad 100644 --- a/std/debug.zig +++ b/std/debug.zig @@ -2283,13 +2283,11 @@ var global_allocator_mem: [100 * 1024]u8 = undefined; /// TODO multithreaded awareness var debug_info_allocator: ?*mem.Allocator = null; -var debug_info_direct_allocator: std.heap.DirectAllocator = undefined; var debug_info_arena_allocator: std.heap.ArenaAllocator = undefined; fn getDebugInfoAllocator() *mem.Allocator { if (debug_info_allocator) |a| return a; - debug_info_direct_allocator = std.heap.DirectAllocator.init(); - debug_info_arena_allocator = std.heap.ArenaAllocator.init(&debug_info_direct_allocator.allocator); + debug_info_arena_allocator = std.heap.ArenaAllocator.init(std.heap.direct_allocator); debug_info_allocator = &debug_info_arena_allocator.allocator; return &debug_info_arena_allocator.allocator; } |