authorgravatar for leecannon@leecannon.xyzLee Cannon <leecannon@leecannon.xyz> 2021-10-29 02:08:41+01:00
committergravatar for leecannon@leecannon.xyzLee Cannon <leecannon@leecannon.xyz> 2021-11-30 23:32:47+00:00
log1093b09a989edb8553e79b061bb15c5745f5d193
tree4e87b6b48410b901239a102f5fbdf859816511d1
parent75548b50ff23a3de48d166170425001c073d27c1
signaturelock-open Commit is signed but in an unrecognized format.

allocgate: renamed getAllocator function to allocator

77 files changed, 202 insertions(+), 207 deletions(-)

ci/srht/update-download-page.zig+1-1
...@@ -6,7 +6,7 @@ pub fn main() !void {...@@ -6,7 +6,7 @@ pub fn main() !void {
6 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);6 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
7 defer arena.deinit();7 defer arena.deinit();
88
9 const allocator = arena.getAllocator();9 const allocator = arena.allocator();
1010
11 const out_dir = "out";11 const out_dir = "out";
12 try std.fs.cwd().makePath(out_dir);12 try std.fs.cwd().makePath(out_dir);
doc/docgen.zig+1-1
...@@ -21,7 +21,7 @@ pub fn main() !void {...@@ -21,7 +21,7 @@ pub fn main() !void {
21 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);21 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
22 defer arena.deinit();22 defer arena.deinit();
2323
24 const allocator = arena.getAllocator();24 const allocator = arena.allocator();
2525
26 var args_it = process.args();26 var args_it = process.args();
2727
doc/langref.html.in+4-4
...@@ -10061,7 +10061,7 @@ const expect = std.testing.expect;...@@ -10061,7 +10061,7 @@ const expect = std.testing.expect;
1006110061
10062test "using an allocator" {10062test "using an allocator" {
10063 var buffer: [100]u8 = undefined;10063 var buffer: [100]u8 = undefined;
10064 const allocator = std.heap.FixedBufferAllocator.init(&buffer).getAllocator();10064 const allocator = std.heap.FixedBufferAllocator.init(&buffer).allocator();
10065 const result = try concat(allocator, "foo", "bar");10065 const result = try concat(allocator, "foo", "bar");
10066 try expect(std.mem.eql(u8, "foobar", result));10066 try expect(std.mem.eql(u8, "foobar", result));
10067}10067}
...@@ -10114,7 +10114,7 @@ pub fn main() !void {...@@ -10114,7 +10114,7 @@ pub fn main() !void {
10114 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);10114 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
10115 defer arena.deinit();10115 defer arena.deinit();
1011610116
10117 const allocator = arena.getAllocator();10117 const allocator = arena.allocator();
1011810118
10119 const ptr = try allocator.create(i32);10119 const ptr = try allocator.create(i32);
10120 std.debug.print("ptr={*}\n", .{ptr});10120 std.debug.print("ptr={*}\n", .{ptr});
...@@ -10820,7 +10820,7 @@ const std = @import("std");...@@ -10820,7 +10820,7 @@ const std = @import("std");
1082010820
10821pub fn main() !void {10821pub fn main() !void {
10822 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};10822 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};
10823 const gpa = general_purpose_allocator.getAllocator();10823 const gpa = general_purpose_allocator.allocator();
10824 const args = try std.process.argsAlloc(gpa);10824 const args = try std.process.argsAlloc(gpa);
10825 defer std.process.argsFree(gpa, args);10825 defer std.process.argsFree(gpa, args);
1082610826
...@@ -10842,7 +10842,7 @@ const PreopenList = std.fs.wasi.PreopenList;...@@ -10842,7 +10842,7 @@ const PreopenList = std.fs.wasi.PreopenList;
1084210842
10843pub fn main() !void {10843pub fn main() !void {
10844 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};10844 var general_purpose_allocator = std.heap.GeneralPurposeAllocator(.{}){};
10845 const gpa = general_purpose_allocator.getAllocator();10845 const gpa = general_purpose_allocator.allocator();
1084610846
10847 var preopens = PreopenList.init(gpa);10847 var preopens = PreopenList.init(gpa);
10848 defer preopens.deinit();10848 defer preopens.deinit();
lib/std/Thread.zig+1-1
...@@ -460,7 +460,7 @@ const WindowsThreadImpl = struct {...@@ -460,7 +460,7 @@ const WindowsThreadImpl = struct {
460 errdefer assert(windows.kernel32.HeapFree(heap_handle, 0, alloc_ptr) != 0);460 errdefer assert(windows.kernel32.HeapFree(heap_handle, 0, alloc_ptr) != 0);
461461
462 const instance_bytes = @ptrCast([*]u8, alloc_ptr)[0..alloc_bytes];462 const instance_bytes = @ptrCast([*]u8, alloc_ptr)[0..alloc_bytes];
463 const instance = std.heap.FixedBufferAllocator.init(instance_bytes).getAllocator().create(Instance) catch unreachable;463 const instance = std.heap.FixedBufferAllocator.init(instance_bytes).allocator().create(Instance) catch unreachable;
464 instance.* = .{464 instance.* = .{
465 .fn_args = args,465 .fn_args = args,
466 .thread = .{466 .thread = .{
lib/std/array_list.zig+3-3
...@@ -1119,7 +1119,7 @@ test "std.ArrayList/ArrayListUnmanaged.insertSlice" {...@@ -1119,7 +1119,7 @@ test "std.ArrayList/ArrayListUnmanaged.insertSlice" {
1119test "std.ArrayList/ArrayListUnmanaged.replaceRange" {1119test "std.ArrayList/ArrayListUnmanaged.replaceRange" {
1120 var arena = std.heap.ArenaAllocator.init(testing.allocator);1120 var arena = std.heap.ArenaAllocator.init(testing.allocator);
1121 defer arena.deinit();1121 defer arena.deinit();
1122 const a = arena.getAllocator();1122 const a = arena.allocator();
11231123
1124 const init = [_]i32{ 1, 2, 3, 4, 5 };1124 const init = [_]i32{ 1, 2, 3, 4, 5 };
1125 const new = [_]i32{ 0, 0, 0 };1125 const new = [_]i32{ 0, 0, 0 };
...@@ -1263,7 +1263,7 @@ test "std.ArrayList/ArrayListUnmanaged.shrink still sets length on error.OutOfMe...@@ -1263,7 +1263,7 @@ test "std.ArrayList/ArrayListUnmanaged.shrink still sets length on error.OutOfMe
1263 // use an arena allocator to make sure realloc returns error.OutOfMemory1263 // use an arena allocator to make sure realloc returns error.OutOfMemory
1264 var arena = std.heap.ArenaAllocator.init(testing.allocator);1264 var arena = std.heap.ArenaAllocator.init(testing.allocator);
1265 defer arena.deinit();1265 defer arena.deinit();
1266 const a = arena.getAllocator();1266 const a = arena.allocator();
12671267
1268 {1268 {
1269 var list = ArrayList(i32).init(a);1269 var list = ArrayList(i32).init(a);
...@@ -1361,7 +1361,7 @@ test "ArrayListAligned/ArrayListAlignedUnmanaged accepts unaligned slices" {...@@ -1361,7 +1361,7 @@ test "ArrayListAligned/ArrayListAlignedUnmanaged accepts unaligned slices" {
13611361
1362test "std.ArrayList(u0)" {1362test "std.ArrayList(u0)" {
1363 // An ArrayList on zero-sized types should not need to allocate1363 // An ArrayList on zero-sized types should not need to allocate
1364 const a = testing.FailingAllocator.init(testing.allocator, 0).getAllocator();1364 const a = testing.FailingAllocator.init(testing.allocator, 0).allocator();
13651365
1366 var list = ArrayList(u0).init(a);1366 var list = ArrayList(u0).init(a);
1367 defer list.deinit();1367 defer list.deinit();
lib/std/atomic/queue.zig+1-1
...@@ -177,7 +177,7 @@ test "std.atomic.Queue" {...@@ -177,7 +177,7 @@ test "std.atomic.Queue" {
177 defer std.heap.page_allocator.free(plenty_of_memory);177 defer std.heap.page_allocator.free(plenty_of_memory);
178178
179 var fixed_buffer_allocator = std.heap.FixedBufferAllocator.init(plenty_of_memory);179 var fixed_buffer_allocator = std.heap.FixedBufferAllocator.init(plenty_of_memory);
180 var a = fixed_buffer_allocator.getThreadSafeAllocator();180 var a = fixed_buffer_allocator.threadSafeAllocator();
181181
182 var queue = Queue(i32).init();182 var queue = Queue(i32).init();
183 var context = Context{183 var context = Context{
lib/std/atomic/stack.zig+1-1
...@@ -89,7 +89,7 @@ test "std.atomic.stack" {...@@ -89,7 +89,7 @@ test "std.atomic.stack" {
89 defer std.heap.page_allocator.free(plenty_of_memory);89 defer std.heap.page_allocator.free(plenty_of_memory);
9090
91 var fixed_buffer_allocator = std.heap.FixedBufferAllocator.init(plenty_of_memory);91 var fixed_buffer_allocator = std.heap.FixedBufferAllocator.init(plenty_of_memory);
92 var a = fixed_buffer_allocator.getThreadSafeAllocator();92 var a = fixed_buffer_allocator.threadSafeAllocator();
9393
94 var stack = Stack(i32).init();94 var stack = Stack(i32).init();
95 var context = Context{95 var context = Context{
lib/std/build.zig+3-3
...@@ -1285,7 +1285,7 @@ test "builder.findProgram compiles" {...@@ -1285,7 +1285,7 @@ test "builder.findProgram compiles" {
1285 defer arena.deinit();1285 defer arena.deinit();
12861286
1287 const builder = try Builder.create(1287 const builder = try Builder.create(
1288 arena.getAllocator(),1288 arena.allocator(),
1289 "zig",1289 "zig",
1290 "zig-cache",1290 "zig-cache",
1291 "zig-cache",1291 "zig-cache",
...@@ -3207,7 +3207,7 @@ test "Builder.dupePkg()" {...@@ -3207,7 +3207,7 @@ test "Builder.dupePkg()" {
3207 var arena = std.heap.ArenaAllocator.init(std.testing.allocator);3207 var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
3208 defer arena.deinit();3208 defer arena.deinit();
3209 var builder = try Builder.create(3209 var builder = try Builder.create(
3210 arena.getAllocator(),3210 arena.allocator(),
3211 "test",3211 "test",
3212 "test",3212 "test",
3213 "test",3213 "test",
...@@ -3252,7 +3252,7 @@ test "LibExeObjStep.addPackage" {...@@ -3252,7 +3252,7 @@ test "LibExeObjStep.addPackage" {
3252 defer arena.deinit();3252 defer arena.deinit();
32533253
3254 var builder = try Builder.create(3254 var builder = try Builder.create(
3255 arena.getAllocator(),3255 arena.allocator(),
3256 "test",3256 "test",
3257 "test",3257 "test",
3258 "test",3258 "test",
lib/std/build/OptionsStep.zig+1-1
...@@ -274,7 +274,7 @@ test "OptionsStep" {...@@ -274,7 +274,7 @@ test "OptionsStep" {
274 var arena = std.heap.ArenaAllocator.init(std.testing.allocator);274 var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
275 defer arena.deinit();275 defer arena.deinit();
276 var builder = try Builder.create(276 var builder = try Builder.create(
277 arena.getAllocator(),277 arena.allocator(),
278 "test",278 "test",
279 "test",279 "test",
280 "test",280 "test",
lib/std/builtin.zig+1-1
...@@ -75,7 +75,7 @@ pub const StackTrace = struct {...@@ -75,7 +75,7 @@ pub const StackTrace = struct {
75 };75 };
76 const tty_config = std.debug.detectTTYConfig();76 const tty_config = std.debug.detectTTYConfig();
77 try writer.writeAll("\n");77 try writer.writeAll("\n");
78 std.debug.writeStackTrace(self, writer, arena.getAllocator(), debug_info, tty_config) catch |err| {78 std.debug.writeStackTrace(self, writer, arena.allocator(), debug_info, tty_config) catch |err| {
79 try writer.print("Unable to print stack trace: {s}\n", .{@errorName(err)});79 try writer.print("Unable to print stack trace: {s}\n", .{@errorName(err)});
80 };80 };
81 try writer.writeAll("\n");81 try writer.writeAll("\n");
lib/std/child_process.zig+2-2
...@@ -541,7 +541,7 @@ pub const ChildProcess = struct {...@@ -541,7 +541,7 @@ pub const ChildProcess = struct {
541541
542 var arena_allocator = std.heap.ArenaAllocator.init(self.allocator);542 var arena_allocator = std.heap.ArenaAllocator.init(self.allocator);
543 defer arena_allocator.deinit();543 defer arena_allocator.deinit();
544 const arena = arena_allocator.getAllocator();544 const arena = arena_allocator.allocator();
545545
546 // The POSIX standard does not allow malloc() between fork() and execve(),546 // The POSIX standard does not allow malloc() between fork() and execve(),
547 // and `self.allocator` may be a libc allocator.547 // and `self.allocator` may be a libc allocator.
...@@ -1149,7 +1149,7 @@ test "createNullDelimitedEnvMap" {...@@ -1149,7 +1149,7 @@ test "createNullDelimitedEnvMap" {
11491149
1150 var arena = std.heap.ArenaAllocator.init(allocator);1150 var arena = std.heap.ArenaAllocator.init(allocator);
1151 defer arena.deinit();1151 defer arena.deinit();
1152 const environ = try createNullDelimitedEnvMap(arena.getAllocator(), &envmap);1152 const environ = try createNullDelimitedEnvMap(arena.allocator(), &envmap);
11531153
1154 try testing.expectEqual(@as(usize, 5), environ.len);1154 try testing.expectEqual(@as(usize, 5), environ.len);
11551155
lib/std/crypto/benchmark.zig+1-1
...@@ -363,7 +363,7 @@ pub fn main() !void {...@@ -363,7 +363,7 @@ pub fn main() !void {
363363
364 var buffer: [1024]u8 = undefined;364 var buffer: [1024]u8 = undefined;
365 var fixed = std.heap.FixedBufferAllocator.init(buffer[0..]);365 var fixed = std.heap.FixedBufferAllocator.init(buffer[0..]);
366 const args = try std.process.argsAlloc(fixed.getAllocator());366 const args = try std.process.argsAlloc(fixed.allocator());
367367
368 var filter: ?[]u8 = "";368 var filter: ?[]u8 = "";
369369
lib/std/debug.zig+1-1
...@@ -1566,7 +1566,7 @@ fn getDebugInfoAllocator() mem.Allocator {...@@ -1566,7 +1566,7 @@ fn getDebugInfoAllocator() mem.Allocator {
1566 if (debug_info_allocator) |a| return a;1566 if (debug_info_allocator) |a| return a;
15671567
1568 debug_info_arena_allocator = std.heap.ArenaAllocator.init(std.heap.page_allocator);1568 debug_info_arena_allocator = std.heap.ArenaAllocator.init(std.heap.page_allocator);
1569 const allocator = debug_info_arena_allocator.getAllocator();1569 const allocator = debug_info_arena_allocator.allocator();
1570 debug_info_allocator = allocator;1570 debug_info_allocator = allocator;
1571 return allocator;1571 return allocator;
1572}1572}
lib/std/event/loop.zig+2-2
...@@ -173,12 +173,12 @@ pub const Loop = struct {...@@ -173,12 +173,12 @@ pub const Loop = struct {
173 // We need at least one of these in case the fs thread wants to use onNextTick173 // We need at least one of these in case the fs thread wants to use onNextTick
174 const extra_thread_count = thread_count - 1;174 const extra_thread_count = thread_count - 1;
175 const resume_node_count = std.math.max(extra_thread_count, 1);175 const resume_node_count = std.math.max(extra_thread_count, 1);
176 self.eventfd_resume_nodes = try self.arena.getAllocator().alloc(176 self.eventfd_resume_nodes = try self.arena.allocator().alloc(
177 std.atomic.Stack(ResumeNode.EventFd).Node,177 std.atomic.Stack(ResumeNode.EventFd).Node,
178 resume_node_count,178 resume_node_count,
179 );179 );
180180
181 self.extra_threads = try self.arena.getAllocator().alloc(Thread, extra_thread_count);181 self.extra_threads = try self.arena.allocator().alloc(Thread, extra_thread_count);
182182
183 try self.initOsData(extra_thread_count);183 try self.initOsData(extra_thread_count);
184 errdefer self.deinitOsData();184 errdefer self.deinitOsData();
lib/std/fs/test.zig+7-7
...@@ -52,7 +52,7 @@ test "accessAbsolute" {...@@ -52,7 +52,7 @@ test "accessAbsolute" {
5252
53 var arena = ArenaAllocator.init(testing.allocator);53 var arena = ArenaAllocator.init(testing.allocator);
54 defer arena.deinit();54 defer arena.deinit();
55 const allocator = arena.getAllocator();55 const allocator = arena.allocator();
5656
57 const base_path = blk: {57 const base_path = blk: {
58 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });58 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });
...@@ -71,7 +71,7 @@ test "openDirAbsolute" {...@@ -71,7 +71,7 @@ test "openDirAbsolute" {
71 try tmp.dir.makeDir("subdir");71 try tmp.dir.makeDir("subdir");
72 var arena = ArenaAllocator.init(testing.allocator);72 var arena = ArenaAllocator.init(testing.allocator);
73 defer arena.deinit();73 defer arena.deinit();
74 const allocator = arena.getAllocator();74 const allocator = arena.allocator();
7575
76 const base_path = blk: {76 const base_path = blk: {
77 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..], "subdir" });77 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..], "subdir" });
...@@ -111,7 +111,7 @@ test "readLinkAbsolute" {...@@ -111,7 +111,7 @@ test "readLinkAbsolute" {
111 // Get base abs path111 // Get base abs path
112 var arena = ArenaAllocator.init(testing.allocator);112 var arena = ArenaAllocator.init(testing.allocator);
113 defer arena.deinit();113 defer arena.deinit();
114 const allocator = arena.getAllocator();114 const allocator = arena.allocator();
115115
116 const base_path = blk: {116 const base_path = blk: {
117 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });117 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });
...@@ -162,7 +162,7 @@ test "Dir.Iterator" {...@@ -162,7 +162,7 @@ test "Dir.Iterator" {
162162
163 var arena = ArenaAllocator.init(testing.allocator);163 var arena = ArenaAllocator.init(testing.allocator);
164 defer arena.deinit();164 defer arena.deinit();
165 const allocator = arena.getAllocator();165 const allocator = arena.allocator();
166166
167 var entries = std.ArrayList(Dir.Entry).init(allocator);167 var entries = std.ArrayList(Dir.Entry).init(allocator);
168168
...@@ -207,7 +207,7 @@ test "Dir.realpath smoke test" {...@@ -207,7 +207,7 @@ test "Dir.realpath smoke test" {
207207
208 var arena = ArenaAllocator.init(testing.allocator);208 var arena = ArenaAllocator.init(testing.allocator);
209 defer arena.deinit();209 defer arena.deinit();
210 const allocator = arena.getAllocator();210 const allocator = arena.allocator();
211211
212 const base_path = blk: {212 const base_path = blk: {
213 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp_dir.sub_path[0..] });213 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp_dir.sub_path[0..] });
...@@ -482,7 +482,7 @@ test "renameAbsolute" {...@@ -482,7 +482,7 @@ test "renameAbsolute" {
482 // Get base abs path482 // Get base abs path
483 var arena = ArenaAllocator.init(testing.allocator);483 var arena = ArenaAllocator.init(testing.allocator);
484 defer arena.deinit();484 defer arena.deinit();
485 const allocator = arena.getAllocator();485 const allocator = arena.allocator();
486486
487 const base_path = blk: {487 const base_path = blk: {
488 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp_dir.sub_path[0..] });488 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp_dir.sub_path[0..] });
...@@ -993,7 +993,7 @@ test ". and .. in absolute functions" {...@@ -993,7 +993,7 @@ test ". and .. in absolute functions" {
993993
994 var arena = ArenaAllocator.init(testing.allocator);994 var arena = ArenaAllocator.init(testing.allocator);
995 defer arena.deinit();995 defer arena.deinit();
996 const allocator = arena.getAllocator();996 const allocator = arena.allocator();
997997
998 const base_path = blk: {998 const base_path = blk: {
999 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });999 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });
lib/std/hash/benchmark.zig+1-1
...@@ -165,7 +165,7 @@ pub fn main() !void {...@@ -165,7 +165,7 @@ pub fn main() !void {
165165
166 var buffer: [1024]u8 = undefined;166 var buffer: [1024]u8 = undefined;
167 var fixed = std.heap.FixedBufferAllocator.init(buffer[0..]);167 var fixed = std.heap.FixedBufferAllocator.init(buffer[0..]);
168 const args = try std.process.argsAlloc(fixed.getAllocator());168 const args = try std.process.argsAlloc(fixed.allocator());
169169
170 var filter: ?[]u8 = "";170 var filter: ?[]u8 = "";
171 var count: usize = mode(128 * MiB);171 var count: usize = mode(128 * MiB);
lib/std/heap.zig+20-20
...@@ -573,7 +573,7 @@ pub const HeapAllocator = switch (builtin.os.tag) {...@@ -573,7 +573,7 @@ pub const HeapAllocator = switch (builtin.os.tag) {
573 };573 };
574 }574 }
575575
576 pub fn getAllocator(self: *HeapAllocator) Allocator {576 pub fn allocator(self: *HeapAllocator) Allocator {
577 return Allocator.init(self, alloc, resize);577 return Allocator.init(self, alloc, resize);
578 }578 }
579579
...@@ -680,14 +680,14 @@ pub const FixedBufferAllocator = struct {...@@ -680,14 +680,14 @@ pub const FixedBufferAllocator = struct {
680 };680 };
681 }681 }
682682
683 /// *WARNING* using this at the same time as the interface returned by `getThreadSafeAllocator` is not thread safe683 /// *WARNING* using this at the same time as the interface returned by `threadSafeAllocator` is not thread safe
684 pub fn getAllocator(self: *FixedBufferAllocator) Allocator {684 pub fn allocator(self: *FixedBufferAllocator) Allocator {
685 return Allocator.init(self, alloc, resize);685 return Allocator.init(self, alloc, resize);
686 }686 }
687687
688 /// Provides a lock free thread safe `Allocator` interface to the underlying `FixedBufferAllocator`688 /// Provides a lock free thread safe `Allocator` interface to the underlying `FixedBufferAllocator`
689 /// *WARNING* using this at the same time as the interface returned by `getAllocator` is not thread safe689 /// *WARNING* using this at the same time as the interface returned by `getAllocator` is not thread safe
690 pub fn getThreadSafeAllocator(self: *FixedBufferAllocator) Allocator {690 pub fn threadSafeAllocator(self: *FixedBufferAllocator) Allocator {
691 return Allocator.init(self, threadSafeAlloc, Allocator.NoResize(FixedBufferAllocator).noResize);691 return Allocator.init(self, threadSafeAlloc, Allocator.NoResize(FixedBufferAllocator).noResize);
692 }692 }
693693
...@@ -775,7 +775,7 @@ pub const FixedBufferAllocator = struct {...@@ -775,7 +775,7 @@ pub const FixedBufferAllocator = struct {
775 }775 }
776};776};
777777
778pub const ThreadSafeFixedBufferAllocator = @compileError("ThreadSafeFixedBufferAllocator has been replaced with `getThreadSafeAllocator` on FixedBufferAllocator");778pub const ThreadSafeFixedBufferAllocator = @compileError("ThreadSafeFixedBufferAllocator has been replaced with `threadSafeAllocator` on FixedBufferAllocator");
779779
780pub fn stackFallback(comptime size: usize, fallback_allocator: Allocator) StackFallbackAllocator(size) {780pub fn stackFallback(comptime size: usize, fallback_allocator: Allocator) StackFallbackAllocator(size) {
781 return StackFallbackAllocator(size){781 return StackFallbackAllocator(size){
...@@ -909,7 +909,7 @@ test "HeapAllocator" {...@@ -909,7 +909,7 @@ test "HeapAllocator" {
909 if (builtin.os.tag == .windows) {909 if (builtin.os.tag == .windows) {
910 var heap_allocator = HeapAllocator.init();910 var heap_allocator = HeapAllocator.init();
911 defer heap_allocator.deinit();911 defer heap_allocator.deinit();
912 const allocator = heap_allocator.getAllocator();912 const allocator = heap_allocator.allocator();
913913
914 try testAllocator(allocator);914 try testAllocator(allocator);
915 try testAllocatorAligned(allocator);915 try testAllocatorAligned(allocator);
...@@ -921,7 +921,7 @@ test "HeapAllocator" {...@@ -921,7 +921,7 @@ test "HeapAllocator" {
921test "ArenaAllocator" {921test "ArenaAllocator" {
922 var arena_allocator = ArenaAllocator.init(page_allocator);922 var arena_allocator = ArenaAllocator.init(page_allocator);
923 defer arena_allocator.deinit();923 defer arena_allocator.deinit();
924 const allocator = arena_allocator.getAllocator();924 const allocator = arena_allocator.allocator();
925925
926 try testAllocator(allocator);926 try testAllocator(allocator);
927 try testAllocatorAligned(allocator);927 try testAllocatorAligned(allocator);
...@@ -932,7 +932,7 @@ test "ArenaAllocator" {...@@ -932,7 +932,7 @@ test "ArenaAllocator" {
932var test_fixed_buffer_allocator_memory: [800000 * @sizeOf(u64)]u8 = undefined;932var test_fixed_buffer_allocator_memory: [800000 * @sizeOf(u64)]u8 = undefined;
933test "FixedBufferAllocator" {933test "FixedBufferAllocator" {
934 var fixed_buffer_allocator = mem.validationWrap(FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]));934 var fixed_buffer_allocator = mem.validationWrap(FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]));
935 const allocator = fixed_buffer_allocator.getAllocator();935 const allocator = fixed_buffer_allocator.allocator();
936936
937 try testAllocator(allocator);937 try testAllocator(allocator);
938 try testAllocatorAligned(allocator);938 try testAllocatorAligned(allocator);
...@@ -943,7 +943,7 @@ test "FixedBufferAllocator" {...@@ -943,7 +943,7 @@ test "FixedBufferAllocator" {
943test "FixedBufferAllocator.reset" {943test "FixedBufferAllocator.reset" {
944 var buf: [8]u8 align(@alignOf(u64)) = undefined;944 var buf: [8]u8 align(@alignOf(u64)) = undefined;
945 var fba = FixedBufferAllocator.init(buf[0..]);945 var fba = FixedBufferAllocator.init(buf[0..]);
946 const allocator = fba.getAllocator();946 const allocator = fba.allocator();
947947
948 const X = 0xeeeeeeeeeeeeeeee;948 const X = 0xeeeeeeeeeeeeeeee;
949 const Y = 0xffffffffffffffff;949 const Y = 0xffffffffffffffff;
...@@ -976,7 +976,7 @@ test "FixedBufferAllocator Reuse memory on realloc" {...@@ -976,7 +976,7 @@ test "FixedBufferAllocator Reuse memory on realloc" {
976 // check if we re-use the memory976 // check if we re-use the memory
977 {977 {
978 var fixed_buffer_allocator = FixedBufferAllocator.init(small_fixed_buffer[0..]);978 var fixed_buffer_allocator = FixedBufferAllocator.init(small_fixed_buffer[0..]);
979 const allocator = fixed_buffer_allocator.getAllocator();979 const allocator = fixed_buffer_allocator.allocator();
980980
981 var slice0 = try allocator.alloc(u8, 5);981 var slice0 = try allocator.alloc(u8, 5);
982 try testing.expect(slice0.len == 5);982 try testing.expect(slice0.len == 5);
...@@ -988,7 +988,7 @@ test "FixedBufferAllocator Reuse memory on realloc" {...@@ -988,7 +988,7 @@ test "FixedBufferAllocator Reuse memory on realloc" {
988 // check that we don't re-use the memory if it's not the most recent block988 // check that we don't re-use the memory if it's not the most recent block
989 {989 {
990 var fixed_buffer_allocator = FixedBufferAllocator.init(small_fixed_buffer[0..]);990 var fixed_buffer_allocator = FixedBufferAllocator.init(small_fixed_buffer[0..]);
991 const allocator = fixed_buffer_allocator.getAllocator();991 const allocator = fixed_buffer_allocator.allocator();
992992
993 var slice0 = try allocator.alloc(u8, 2);993 var slice0 = try allocator.alloc(u8, 2);
994 slice0[0] = 1;994 slice0[0] = 1;
...@@ -1005,16 +1005,16 @@ test "FixedBufferAllocator Reuse memory on realloc" {...@@ -1005,16 +1005,16 @@ test "FixedBufferAllocator Reuse memory on realloc" {
1005test "Thread safe FixedBufferAllocator" {1005test "Thread safe FixedBufferAllocator" {
1006 var fixed_buffer_allocator = FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]);1006 var fixed_buffer_allocator = FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]);
10071007
1008 try testAllocator(fixed_buffer_allocator.getThreadSafeAllocator());1008 try testAllocator(fixed_buffer_allocator.threadSafeAllocator());
1009 try testAllocatorAligned(fixed_buffer_allocator.getThreadSafeAllocator());1009 try testAllocatorAligned(fixed_buffer_allocator.threadSafeAllocator());
1010 try testAllocatorLargeAlignment(fixed_buffer_allocator.getThreadSafeAllocator());1010 try testAllocatorLargeAlignment(fixed_buffer_allocator.threadSafeAllocator());
1011 try testAllocatorAlignedShrink(fixed_buffer_allocator.getThreadSafeAllocator());1011 try testAllocatorAlignedShrink(fixed_buffer_allocator.threadSafeAllocator());
1012}1012}
10131013
1014/// This one should not try alignments that exceed what C malloc can handle.1014/// This one should not try alignments that exceed what C malloc can handle.
1015pub fn testAllocator(base_allocator: mem.Allocator) !void {1015pub fn testAllocator(base_allocator: mem.Allocator) !void {
1016 var validationAllocator = mem.validationWrap(base_allocator);1016 var validationAllocator = mem.validationWrap(base_allocator);
1017 const allocator = validationAllocator.getAllocator();1017 const allocator = validationAllocator.allocator();
10181018
1019 var slice = try allocator.alloc(*i32, 100);1019 var slice = try allocator.alloc(*i32, 100);
1020 try testing.expect(slice.len == 100);1020 try testing.expect(slice.len == 100);
...@@ -1060,7 +1060,7 @@ pub fn testAllocator(base_allocator: mem.Allocator) !void {...@@ -1060,7 +1060,7 @@ pub fn testAllocator(base_allocator: mem.Allocator) !void {
10601060
1061pub fn testAllocatorAligned(base_allocator: mem.Allocator) !void {1061pub fn testAllocatorAligned(base_allocator: mem.Allocator) !void {
1062 var validationAllocator = mem.validationWrap(base_allocator);1062 var validationAllocator = mem.validationWrap(base_allocator);
1063 const allocator = validationAllocator.getAllocator();1063 const allocator = validationAllocator.allocator();
10641064
1065 // Test a few alignment values, smaller and bigger than the type's one1065 // Test a few alignment values, smaller and bigger than the type's one
1066 inline for ([_]u29{ 1, 2, 4, 8, 16, 32, 64 }) |alignment| {1066 inline for ([_]u29{ 1, 2, 4, 8, 16, 32, 64 }) |alignment| {
...@@ -1090,7 +1090,7 @@ pub fn testAllocatorAligned(base_allocator: mem.Allocator) !void {...@@ -1090,7 +1090,7 @@ pub fn testAllocatorAligned(base_allocator: mem.Allocator) !void {
10901090
1091pub fn testAllocatorLargeAlignment(base_allocator: mem.Allocator) !void {1091pub fn testAllocatorLargeAlignment(base_allocator: mem.Allocator) !void {
1092 var validationAllocator = mem.validationWrap(base_allocator);1092 var validationAllocator = mem.validationWrap(base_allocator);
1093 const allocator = validationAllocator.getAllocator();1093 const allocator = validationAllocator.allocator();
10941094
1095 //Maybe a platform's page_size is actually the same as or1095 //Maybe a platform's page_size is actually the same as or
1096 // very near usize?1096 // very near usize?
...@@ -1122,10 +1122,10 @@ pub fn testAllocatorLargeAlignment(base_allocator: mem.Allocator) !void {...@@ -1122,10 +1122,10 @@ pub fn testAllocatorLargeAlignment(base_allocator: mem.Allocator) !void {
11221122
1123pub fn testAllocatorAlignedShrink(base_allocator: mem.Allocator) !void {1123pub fn testAllocatorAlignedShrink(base_allocator: mem.Allocator) !void {
1124 var validationAllocator = mem.validationWrap(base_allocator);1124 var validationAllocator = mem.validationWrap(base_allocator);
1125 const allocator = validationAllocator.getAllocator();1125 const allocator = validationAllocator.allocator();
11261126
1127 var debug_buffer: [1000]u8 = undefined;1127 var debug_buffer: [1000]u8 = undefined;
1128 const debug_allocator = FixedBufferAllocator.init(&debug_buffer).getAllocator();1128 const debug_allocator = FixedBufferAllocator.init(&debug_buffer).allocator();
11291129
1130 const alloc_size = mem.page_size * 2 + 50;1130 const alloc_size = mem.page_size * 2 + 50;
1131 var slice = try allocator.alignedAlloc(u8, 16, alloc_size);1131 var slice = try allocator.alignedAlloc(u8, 16, alloc_size);
lib/std/heap/arena_allocator.zig+1-1
...@@ -23,7 +23,7 @@ pub const ArenaAllocator = struct {...@@ -23,7 +23,7 @@ pub const ArenaAllocator = struct {
23 }23 }
24 };24 };
2525
26 pub fn getAllocator(self: *ArenaAllocator) Allocator {26 pub fn allocator(self: *ArenaAllocator) Allocator {
27 return Allocator.init(self, alloc, resize);27 return Allocator.init(self, alloc, resize);
28 }28 }
2929
lib/std/heap/general_purpose_allocator.zig+22-22
...@@ -280,7 +280,7 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {...@@ -280,7 +280,7 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
280 }280 }
281 };281 };
282282
283 pub fn getAllocator(self: *Self) Allocator {283 pub fn allocator(self: *Self) Allocator {
284 return Allocator.init(self, alloc, resize);284 return Allocator.init(self, alloc, resize);
285 }285 }
286286
...@@ -830,7 +830,7 @@ const test_config = Config{};...@@ -830,7 +830,7 @@ const test_config = Config{};
830test "small allocations - free in same order" {830test "small allocations - free in same order" {
831 var gpa = GeneralPurposeAllocator(test_config){};831 var gpa = GeneralPurposeAllocator(test_config){};
832 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");832 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
833 const allocator = gpa.getAllocator();833 const allocator = gpa.allocator();
834834
835 var list = std.ArrayList(*u64).init(std.testing.allocator);835 var list = std.ArrayList(*u64).init(std.testing.allocator);
836 defer list.deinit();836 defer list.deinit();
...@@ -849,7 +849,7 @@ test "small allocations - free in same order" {...@@ -849,7 +849,7 @@ test "small allocations - free in same order" {
849test "small allocations - free in reverse order" {849test "small allocations - free in reverse order" {
850 var gpa = GeneralPurposeAllocator(test_config){};850 var gpa = GeneralPurposeAllocator(test_config){};
851 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");851 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
852 const allocator = gpa.getAllocator();852 const allocator = gpa.allocator();
853853
854 var list = std.ArrayList(*u64).init(std.testing.allocator);854 var list = std.ArrayList(*u64).init(std.testing.allocator);
855 defer list.deinit();855 defer list.deinit();
...@@ -868,7 +868,7 @@ test "small allocations - free in reverse order" {...@@ -868,7 +868,7 @@ test "small allocations - free in reverse order" {
868test "large allocations" {868test "large allocations" {
869 var gpa = GeneralPurposeAllocator(test_config){};869 var gpa = GeneralPurposeAllocator(test_config){};
870 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");870 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
871 const allocator = gpa.getAllocator();871 const allocator = gpa.allocator();
872872
873 const ptr1 = try allocator.alloc(u64, 42768);873 const ptr1 = try allocator.alloc(u64, 42768);
874 const ptr2 = try allocator.alloc(u64, 52768);874 const ptr2 = try allocator.alloc(u64, 52768);
...@@ -881,7 +881,7 @@ test "large allocations" {...@@ -881,7 +881,7 @@ test "large allocations" {
881test "realloc" {881test "realloc" {
882 var gpa = GeneralPurposeAllocator(test_config){};882 var gpa = GeneralPurposeAllocator(test_config){};
883 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");883 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
884 const allocator = gpa.getAllocator();884 const allocator = gpa.allocator();
885885
886 var slice = try allocator.alignedAlloc(u8, @alignOf(u32), 1);886 var slice = try allocator.alignedAlloc(u8, @alignOf(u32), 1);
887 defer allocator.free(slice);887 defer allocator.free(slice);
...@@ -903,7 +903,7 @@ test "realloc" {...@@ -903,7 +903,7 @@ test "realloc" {
903test "shrink" {903test "shrink" {
904 var gpa = GeneralPurposeAllocator(test_config){};904 var gpa = GeneralPurposeAllocator(test_config){};
905 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");905 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
906 const allocator = gpa.getAllocator();906 const allocator = gpa.allocator();
907907
908 var slice = try allocator.alloc(u8, 20);908 var slice = try allocator.alloc(u8, 20);
909 defer allocator.free(slice);909 defer allocator.free(slice);
...@@ -926,7 +926,7 @@ test "shrink" {...@@ -926,7 +926,7 @@ test "shrink" {
926test "large object - grow" {926test "large object - grow" {
927 var gpa = GeneralPurposeAllocator(test_config){};927 var gpa = GeneralPurposeAllocator(test_config){};
928 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");928 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
929 const allocator = gpa.getAllocator();929 const allocator = gpa.allocator();
930930
931 var slice1 = try allocator.alloc(u8, page_size * 2 - 20);931 var slice1 = try allocator.alloc(u8, page_size * 2 - 20);
932 defer allocator.free(slice1);932 defer allocator.free(slice1);
...@@ -944,7 +944,7 @@ test "large object - grow" {...@@ -944,7 +944,7 @@ test "large object - grow" {
944test "realloc small object to large object" {944test "realloc small object to large object" {
945 var gpa = GeneralPurposeAllocator(test_config){};945 var gpa = GeneralPurposeAllocator(test_config){};
946 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");946 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
947 const allocator = gpa.getAllocator();947 const allocator = gpa.allocator();
948948
949 var slice = try allocator.alloc(u8, 70);949 var slice = try allocator.alloc(u8, 70);
950 defer allocator.free(slice);950 defer allocator.free(slice);
...@@ -961,7 +961,7 @@ test "realloc small object to large object" {...@@ -961,7 +961,7 @@ test "realloc small object to large object" {
961test "shrink large object to large object" {961test "shrink large object to large object" {
962 var gpa = GeneralPurposeAllocator(test_config){};962 var gpa = GeneralPurposeAllocator(test_config){};
963 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");963 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
964 const allocator = gpa.getAllocator();964 const allocator = gpa.allocator();
965965
966 var slice = try allocator.alloc(u8, page_size * 2 + 50);966 var slice = try allocator.alloc(u8, page_size * 2 + 50);
967 defer allocator.free(slice);967 defer allocator.free(slice);
...@@ -984,10 +984,10 @@ test "shrink large object to large object" {...@@ -984,10 +984,10 @@ test "shrink large object to large object" {
984test "shrink large object to large object with larger alignment" {984test "shrink large object to large object with larger alignment" {
985 var gpa = GeneralPurposeAllocator(test_config){};985 var gpa = GeneralPurposeAllocator(test_config){};
986 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");986 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
987 const allocator = gpa.getAllocator();987 const allocator = gpa.allocator();
988988
989 var debug_buffer: [1000]u8 = undefined;989 var debug_buffer: [1000]u8 = undefined;
990 const debug_allocator = std.heap.FixedBufferAllocator.init(&debug_buffer).getAllocator();990 const debug_allocator = std.heap.FixedBufferAllocator.init(&debug_buffer).allocator();
991991
992 const alloc_size = page_size * 2 + 50;992 const alloc_size = page_size * 2 + 50;
993 var slice = try allocator.alignedAlloc(u8, 16, alloc_size);993 var slice = try allocator.alignedAlloc(u8, 16, alloc_size);
...@@ -1019,7 +1019,7 @@ test "shrink large object to large object with larger alignment" {...@@ -1019,7 +1019,7 @@ test "shrink large object to large object with larger alignment" {
1019test "realloc large object to small object" {1019test "realloc large object to small object" {
1020 var gpa = GeneralPurposeAllocator(test_config){};1020 var gpa = GeneralPurposeAllocator(test_config){};
1021 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1021 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1022 const allocator = gpa.getAllocator();1022 const allocator = gpa.allocator();
10231023
1024 var slice = try allocator.alloc(u8, page_size * 2 + 50);1024 var slice = try allocator.alloc(u8, page_size * 2 + 50);
1025 defer allocator.free(slice);1025 defer allocator.free(slice);
...@@ -1037,7 +1037,7 @@ test "overrideable mutexes" {...@@ -1037,7 +1037,7 @@ test "overrideable mutexes" {
1037 .mutex = std.Thread.Mutex{},1037 .mutex = std.Thread.Mutex{},
1038 };1038 };
1039 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1039 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1040 const allocator = gpa.getAllocator();1040 const allocator = gpa.allocator();
10411041
1042 const ptr = try allocator.create(i32);1042 const ptr = try allocator.create(i32);
1043 defer allocator.destroy(ptr);1043 defer allocator.destroy(ptr);
...@@ -1046,7 +1046,7 @@ test "overrideable mutexes" {...@@ -1046,7 +1046,7 @@ test "overrideable mutexes" {
1046test "non-page-allocator backing allocator" {1046test "non-page-allocator backing allocator" {
1047 var gpa = GeneralPurposeAllocator(.{}){ .backing_allocator = std.testing.allocator };1047 var gpa = GeneralPurposeAllocator(.{}){ .backing_allocator = std.testing.allocator };
1048 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1048 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1049 const allocator = gpa.getAllocator();1049 const allocator = gpa.allocator();
10501050
1051 const ptr = try allocator.create(i32);1051 const ptr = try allocator.create(i32);
1052 defer allocator.destroy(ptr);1052 defer allocator.destroy(ptr);
...@@ -1055,10 +1055,10 @@ test "non-page-allocator backing allocator" {...@@ -1055,10 +1055,10 @@ test "non-page-allocator backing allocator" {
1055test "realloc large object to larger alignment" {1055test "realloc large object to larger alignment" {
1056 var gpa = GeneralPurposeAllocator(test_config){};1056 var gpa = GeneralPurposeAllocator(test_config){};
1057 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1057 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1058 const allocator = gpa.getAllocator();1058 const allocator = gpa.allocator();
10591059
1060 var debug_buffer: [1000]u8 = undefined;1060 var debug_buffer: [1000]u8 = undefined;
1061 const debug_allocator = std.heap.FixedBufferAllocator.init(&debug_buffer).getAllocator();1061 const debug_allocator = std.heap.FixedBufferAllocator.init(&debug_buffer).allocator();
10621062
1063 var slice = try allocator.alignedAlloc(u8, 16, page_size * 2 + 50);1063 var slice = try allocator.alignedAlloc(u8, 16, page_size * 2 + 50);
1064 defer allocator.free(slice);1064 defer allocator.free(slice);
...@@ -1094,9 +1094,9 @@ test "realloc large object to larger alignment" {...@@ -1094,9 +1094,9 @@ test "realloc large object to larger alignment" {
10941094
1095test "large object shrinks to small but allocation fails during shrink" {1095test "large object shrinks to small but allocation fails during shrink" {
1096 var failing_allocator = std.testing.FailingAllocator.init(std.heap.page_allocator, 3);1096 var failing_allocator = std.testing.FailingAllocator.init(std.heap.page_allocator, 3);
1097 var gpa = GeneralPurposeAllocator(.{}){ .backing_allocator = failing_allocator.getAllocator() };1097 var gpa = GeneralPurposeAllocator(.{}){ .backing_allocator = failing_allocator.allocator() };
1098 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1098 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1099 const allocator = gpa.getAllocator();1099 const allocator = gpa.allocator();
11001100
1101 var slice = try allocator.alloc(u8, page_size * 2 + 50);1101 var slice = try allocator.alloc(u8, page_size * 2 + 50);
1102 defer allocator.free(slice);1102 defer allocator.free(slice);
...@@ -1113,7 +1113,7 @@ test "large object shrinks to small but allocation fails during shrink" {...@@ -1113,7 +1113,7 @@ test "large object shrinks to small but allocation fails during shrink" {
1113test "objects of size 1024 and 2048" {1113test "objects of size 1024 and 2048" {
1114 var gpa = GeneralPurposeAllocator(test_config){};1114 var gpa = GeneralPurposeAllocator(test_config){};
1115 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1115 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1116 const allocator = gpa.getAllocator();1116 const allocator = gpa.allocator();
11171117
1118 const slice = try allocator.alloc(u8, 1025);1118 const slice = try allocator.alloc(u8, 1025);
1119 const slice2 = try allocator.alloc(u8, 3000);1119 const slice2 = try allocator.alloc(u8, 3000);
...@@ -1125,7 +1125,7 @@ test "objects of size 1024 and 2048" {...@@ -1125,7 +1125,7 @@ test "objects of size 1024 and 2048" {
1125test "setting a memory cap" {1125test "setting a memory cap" {
1126 var gpa = GeneralPurposeAllocator(.{ .enable_memory_limit = true }){};1126 var gpa = GeneralPurposeAllocator(.{ .enable_memory_limit = true }){};
1127 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1127 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1128 const allocator = gpa.getAllocator();1128 const allocator = gpa.allocator();
11291129
1130 gpa.setRequestedMemoryLimit(1010);1130 gpa.setRequestedMemoryLimit(1010);
11311131
...@@ -1154,9 +1154,9 @@ test "double frees" {...@@ -1154,9 +1154,9 @@ test "double frees" {
1154 defer std.testing.expect(!backing_gpa.deinit()) catch @panic("leak");1154 defer std.testing.expect(!backing_gpa.deinit()) catch @panic("leak");
11551155
1156 const GPA = GeneralPurposeAllocator(.{ .safety = true, .never_unmap = true, .retain_metadata = true });1156 const GPA = GeneralPurposeAllocator(.{ .safety = true, .never_unmap = true, .retain_metadata = true });
1157 var gpa = GPA{ .backing_allocator = backing_gpa.getAllocator() };1157 var gpa = GPA{ .backing_allocator = backing_gpa.allocator() };
1158 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");1158 defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
1159 const allocator = gpa.getAllocator();1159 const allocator = gpa.allocator();
11601160
1161 // detect a small allocation double free, even though bucket is emptied1161 // detect a small allocation double free, even though bucket is emptied
1162 const index: usize = 6;1162 const index: usize = 6;
lib/std/heap/log_to_writer_allocator.zig+2-2
...@@ -17,7 +17,7 @@ pub fn LogToWriterAllocator(comptime Writer: type) type {...@@ -17,7 +17,7 @@ pub fn LogToWriterAllocator(comptime Writer: type) type {
17 };17 };
18 }18 }
1919
20 pub fn getAllocator(self: *Self) Allocator {20 pub fn allocator(self: *Self) Allocator {
21 return Allocator.init(self, alloc, resize);21 return Allocator.init(self, alloc, resize);
22 }22 }
2323
...@@ -82,7 +82,7 @@ test "LogToWriterAllocator" {...@@ -82,7 +82,7 @@ test "LogToWriterAllocator" {
8282
83 var allocator_buf: [10]u8 = undefined;83 var allocator_buf: [10]u8 = undefined;
84 var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));84 var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));
85 const allocator = logToWriterAllocator(fixedBufferAllocator.getAllocator(), fbs.writer()).getAllocator();85 const allocator = logToWriterAllocator(fixedBufferAllocator.allocator(), fbs.writer()).allocator();
8686
87 var a = try allocator.alloc(u8, 10);87 var a = try allocator.alloc(u8, 10);
88 a = allocator.shrink(a, 5);88 a = allocator.shrink(a, 5);
lib/std/heap/logging_allocator.zig+1-1
...@@ -32,7 +32,7 @@ pub fn ScopedLoggingAllocator(...@@ -32,7 +32,7 @@ pub fn ScopedLoggingAllocator(
32 };32 };
33 }33 }
3434
35 pub fn getAllocator(self: *Self) Allocator {35 pub fn allocator(self: *Self) Allocator {
36 return Allocator.init(self, alloc, resize);36 return Allocator.init(self, alloc, resize);
37 }37 }
3838
lib/std/json.zig+7-7
...@@ -2033,7 +2033,7 @@ test "parse into tagged union" {...@@ -2033,7 +2033,7 @@ test "parse into tagged union" {
20332033
2034 { // failing allocations should be bubbled up instantly without trying next member2034 { // failing allocations should be bubbled up instantly without trying next member
2035 var fail_alloc = testing.FailingAllocator.init(testing.allocator, 0);2035 var fail_alloc = testing.FailingAllocator.init(testing.allocator, 0);
2036 const options = ParseOptions{ .allocator = fail_alloc.getAllocator() };2036 const options = ParseOptions{ .allocator = fail_alloc.allocator() };
2037 const T = union(enum) {2037 const T = union(enum) {
2038 // both fields here match the input2038 // both fields here match the input
2039 string: []const u8,2039 string: []const u8,
...@@ -2081,7 +2081,7 @@ test "parse union bubbles up AllocatorRequired" {...@@ -2081,7 +2081,7 @@ test "parse union bubbles up AllocatorRequired" {
20812081
2082test "parseFree descends into tagged union" {2082test "parseFree descends into tagged union" {
2083 var fail_alloc = testing.FailingAllocator.init(testing.allocator, 1);2083 var fail_alloc = testing.FailingAllocator.init(testing.allocator, 1);
2084 const options = ParseOptions{ .allocator = fail_alloc.getAllocator() };2084 const options = ParseOptions{ .allocator = fail_alloc.allocator() };
2085 const T = union(enum) {2085 const T = union(enum) {
2086 int: i32,2086 int: i32,
2087 float: f64,2087 float: f64,
...@@ -2364,7 +2364,7 @@ pub const Parser = struct {...@@ -2364,7 +2364,7 @@ pub const Parser = struct {
23642364
2365 var arena = ArenaAllocator.init(p.allocator);2365 var arena = ArenaAllocator.init(p.allocator);
2366 errdefer arena.deinit();2366 errdefer arena.deinit();
2367 const allocator = arena.getAllocator();2367 const allocator = arena.allocator();
23682368
2369 while (try s.next()) |token| {2369 while (try s.next()) |token| {
2370 try p.transition(allocator, input, s.i - 1, token);2370 try p.transition(allocator, input, s.i - 1, token);
...@@ -2746,13 +2746,13 @@ fn testParse(arena_allocator: std.mem.Allocator, json_str: []const u8) !Value {...@@ -2746,13 +2746,13 @@ fn testParse(arena_allocator: std.mem.Allocator, json_str: []const u8) !Value {
2746test "parsing empty string gives appropriate error" {2746test "parsing empty string gives appropriate error" {
2747 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);2747 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);
2748 defer arena_allocator.deinit();2748 defer arena_allocator.deinit();
2749 try testing.expectError(error.UnexpectedEndOfJson, testParse(arena_allocator.getAllocator(), ""));2749 try testing.expectError(error.UnexpectedEndOfJson, testParse(arena_allocator.allocator(), ""));
2750}2750}
27512751
2752test "integer after float has proper type" {2752test "integer after float has proper type" {
2753 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);2753 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);
2754 defer arena_allocator.deinit();2754 defer arena_allocator.deinit();
2755 const json = try testParse(arena_allocator.getAllocator(),2755 const json = try testParse(arena_allocator.allocator(),
2756 \\{2756 \\{
2757 \\ "float": 3.14,2757 \\ "float": 3.14,
2758 \\ "ints": [1, 2, 3]2758 \\ "ints": [1, 2, 3]
...@@ -2787,7 +2787,7 @@ test "escaped characters" {...@@ -2787,7 +2787,7 @@ test "escaped characters" {
2787 \\}2787 \\}
2788 ;2788 ;
27892789
2790 const obj = (try testParse(arena_allocator.getAllocator(), input)).Object;2790 const obj = (try testParse(arena_allocator.allocator(), input)).Object;
27912791
2792 try testing.expectEqualSlices(u8, obj.get("backslash").?.String, "\\");2792 try testing.expectEqualSlices(u8, obj.get("backslash").?.String, "\\");
2793 try testing.expectEqualSlices(u8, obj.get("forwardslash").?.String, "/");2793 try testing.expectEqualSlices(u8, obj.get("forwardslash").?.String, "/");
...@@ -2813,7 +2813,7 @@ test "string copy option" {...@@ -2813,7 +2813,7 @@ test "string copy option" {
28132813
2814 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);2814 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);
2815 defer arena_allocator.deinit();2815 defer arena_allocator.deinit();
2816 const allocator = arena_allocator.getAllocator();2816 const allocator = arena_allocator.allocator();
28172817
2818 const tree_nocopy = try Parser.init(allocator, false).parse(input);2818 const tree_nocopy = try Parser.init(allocator, false).parse(input);
2819 const obj_nocopy = tree_nocopy.root.Object;2819 const obj_nocopy = tree_nocopy.root.Object;
lib/std/json/write_stream.zig+1-1
...@@ -243,7 +243,7 @@ test "json write stream" {...@@ -243,7 +243,7 @@ test "json write stream" {
243 try w.beginObject();243 try w.beginObject();
244244
245 try w.objectField("object");245 try w.objectField("object");
246 try w.emitJson(try getJsonObject(arena_allocator.getAllocator()));246 try w.emitJson(try getJsonObject(arena_allocator.allocator()));
247247
248 try w.objectField("string");248 try w.objectField("string");
249 try w.emitString("This is a string");249 try w.emitString("This is a string");
lib/std/mem.zig+2-2
...@@ -46,13 +46,13 @@ pub fn ValidationAllocator(comptime T: type) type {...@@ -46,13 +46,13 @@ pub fn ValidationAllocator(comptime T: type) type {
46 };46 };
47 }47 }
4848
49 pub fn getAllocator(self: *Self) Allocator {49 pub fn allocator(self: *Self) Allocator {
50 return Allocator.init(self, alloc, resize);50 return Allocator.init(self, alloc, resize);
51 }51 }
5252
53 fn getUnderlyingAllocatorPtr(self: *Self) Allocator {53 fn getUnderlyingAllocatorPtr(self: *Self) Allocator {
54 if (T == Allocator) return self.underlying_allocator;54 if (T == Allocator) return self.underlying_allocator;
55 return self.underlying_allocator.getAllocator();55 return self.underlying_allocator.allocator();
56 }56 }
5757
58 pub fn alloc(58 pub fn alloc(
lib/std/net.zig+2-2
...@@ -704,7 +704,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A...@@ -704,7 +704,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A
704 var arena = std.heap.ArenaAllocator.init(allocator);704 var arena = std.heap.ArenaAllocator.init(allocator);
705 errdefer arena.deinit();705 errdefer arena.deinit();
706706
707 const result = try arena.getAllocator().create(AddressList);707 const result = try arena.allocator().create(AddressList);
708 result.* = AddressList{708 result.* = AddressList{
709 .arena = arena,709 .arena = arena,
710 .addrs = undefined,710 .addrs = undefined,
...@@ -712,7 +712,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A...@@ -712,7 +712,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A
712 };712 };
713 break :blk result;713 break :blk result;
714 };714 };
715 const arena = result.arena.getAllocator();715 const arena = result.arena.allocator();
716 errdefer result.arena.deinit();716 errdefer result.arena.deinit();
717717
718 if (builtin.target.os.tag == .windows or builtin.link_libc) {718 if (builtin.target.os.tag == .windows or builtin.link_libc) {
lib/std/os/test.zig+1-1
...@@ -58,7 +58,7 @@ test "open smoke test" {...@@ -58,7 +58,7 @@ test "open smoke test" {
58 // Get base abs path58 // Get base abs path
59 var arena = ArenaAllocator.init(testing.allocator);59 var arena = ArenaAllocator.init(testing.allocator);
60 defer arena.deinit();60 defer arena.deinit();
61 const allocator = arena.getAllocator();61 const allocator = arena.allocator();
6262
63 const base_path = blk: {63 const base_path = blk: {
64 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });64 const relative_path = try fs.path.join(allocator, &[_][]const u8{ "zig-cache", "tmp", tmp.sub_path[0..] });
lib/std/process.zig+1-1
...@@ -854,7 +854,7 @@ pub fn execve(...@@ -854,7 +854,7 @@ pub fn execve(
854854
855 var arena_allocator = std.heap.ArenaAllocator.init(allocator);855 var arena_allocator = std.heap.ArenaAllocator.init(allocator);
856 defer arena_allocator.deinit();856 defer arena_allocator.deinit();
857 const arena = arena_allocator.getAllocator();857 const arena = arena_allocator.allocator();
858858
859 const argv_buf = try arena.allocSentinel(?[*:0]u8, argv.len, null);859 const argv_buf = try arena.allocSentinel(?[*:0]u8, argv.len, null);
860 for (argv) |arg, i| argv_buf[i] = (try arena.dupeZ(u8, arg)).ptr;860 for (argv) |arg, i| argv_buf[i] = (try arena.dupeZ(u8, arg)).ptr;
lib/std/special/build_runner.zig+1-1
...@@ -16,7 +16,7 @@ pub fn main() !void {...@@ -16,7 +16,7 @@ pub fn main() !void {
16 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);16 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
17 defer arena.deinit();17 defer arena.deinit();
1818
19 const allocator = arena.getAllocator();19 const allocator = arena.allocator();
20 var args = try process.argsAlloc(allocator);20 var args = try process.argsAlloc(allocator);
21 defer process.argsFree(allocator, args);21 defer process.argsFree(allocator, args);
2222
lib/std/special/test_runner.zig+1-1
...@@ -10,7 +10,7 @@ var args_buffer: [std.fs.MAX_PATH_BYTES + std.mem.page_size]u8 = undefined;...@@ -10,7 +10,7 @@ var args_buffer: [std.fs.MAX_PATH_BYTES + std.mem.page_size]u8 = undefined;
10var args_allocator = std.heap.FixedBufferAllocator.init(&args_buffer);10var args_allocator = std.heap.FixedBufferAllocator.init(&args_buffer);
1111
12fn processArgs() void {12fn processArgs() void {
13 const args = std.process.argsAlloc(args_allocator.getAllocator()) catch {13 const args = std.process.argsAlloc(args_allocator.allocator()) catch {
14 @panic("Too many bytes passed over the CLI to the test runner");14 @panic("Too many bytes passed over the CLI to the test runner");
15 };15 };
16 if (args.len != 2) {16 if (args.len != 2) {
lib/std/testing.zig+3-3
...@@ -7,11 +7,11 @@ const print = std.debug.print;...@@ -7,11 +7,11 @@ const print = std.debug.print;
7pub const FailingAllocator = @import("testing/failing_allocator.zig").FailingAllocator;7pub const FailingAllocator = @import("testing/failing_allocator.zig").FailingAllocator;
88
9/// This should only be used in temporary test programs.9/// This should only be used in temporary test programs.
10pub const allocator = allocator_instance.getAllocator();10pub const allocator = allocator_instance.allocator();
11pub var allocator_instance = std.heap.GeneralPurposeAllocator(.{}){};11pub var allocator_instance = std.heap.GeneralPurposeAllocator(.{}){};
1212
13pub const failing_allocator = failing_allocator_instance.getAllocator();13pub const failing_allocator = failing_allocator_instance.allocator();
14pub var failing_allocator_instance = FailingAllocator.init(base_allocator_instance.getAllocator(), 0);14pub var failing_allocator_instance = FailingAllocator.init(base_allocator_instance.allocator(), 0);
1515
16pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");16pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");
1717
lib/std/testing/failing_allocator.zig+1-1
...@@ -40,7 +40,7 @@ pub const FailingAllocator = struct {...@@ -40,7 +40,7 @@ pub const FailingAllocator = struct {
40 };40 };
41 }41 }
4242
43 pub fn getAllocator(self: *FailingAllocator) mem.Allocator {43 pub fn allocator(self: *FailingAllocator) mem.Allocator {
44 return mem.Allocator.init(self, alloc, resize);44 return mem.Allocator.init(self, alloc, resize);
45 }45 }
4646
lib/std/zig/parser_test.zig+4-4
...@@ -5351,8 +5351,8 @@ fn testTransform(source: [:0]const u8, expected_source: []const u8) !void {...@@ -5351,8 +5351,8 @@ fn testTransform(source: [:0]const u8, expected_source: []const u8) !void {
5351 const needed_alloc_count = x: {5351 const needed_alloc_count = x: {
5352 // Try it once with unlimited memory, make sure it works5352 // Try it once with unlimited memory, make sure it works
5353 var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);5353 var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
5354 var failing_allocator = std.testing.FailingAllocator.init(fixed_allocator.getAllocator(), maxInt(usize));5354 var failing_allocator = std.testing.FailingAllocator.init(fixed_allocator.allocator(), maxInt(usize));
5355 const allocator = failing_allocator.getAllocator();5355 const allocator = failing_allocator.allocator();
5356 var anything_changed: bool = undefined;5356 var anything_changed: bool = undefined;
5357 const result_source = try testParse(source, allocator, &anything_changed);5357 const result_source = try testParse(source, allocator, &anything_changed);
5358 try std.testing.expectEqualStrings(expected_source, result_source);5358 try std.testing.expectEqualStrings(expected_source, result_source);
...@@ -5369,9 +5369,9 @@ fn testTransform(source: [:0]const u8, expected_source: []const u8) !void {...@@ -5369,9 +5369,9 @@ fn testTransform(source: [:0]const u8, expected_source: []const u8) !void {
5369 var fail_index: usize = 0;5369 var fail_index: usize = 0;
5370 while (fail_index < needed_alloc_count) : (fail_index += 1) {5370 while (fail_index < needed_alloc_count) : (fail_index += 1) {
5371 var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);5371 var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
5372 var failing_allocator = std.testing.FailingAllocator.init(fixed_allocator.getAllocator(), fail_index);5372 var failing_allocator = std.testing.FailingAllocator.init(fixed_allocator.allocator(), fail_index);
5373 var anything_changed: bool = undefined;5373 var anything_changed: bool = undefined;
5374 if (testParse(source, failing_allocator.getAllocator(), &anything_changed)) |_| {5374 if (testParse(source, failing_allocator.allocator(), &anything_changed)) |_| {
5375 return error.NondeterministicMemoryUsage;5375 return error.NondeterministicMemoryUsage;
5376 } else |err| switch (err) {5376 } else |err| switch (err) {
5377 error.OutOfMemory => {5377 error.OutOfMemory => {
lib/std/zig/perf_test.zig+1-1
...@@ -33,7 +33,7 @@ pub fn main() !void {...@@ -33,7 +33,7 @@ pub fn main() !void {
3333
34fn testOnce() usize {34fn testOnce() usize {
35 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);35 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
36 var allocator = fixed_buf_alloc.getAllocator();36 var allocator = fixed_buf_alloc.allocator();
37 _ = std.zig.parse(allocator, source) catch @panic("parse failure");37 _ = std.zig.parse(allocator, source) catch @panic("parse failure");
38 return fixed_buf_alloc.end_index;38 return fixed_buf_alloc.end_index;
39}39}
lib/std/zig/string_literal.zig+1-1
...@@ -147,7 +147,7 @@ test "parse" {...@@ -147,7 +147,7 @@ test "parse" {
147147
148 var fixed_buf_mem: [32]u8 = undefined;148 var fixed_buf_mem: [32]u8 = undefined;
149 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buf_mem[0..]);149 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buf_mem[0..]);
150 var alloc = fixed_buf_alloc.getAllocator();150 var alloc = fixed_buf_alloc.allocator();
151151
152 try expect(eql(u8, "foo", try parseAlloc(alloc, "\"foo\"")));152 try expect(eql(u8, "foo", try parseAlloc(alloc, "\"foo\"")));
153 try expect(eql(u8, "foo", try parseAlloc(alloc, "\"f\x6f\x6f\"")));153 try expect(eql(u8, "foo", try parseAlloc(alloc, "\"f\x6f\x6f\"")));
src/AstGen.zig+2-2
...@@ -98,7 +98,7 @@ pub fn generate(gpa: Allocator, tree: Ast) Allocator.Error!Zir {...@@ -98,7 +98,7 @@ pub fn generate(gpa: Allocator, tree: Ast) Allocator.Error!Zir {
9898
99 var astgen: AstGen = .{99 var astgen: AstGen = .{
100 .gpa = gpa,100 .gpa = gpa,
101 .arena = arena.getAllocator(),101 .arena = arena.allocator(),
102 .tree = &tree,102 .tree = &tree,
103 };103 };
104 defer astgen.deinit(gpa);104 defer astgen.deinit(gpa);
...@@ -1939,7 +1939,7 @@ fn blockExprStmts(gz: *GenZir, parent_scope: *Scope, statements: []const Ast.Nod...@@ -1939,7 +1939,7 @@ fn blockExprStmts(gz: *GenZir, parent_scope: *Scope, statements: []const Ast.Nod
19391939
1940 var block_arena = std.heap.ArenaAllocator.init(gz.astgen.gpa);1940 var block_arena = std.heap.ArenaAllocator.init(gz.astgen.gpa);
1941 defer block_arena.deinit();1941 defer block_arena.deinit();
1942 const block_arena_allocator = block_arena.getAllocator();1942 const block_arena_allocator = block_arena.allocator();
19431943
1944 var noreturn_src_node: Ast.Node.Index = 0;1944 var noreturn_src_node: Ast.Node.Index = 0;
1945 var scope = parent_scope;1945 var scope = parent_scope;
src/Compilation.zig+12-12
...@@ -412,7 +412,7 @@ pub const AllErrors = struct {...@@ -412,7 +412,7 @@ pub const AllErrors = struct {
412 errors: *std.ArrayList(Message),412 errors: *std.ArrayList(Message),
413 module_err_msg: Module.ErrorMsg,413 module_err_msg: Module.ErrorMsg,
414 ) !void {414 ) !void {
415 const allocator = arena.getAllocator();415 const allocator = arena.allocator();
416 const notes = try allocator.alloc(Message, module_err_msg.notes.len);416 const notes = try allocator.alloc(Message, module_err_msg.notes.len);
417 for (notes) |*note, i| {417 for (notes) |*note, i| {
418 const module_note = module_err_msg.notes[i];418 const module_note = module_err_msg.notes[i];
...@@ -549,7 +549,7 @@ pub const AllErrors = struct {...@@ -549,7 +549,7 @@ pub const AllErrors = struct {
549 msg: []const u8,549 msg: []const u8,
550 optional_children: ?AllErrors,550 optional_children: ?AllErrors,
551 ) !void {551 ) !void {
552 const allocator = arena.getAllocator();552 const allocator = arena.allocator();
553 const duped_msg = try allocator.dupe(u8, msg);553 const duped_msg = try allocator.dupe(u8, msg);
554 if (optional_children) |*children| {554 if (optional_children) |*children| {
555 try errors.append(.{ .plain = .{555 try errors.append(.{ .plain = .{
...@@ -788,7 +788,7 @@ fn addPackageTableToCacheHash(...@@ -788,7 +788,7 @@ fn addPackageTableToCacheHash(
788 seen_table: *std.AutoHashMap(*Package, void),788 seen_table: *std.AutoHashMap(*Package, void),
789 hash_type: union(enum) { path_bytes, files: *Cache.Manifest },789 hash_type: union(enum) { path_bytes, files: *Cache.Manifest },
790) (error{OutOfMemory} || std.os.GetCwdError)!void {790) (error{OutOfMemory} || std.os.GetCwdError)!void {
791 const allocator = arena.getAllocator();791 const allocator = arena.allocator();
792792
793 const packages = try allocator.alloc(Package.Table.KV, pkg_table.count());793 const packages = try allocator.alloc(Package.Table.KV, pkg_table.count());
794 {794 {
...@@ -852,7 +852,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {...@@ -852,7 +852,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
852 // initialization and then is freed in deinit().852 // initialization and then is freed in deinit().
853 var arena_allocator = std.heap.ArenaAllocator.init(gpa);853 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
854 errdefer arena_allocator.deinit();854 errdefer arena_allocator.deinit();
855 const arena = arena_allocator.getAllocator();855 const arena = arena_allocator.allocator();
856856
857 // We put the `Compilation` itself in the arena. Freeing the arena will free the module.857 // We put the `Compilation` itself in the arena. Freeing the arena will free the module.
858 // It's initialized later after we prepare the initialization options.858 // It's initialized later after we prepare the initialization options.
...@@ -1210,7 +1210,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {...@@ -1210,7 +1210,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1210 {1210 {
1211 var local_arena = std.heap.ArenaAllocator.init(gpa);1211 var local_arena = std.heap.ArenaAllocator.init(gpa);
1212 defer local_arena.deinit();1212 defer local_arena.deinit();
1213 var seen_table = std.AutoHashMap(*Package, void).init(local_arena.getAllocator());1213 var seen_table = std.AutoHashMap(*Package, void).init(local_arena.allocator());
1214 try addPackageTableToCacheHash(&hash, &local_arena, main_pkg.table, &seen_table, .path_bytes);1214 try addPackageTableToCacheHash(&hash, &local_arena, main_pkg.table, &seen_table, .path_bytes);
1215 }1215 }
1216 hash.add(valgrind);1216 hash.add(valgrind);
...@@ -2013,7 +2013,7 @@ pub fn totalErrorCount(self: *Compilation) usize {...@@ -2013,7 +2013,7 @@ pub fn totalErrorCount(self: *Compilation) usize {
2013pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors {2013pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors {
2014 var arena = std.heap.ArenaAllocator.init(self.gpa);2014 var arena = std.heap.ArenaAllocator.init(self.gpa);
2015 errdefer arena.deinit();2015 errdefer arena.deinit();
2016 const arena_allocator = arena.getAllocator();2016 const arena_allocator = arena.allocator();
20172017
2018 var errors = std.ArrayList(AllErrors.Message).init(self.gpa);2018 var errors = std.ArrayList(AllErrors.Message).init(self.gpa);
2019 defer errors.deinit();2019 defer errors.deinit();
...@@ -2295,7 +2295,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress...@@ -2295,7 +2295,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress
22952295
2296 var tmp_arena = std.heap.ArenaAllocator.init(gpa);2296 var tmp_arena = std.heap.ArenaAllocator.init(gpa);
2297 defer tmp_arena.deinit();2297 defer tmp_arena.deinit();
2298 const sema_arena = tmp_arena.getAllocator();2298 const sema_arena = tmp_arena.allocator();
22992299
2300 const sema_frame = tracy.namedFrame("sema");2300 const sema_frame = tracy.namedFrame("sema");
2301 var sema_frame_ended = false;2301 var sema_frame_ended = false;
...@@ -2390,7 +2390,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress...@@ -2390,7 +2390,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress
2390 .decl = decl,2390 .decl = decl,
2391 .fwd_decl = fwd_decl.toManaged(gpa),2391 .fwd_decl = fwd_decl.toManaged(gpa),
2392 .typedefs = c_codegen.TypedefMap.init(gpa),2392 .typedefs = c_codegen.TypedefMap.init(gpa),
2393 .typedefs_arena = typedefs_arena.getAllocator(),2393 .typedefs_arena = typedefs_arena.allocator(),
2394 };2394 };
2395 defer dg.fwd_decl.deinit();2395 defer dg.fwd_decl.deinit();
2396 defer dg.typedefs.deinit();2396 defer dg.typedefs.deinit();
...@@ -2844,7 +2844,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult {...@@ -2844,7 +2844,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult {
2844 const digest = if (!actual_hit) digest: {2844 const digest = if (!actual_hit) digest: {
2845 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);2845 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
2846 defer arena_allocator.deinit();2846 defer arena_allocator.deinit();
2847 const arena = arena_allocator.getAllocator();2847 const arena = arena_allocator.allocator();
28482848
2849 const tmp_digest = man.hash.peek();2849 const tmp_digest = man.hash.peek();
2850 const tmp_dir_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &tmp_digest });2850 const tmp_dir_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &tmp_digest });
...@@ -3099,7 +3099,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P...@@ -3099,7 +3099,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P
30993099
3100 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);3100 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
3101 defer arena_allocator.deinit();3101 defer arena_allocator.deinit();
3102 const arena = arena_allocator.getAllocator();3102 const arena = arena_allocator.allocator();
31033103
3104 const c_source_basename = std.fs.path.basename(c_object.src.src_path);3104 const c_source_basename = std.fs.path.basename(c_object.src.src_path);
31053105
...@@ -4420,7 +4420,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node...@@ -4420,7 +4420,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
44204420
4421 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);4421 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
4422 defer arena_allocator.deinit();4422 defer arena_allocator.deinit();
4423 const arena = arena_allocator.getAllocator();4423 const arena = arena_allocator.allocator();
44244424
4425 // Here we use the legacy stage1 C++ compiler to compile Zig code.4425 // Here we use the legacy stage1 C++ compiler to compile Zig code.
4426 const mod = comp.bin_file.options.module.?;4426 const mod = comp.bin_file.options.module.?;
...@@ -4457,7 +4457,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node...@@ -4457,7 +4457,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
44574457
4458 _ = try man.addFile(main_zig_file, null);4458 _ = try man.addFile(main_zig_file, null);
4459 {4459 {
4460 var seen_table = std.AutoHashMap(*Package, void).init(arena_allocator.getAllocator());4460 var seen_table = std.AutoHashMap(*Package, void).init(arena_allocator.allocator());
4461 try addPackageTableToCacheHash(&man.hash, &arena_allocator, mod.main_pkg.table, &seen_table, .{ .files = &man });4461 try addPackageTableToCacheHash(&man.hash, &arena_allocator, mod.main_pkg.table, &seen_table, .{ .files = &man });
4462 }4462 }
4463 man.hash.add(comp.bin_file.options.valgrind);4463 man.hash.add(comp.bin_file.options.valgrind);
src/DepTokenizer.zig+1-1
...@@ -878,7 +878,7 @@ test "error prereq - continuation expecting end-of-line" {...@@ -878,7 +878,7 @@ test "error prereq - continuation expecting end-of-line" {
878// - tokenize input, emit textual representation, and compare to expect878// - tokenize input, emit textual representation, and compare to expect
879fn depTokenizer(input: []const u8, expect: []const u8) !void {879fn depTokenizer(input: []const u8, expect: []const u8) !void {
880 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);880 var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator);
881 const arena = arena_allocator.getAllocator();881 const arena = arena_allocator.allocator();
882 defer arena_allocator.deinit();882 defer arena_allocator.deinit();
883883
884 var it: Tokenizer = .{ .bytes = input };884 var it: Tokenizer = .{ .bytes = input };
src/Module.zig+8-8
...@@ -517,7 +517,7 @@ pub const Decl = struct {...@@ -517,7 +517,7 @@ pub const Decl = struct {
517517
518 pub fn finalizeNewArena(decl: *Decl, arena: *std.heap.ArenaAllocator) !void {518 pub fn finalizeNewArena(decl: *Decl, arena: *std.heap.ArenaAllocator) !void {
519 assert(decl.value_arena == null);519 assert(decl.value_arena == null);
520 const arena_state = try arena.getAllocator().create(std.heap.ArenaAllocator.State);520 const arena_state = try arena.allocator().create(std.heap.ArenaAllocator.State);
521 arena_state.* = arena.state;521 arena_state.* = arena.state;
522 decl.value_arena = arena_state;522 decl.value_arena = arena_state;
523 }523 }
...@@ -3159,7 +3159,7 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {...@@ -3159,7 +3159,7 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
3159 const gpa = mod.gpa;3159 const gpa = mod.gpa;
3160 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);3160 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
3161 errdefer new_decl_arena.deinit();3161 errdefer new_decl_arena.deinit();
3162 const new_decl_arena_allocator = new_decl_arena.getAllocator();3162 const new_decl_arena_allocator = new_decl_arena.allocator();
31633163
3164 const struct_obj = try new_decl_arena_allocator.create(Module.Struct);3164 const struct_obj = try new_decl_arena_allocator.create(Module.Struct);
3165 const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj);3165 const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj);
...@@ -3203,7 +3203,7 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {...@@ -3203,7 +3203,7 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
32033203
3204 var sema_arena = std.heap.ArenaAllocator.init(gpa);3204 var sema_arena = std.heap.ArenaAllocator.init(gpa);
3205 defer sema_arena.deinit();3205 defer sema_arena.deinit();
3206 const sema_arena_allocator = sema_arena.getAllocator();3206 const sema_arena_allocator = sema_arena.allocator();
32073207
3208 var sema: Sema = .{3208 var sema: Sema = .{
3209 .mod = mod,3209 .mod = mod,
...@@ -3267,11 +3267,11 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool {...@@ -3267,11 +3267,11 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool {
3267 // We need the memory for the Type to go into the arena for the Decl3267 // We need the memory for the Type to go into the arena for the Decl
3268 var decl_arena = std.heap.ArenaAllocator.init(gpa);3268 var decl_arena = std.heap.ArenaAllocator.init(gpa);
3269 errdefer decl_arena.deinit();3269 errdefer decl_arena.deinit();
3270 const decl_arena_allocator = decl_arena.getAllocator();3270 const decl_arena_allocator = decl_arena.allocator();
32713271
3272 var analysis_arena = std.heap.ArenaAllocator.init(gpa);3272 var analysis_arena = std.heap.ArenaAllocator.init(gpa);
3273 defer analysis_arena.deinit();3273 defer analysis_arena.deinit();
3274 const analysis_arena_allocator = analysis_arena.getAllocator();3274 const analysis_arena_allocator = analysis_arena.allocator();
32753275
3276 var sema: Sema = .{3276 var sema: Sema = .{
3277 .mod = mod,3277 .mod = mod,
...@@ -4132,7 +4132,7 @@ pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: Allocator) Sem...@@ -4132,7 +4132,7 @@ pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: Allocator) Sem
4132 // Use the Decl's arena for captured values.4132 // Use the Decl's arena for captured values.
4133 var decl_arena = decl.value_arena.?.promote(gpa);4133 var decl_arena = decl.value_arena.?.promote(gpa);
4134 defer decl.value_arena.?.* = decl_arena.state;4134 defer decl.value_arena.?.* = decl_arena.state;
4135 const decl_arena_allocator = decl_arena.getAllocator();4135 const decl_arena_allocator = decl_arena.allocator();
41364136
4137 var sema: Sema = .{4137 var sema: Sema = .{
4138 .mod = mod,4138 .mod = mod,
...@@ -4756,7 +4756,7 @@ pub fn populateTestFunctions(mod: *Module) !void {...@@ -4756,7 +4756,7 @@ pub fn populateTestFunctions(mod: *Module) !void {
4756 // decl reference it as a slice.4756 // decl reference it as a slice.
4757 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);4757 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
4758 errdefer new_decl_arena.deinit();4758 errdefer new_decl_arena.deinit();
4759 const arena = new_decl_arena.getAllocator();4759 const arena = new_decl_arena.allocator();
47604760
4761 const test_fn_vals = try arena.alloc(Value, mod.test_functions.count());4761 const test_fn_vals = try arena.alloc(Value, mod.test_functions.count());
4762 const array_decl = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, null, .{4762 const array_decl = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, null, .{
...@@ -4807,7 +4807,7 @@ pub fn populateTestFunctions(mod: *Module) !void {...@@ -4807,7 +4807,7 @@ pub fn populateTestFunctions(mod: *Module) !void {
4807 {4807 {
4808 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);4808 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
4809 errdefer new_decl_arena.deinit();4809 errdefer new_decl_arena.deinit();
4810 const arena = new_decl_arena.getAllocator();4810 const arena = new_decl_arena.allocator();
48114811
4812 // This copy accesses the old Decl Type/Value so it must be done before `clearValues`.4812 // This copy accesses the old Decl Type/Value so it must be done before `clearValues`.
4813 const new_ty = try Type.Tag.const_slice.create(arena, try tmp_test_fn_ty.copy(arena));4813 const new_ty = try Type.Tag.const_slice.create(arena, try tmp_test_fn_ty.copy(arena));
src/Sema.zig+17-17
...@@ -418,7 +418,7 @@ pub const Block = struct {...@@ -418,7 +418,7 @@ pub const Block = struct {
418 finished: bool,418 finished: bool,
419419
420 pub fn arena(wad: *WipAnonDecl) Allocator {420 pub fn arena(wad: *WipAnonDecl) Allocator {
421 return wad.new_decl_arena.getAllocator();421 return wad.new_decl_arena.allocator();
422 }422 }
423423
424 pub fn deinit(wad: *WipAnonDecl) void {424 pub fn deinit(wad: *WipAnonDecl) void {
...@@ -1594,7 +1594,7 @@ fn zirStructDecl(...@@ -1594,7 +1594,7 @@ fn zirStructDecl(
15941594
1595 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);1595 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
1596 errdefer new_decl_arena.deinit();1596 errdefer new_decl_arena.deinit();
1597 const new_decl_arena_allocator = new_decl_arena.getAllocator();1597 const new_decl_arena_allocator = new_decl_arena.allocator();
15981598
1599 const struct_obj = try new_decl_arena_allocator.create(Module.Struct);1599 const struct_obj = try new_decl_arena_allocator.create(Module.Struct);
1600 const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj);1600 const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj);
...@@ -1699,7 +1699,7 @@ fn zirEnumDecl(...@@ -1699,7 +1699,7 @@ fn zirEnumDecl(
16991699
1700 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);1700 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
1701 errdefer new_decl_arena.deinit();1701 errdefer new_decl_arena.deinit();
1702 const new_decl_arena_allocator = new_decl_arena.getAllocator();1702 const new_decl_arena_allocator = new_decl_arena.allocator();
17031703
1704 const enum_obj = try new_decl_arena_allocator.create(Module.EnumFull);1704 const enum_obj = try new_decl_arena_allocator.create(Module.EnumFull);
1705 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumFull);1705 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumFull);
...@@ -1889,7 +1889,7 @@ fn zirUnionDecl(...@@ -1889,7 +1889,7 @@ fn zirUnionDecl(
18891889
1890 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);1890 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
1891 errdefer new_decl_arena.deinit();1891 errdefer new_decl_arena.deinit();
1892 const new_decl_arena_allocator = new_decl_arena.getAllocator();1892 const new_decl_arena_allocator = new_decl_arena.allocator();
18931893
1894 const union_obj = try new_decl_arena_allocator.create(Module.Union);1894 const union_obj = try new_decl_arena_allocator.create(Module.Union);
1895 const type_tag: Type.Tag = if (small.has_tag_type or small.auto_enum_tag) .union_tagged else .@"union";1895 const type_tag: Type.Tag = if (small.has_tag_type or small.auto_enum_tag) .union_tagged else .@"union";
...@@ -1958,7 +1958,7 @@ fn zirOpaqueDecl(...@@ -1958,7 +1958,7 @@ fn zirOpaqueDecl(
19581958
1959 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);1959 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
1960 errdefer new_decl_arena.deinit();1960 errdefer new_decl_arena.deinit();
1961 const new_decl_arena_allocator = new_decl_arena.getAllocator();1961 const new_decl_arena_allocator = new_decl_arena.allocator();
19621962
1963 const opaque_obj = try new_decl_arena_allocator.create(Module.Opaque);1963 const opaque_obj = try new_decl_arena_allocator.create(Module.Opaque);
1964 const opaque_ty_payload = try new_decl_arena_allocator.create(Type.Payload.Opaque);1964 const opaque_ty_payload = try new_decl_arena_allocator.create(Type.Payload.Opaque);
...@@ -2012,7 +2012,7 @@ fn zirErrorSetDecl(...@@ -2012,7 +2012,7 @@ fn zirErrorSetDecl(
20122012
2013 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);2013 var new_decl_arena = std.heap.ArenaAllocator.init(gpa);
2014 errdefer new_decl_arena.deinit();2014 errdefer new_decl_arena.deinit();
2015 const new_decl_arena_allocator = new_decl_arena.getAllocator();2015 const new_decl_arena_allocator = new_decl_arena.allocator();
20162016
2017 const error_set = try new_decl_arena_allocator.create(Module.ErrorSet);2017 const error_set = try new_decl_arena_allocator.create(Module.ErrorSet);
2018 const error_set_ty = try Type.Tag.error_set.create(new_decl_arena_allocator, error_set);2018 const error_set_ty = try Type.Tag.error_set.create(new_decl_arena_allocator, error_set);
...@@ -3940,7 +3940,7 @@ fn analyzeCall(...@@ -3940,7 +3940,7 @@ fn analyzeCall(
3940 {3940 {
3941 var arena_allocator = std.heap.ArenaAllocator.init(gpa);3941 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
3942 errdefer arena_allocator.deinit();3942 errdefer arena_allocator.deinit();
3943 const arena = arena_allocator.getAllocator();3943 const arena = arena_allocator.allocator();
39443944
3945 for (memoized_call_key.args) |*arg| {3945 for (memoized_call_key.args) |*arg| {
3946 arg.* = try arg.*.copy(arena);3946 arg.* = try arg.*.copy(arena);
...@@ -4074,7 +4074,7 @@ fn analyzeCall(...@@ -4074,7 +4074,7 @@ fn analyzeCall(
40744074
4075 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);4075 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
4076 errdefer new_decl_arena.deinit();4076 errdefer new_decl_arena.deinit();
4077 const new_decl_arena_allocator = new_decl_arena.getAllocator();4077 const new_decl_arena_allocator = new_decl_arena.allocator();
40784078
4079 // Re-run the block that creates the function, with the comptime parameters4079 // Re-run the block that creates the function, with the comptime parameters
4080 // pre-populated inside `inst_map`. This causes `param_comptime` and4080 // pre-populated inside `inst_map`. This causes `param_comptime` and
...@@ -6053,8 +6053,8 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError...@@ -6053,8 +6053,8 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
6053 defer arena.deinit();6053 defer arena.deinit();
60546054
6055 const target = sema.mod.getTarget();6055 const target = sema.mod.getTarget();
6056 const min_int = try operand_ty.minInt(arena.getAllocator(), target);6056 const min_int = try operand_ty.minInt(arena.allocator(), target);
6057 const max_int = try operand_ty.maxInt(arena.getAllocator(), target);6057 const max_int = try operand_ty.maxInt(arena.allocator(), target);
6058 if (try range_set.spans(min_int, max_int, operand_ty)) {6058 if (try range_set.spans(min_int, max_int, operand_ty)) {
6059 if (special_prong == .@"else") {6059 if (special_prong == .@"else") {
6060 return sema.fail(6060 return sema.fail(
...@@ -12801,7 +12801,7 @@ const ComptimePtrMutationKit = struct {...@@ -12801,7 +12801,7 @@ const ComptimePtrMutationKit = struct {
1280112801
12802 fn beginArena(self: *ComptimePtrMutationKit, gpa: Allocator) Allocator {12802 fn beginArena(self: *ComptimePtrMutationKit, gpa: Allocator) Allocator {
12803 self.decl_arena = self.decl_ref_mut.decl.value_arena.?.promote(gpa);12803 self.decl_arena = self.decl_ref_mut.decl.value_arena.?.promote(gpa);
12804 return self.decl_arena.getAllocator();12804 return self.decl_arena.allocator();
12805 }12805 }
1280612806
12807 fn finishArena(self: *ComptimePtrMutationKit) void {12807 fn finishArena(self: *ComptimePtrMutationKit) void {
...@@ -14293,7 +14293,7 @@ fn semaStructFields(...@@ -14293,7 +14293,7 @@ fn semaStructFields(
1429314293
14294 var decl_arena = decl.value_arena.?.promote(gpa);14294 var decl_arena = decl.value_arena.?.promote(gpa);
14295 defer decl.value_arena.?.* = decl_arena.state;14295 defer decl.value_arena.?.* = decl_arena.state;
14296 const decl_arena_allocator = decl_arena.getAllocator();14296 const decl_arena_allocator = decl_arena.allocator();
1429714297
14298 var analysis_arena = std.heap.ArenaAllocator.init(gpa);14298 var analysis_arena = std.heap.ArenaAllocator.init(gpa);
14299 defer analysis_arena.deinit();14299 defer analysis_arena.deinit();
...@@ -14301,7 +14301,7 @@ fn semaStructFields(...@@ -14301,7 +14301,7 @@ fn semaStructFields(
14301 var sema: Sema = .{14301 var sema: Sema = .{
14302 .mod = mod,14302 .mod = mod,
14303 .gpa = gpa,14303 .gpa = gpa,
14304 .arena = analysis_arena.getAllocator(),14304 .arena = analysis_arena.allocator(),
14305 .perm_arena = decl_arena_allocator,14305 .perm_arena = decl_arena_allocator,
14306 .code = zir,14306 .code = zir,
14307 .owner_decl = decl,14307 .owner_decl = decl,
...@@ -14461,7 +14461,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {...@@ -14461,7 +14461,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {
1446114461
14462 var decl_arena = union_obj.owner_decl.value_arena.?.promote(gpa);14462 var decl_arena = union_obj.owner_decl.value_arena.?.promote(gpa);
14463 defer union_obj.owner_decl.value_arena.?.* = decl_arena.state;14463 defer union_obj.owner_decl.value_arena.?.* = decl_arena.state;
14464 const decl_arena_allocator = decl_arena.getAllocator();14464 const decl_arena_allocator = decl_arena.allocator();
1446514465
14466 var analysis_arena = std.heap.ArenaAllocator.init(gpa);14466 var analysis_arena = std.heap.ArenaAllocator.init(gpa);
14467 defer analysis_arena.deinit();14467 defer analysis_arena.deinit();
...@@ -14469,7 +14469,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {...@@ -14469,7 +14469,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {
14469 var sema: Sema = .{14469 var sema: Sema = .{
14470 .mod = mod,14470 .mod = mod,
14471 .gpa = gpa,14471 .gpa = gpa,
14472 .arena = analysis_arena.getAllocator(),14472 .arena = analysis_arena.allocator(),
14473 .perm_arena = decl_arena_allocator,14473 .perm_arena = decl_arena_allocator,
14474 .code = zir,14474 .code = zir,
14475 .owner_decl = decl,14475 .owner_decl = decl,
...@@ -14623,7 +14623,7 @@ fn generateUnionTagTypeNumbered(...@@ -14623,7 +14623,7 @@ fn generateUnionTagTypeNumbered(
1462314623
14624 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);14624 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
14625 errdefer new_decl_arena.deinit();14625 errdefer new_decl_arena.deinit();
14626 const new_decl_arena_allocator = new_decl_arena.getAllocator();14626 const new_decl_arena_allocator = new_decl_arena.allocator();
1462714627
14628 const enum_obj = try new_decl_arena_allocator.create(Module.EnumNumbered);14628 const enum_obj = try new_decl_arena_allocator.create(Module.EnumNumbered);
14629 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumNumbered);14629 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumNumbered);
...@@ -14660,7 +14660,7 @@ fn generateUnionTagTypeSimple(sema: *Sema, block: *Block, fields_len: u32) !Type...@@ -14660,7 +14660,7 @@ fn generateUnionTagTypeSimple(sema: *Sema, block: *Block, fields_len: u32) !Type
1466014660
14661 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);14661 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
14662 errdefer new_decl_arena.deinit();14662 errdefer new_decl_arena.deinit();
14663 const new_decl_arena_allocator = new_decl_arena.getAllocator();14663 const new_decl_arena_allocator = new_decl_arena.allocator();
1466414664
14665 const enum_obj = try new_decl_arena_allocator.create(Module.EnumSimple);14665 const enum_obj = try new_decl_arena_allocator.create(Module.EnumSimple);
14666 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumSimple);14666 const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumSimple);
src/codegen/c.zig+1-1
...@@ -390,7 +390,7 @@ pub const DeclGen = struct {...@@ -390,7 +390,7 @@ pub const DeclGen = struct {
390 // Fall back to generic implementation.390 // Fall back to generic implementation.
391 var arena = std.heap.ArenaAllocator.init(dg.module.gpa);391 var arena = std.heap.ArenaAllocator.init(dg.module.gpa);
392 defer arena.deinit();392 defer arena.deinit();
393 const arena_allocator = arena.getAllocator();393 const arena_allocator = arena.allocator();
394394
395 try writer.writeAll("{");395 try writer.writeAll("{");
396 var index: usize = 0;396 var index: usize = 0;
src/codegen/llvm.zig+5-5
...@@ -331,7 +331,7 @@ pub const Object = struct {...@@ -331,7 +331,7 @@ pub const Object = struct {
331331
332 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);332 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
333 defer arena_allocator.deinit();333 defer arena_allocator.deinit();
334 const arena = arena_allocator.getAllocator();334 const arena = arena_allocator.allocator();
335335
336 const mod = comp.bin_file.options.module.?;336 const mod = comp.bin_file.options.module.?;
337 const cache_dir = mod.zig_cache_artifact_directory;337 const cache_dir = mod.zig_cache_artifact_directory;
...@@ -779,7 +779,7 @@ pub const DeclGen = struct {...@@ -779,7 +779,7 @@ pub const DeclGen = struct {
779779
780 // The Type memory is ephemeral; since we want to store a longer-lived780 // The Type memory is ephemeral; since we want to store a longer-lived
781 // reference, we need to copy it here.781 // reference, we need to copy it here.
782 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.getAllocator());782 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator());
783783
784 const opaque_obj = t.castTag(.@"opaque").?.data;784 const opaque_obj = t.castTag(.@"opaque").?.data;
785 const name = try opaque_obj.getFullyQualifiedName(gpa);785 const name = try opaque_obj.getFullyQualifiedName(gpa);
...@@ -837,7 +837,7 @@ pub const DeclGen = struct {...@@ -837,7 +837,7 @@ pub const DeclGen = struct {
837837
838 // The Type memory is ephemeral; since we want to store a longer-lived838 // The Type memory is ephemeral; since we want to store a longer-lived
839 // reference, we need to copy it here.839 // reference, we need to copy it here.
840 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.getAllocator());840 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator());
841841
842 const struct_obj = t.castTag(.@"struct").?.data;842 const struct_obj = t.castTag(.@"struct").?.data;
843843
...@@ -871,7 +871,7 @@ pub const DeclGen = struct {...@@ -871,7 +871,7 @@ pub const DeclGen = struct {
871871
872 // The Type memory is ephemeral; since we want to store a longer-lived872 // The Type memory is ephemeral; since we want to store a longer-lived
873 // reference, we need to copy it here.873 // reference, we need to copy it here.
874 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.getAllocator());874 gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator());
875875
876 const union_obj = t.cast(Type.Payload.Union).?.data;876 const union_obj = t.cast(Type.Payload.Union).?.data;
877 const target = dg.module.getTarget();877 const target = dg.module.getTarget();
...@@ -2485,7 +2485,7 @@ pub const FuncGen = struct {...@@ -2485,7 +2485,7 @@ pub const FuncGen = struct {
24852485
2486 var arena_allocator = std.heap.ArenaAllocator.init(self.gpa);2486 var arena_allocator = std.heap.ArenaAllocator.init(self.gpa);
2487 defer arena_allocator.deinit();2487 defer arena_allocator.deinit();
2488 const arena = arena_allocator.getAllocator();2488 const arena = arena_allocator.allocator();
24892489
2490 const llvm_params_len = args.len;2490 const llvm_params_len = args.len;
2491 const llvm_param_types = try arena.alloc(*const llvm.Type, llvm_params_len);2491 const llvm_param_types = try arena.alloc(*const llvm.Type, llvm_params_len);
src/crash_report.zig+1-1
...@@ -85,7 +85,7 @@ fn dumpStatusReport() !void {...@@ -85,7 +85,7 @@ fn dumpStatusReport() !void {
85 const anal = zir_state orelse return;85 const anal = zir_state orelse return;
86 // Note: We have the panic mutex here, so we can safely use the global crash heap.86 // Note: We have the panic mutex here, so we can safely use the global crash heap.
87 var fba = std.heap.FixedBufferAllocator.init(&crash_heap);87 var fba = std.heap.FixedBufferAllocator.init(&crash_heap);
88 const allocator = fba.getAllocator();88 const allocator = fba.allocator();
8989
90 const stderr = io.getStdErr().writer();90 const stderr = io.getStdErr().writer();
91 const block: *Sema.Block = anal.block;91 const block: *Sema.Block = anal.block;
src/glibc.zig+3-3
...@@ -65,7 +65,7 @@ pub fn loadMetaData(gpa: Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!*...@@ -65,7 +65,7 @@ pub fn loadMetaData(gpa: Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!*
6565
66 var arena_allocator = std.heap.ArenaAllocator.init(gpa);66 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
67 errdefer arena_allocator.deinit();67 errdefer arena_allocator.deinit();
68 const arena = arena_allocator.getAllocator();68 const arena = arena_allocator.allocator();
6969
70 var all_versions = std.ArrayListUnmanaged(std.builtin.Version){};70 var all_versions = std.ArrayListUnmanaged(std.builtin.Version){};
71 var all_functions = std.ArrayListUnmanaged(Fn){};71 var all_functions = std.ArrayListUnmanaged(Fn){};
...@@ -256,7 +256,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {...@@ -256,7 +256,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
256 const gpa = comp.gpa;256 const gpa = comp.gpa;
257 var arena_allocator = std.heap.ArenaAllocator.init(gpa);257 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
258 defer arena_allocator.deinit();258 defer arena_allocator.deinit();
259 const arena = arena_allocator.getAllocator();259 const arena = arena_allocator.allocator();
260260
261 switch (crt_file) {261 switch (crt_file) {
262 .crti_o => {262 .crti_o => {
...@@ -711,7 +711,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void {...@@ -711,7 +711,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void {
711711
712 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);712 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
713 defer arena_allocator.deinit();713 defer arena_allocator.deinit();
714 const arena = arena_allocator.getAllocator();714 const arena = arena_allocator.allocator();
715715
716 const target = comp.getTarget();716 const target = comp.getTarget();
717 const target_version = target.os.version_range.linux.glibc;717 const target_version = target.os.version_range.linux.glibc;
src/libcxx.zig+2-2
...@@ -89,7 +89,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {...@@ -89,7 +89,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
8989
90 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);90 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
91 defer arena_allocator.deinit();91 defer arena_allocator.deinit();
92 const arena = arena_allocator.getAllocator();92 const arena = arena_allocator.allocator();
9393
94 const root_name = "c++";94 const root_name = "c++";
95 const output_mode = .Lib;95 const output_mode = .Lib;
...@@ -236,7 +236,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {...@@ -236,7 +236,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
236236
237 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);237 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
238 defer arena_allocator.deinit();238 defer arena_allocator.deinit();
239 const arena = arena_allocator.getAllocator();239 const arena = arena_allocator.allocator();
240240
241 const root_name = "c++abi";241 const root_name = "c++abi";
242 const output_mode = .Lib;242 const output_mode = .Lib;
src/libtsan.zig+1-1
...@@ -15,7 +15,7 @@ pub fn buildTsan(comp: *Compilation) !void {...@@ -15,7 +15,7 @@ pub fn buildTsan(comp: *Compilation) !void {
1515
16 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);16 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
17 defer arena_allocator.deinit();17 defer arena_allocator.deinit();
18 const arena = arena_allocator.getAllocator();18 const arena = arena_allocator.allocator();
1919
20 const root_name = "tsan";20 const root_name = "tsan";
21 const output_mode = .Lib;21 const output_mode = .Lib;
src/libunwind.zig+1-1
...@@ -17,7 +17,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {...@@ -17,7 +17,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {
1717
18 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);18 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
19 defer arena_allocator.deinit();19 defer arena_allocator.deinit();
20 const arena = arena_allocator.getAllocator();20 const arena = arena_allocator.allocator();
2121
22 const root_name = "unwind";22 const root_name = "unwind";
23 const output_mode = .Lib;23 const output_mode = .Lib;
src/link.zig+1-1
...@@ -628,7 +628,7 @@ pub const File = struct {...@@ -628,7 +628,7 @@ pub const File = struct {
628628
629 var arena_allocator = std.heap.ArenaAllocator.init(base.allocator);629 var arena_allocator = std.heap.ArenaAllocator.init(base.allocator);
630 defer arena_allocator.deinit();630 defer arena_allocator.deinit();
631 const arena = arena_allocator.getAllocator();631 const arena = arena_allocator.allocator();
632632
633 const directory = base.options.emit.?.directory; // Just an alias to make it shorter to type.633 const directory = base.options.emit.?.directory; // Just an alias to make it shorter to type.
634634
src/link/C.zig+2-2
...@@ -128,7 +128,7 @@ pub fn updateFunc(self: *C, module: *Module, func: *Module.Fn, air: Air, livenes...@@ -128,7 +128,7 @@ pub fn updateFunc(self: *C, module: *Module, func: *Module.Fn, air: Air, livenes
128 .decl = decl,128 .decl = decl,
129 .fwd_decl = fwd_decl.toManaged(module.gpa),129 .fwd_decl = fwd_decl.toManaged(module.gpa),
130 .typedefs = typedefs.promote(module.gpa),130 .typedefs = typedefs.promote(module.gpa),
131 .typedefs_arena = self.arena.getAllocator(),131 .typedefs_arena = self.arena.allocator(),
132 },132 },
133 .code = code.toManaged(module.gpa),133 .code = code.toManaged(module.gpa),
134 .indent_writer = undefined, // set later so we can get a pointer to object.code134 .indent_writer = undefined, // set later so we can get a pointer to object.code
...@@ -193,7 +193,7 @@ pub fn updateDecl(self: *C, module: *Module, decl: *Module.Decl) !void {...@@ -193,7 +193,7 @@ pub fn updateDecl(self: *C, module: *Module, decl: *Module.Decl) !void {
193 .decl = decl,193 .decl = decl,
194 .fwd_decl = fwd_decl.toManaged(module.gpa),194 .fwd_decl = fwd_decl.toManaged(module.gpa),
195 .typedefs = typedefs.promote(module.gpa),195 .typedefs = typedefs.promote(module.gpa),
196 .typedefs_arena = self.arena.getAllocator(),196 .typedefs_arena = self.arena.allocator(),
197 },197 },
198 .code = code.toManaged(module.gpa),198 .code = code.toManaged(module.gpa),
199 .indent_writer = undefined, // set later so we can get a pointer to object.code199 .indent_writer = undefined, // set later so we can get a pointer to object.code
src/link/Coff.zig+1-1
...@@ -877,7 +877,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {...@@ -877,7 +877,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
877877
878 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);878 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);
879 defer arena_allocator.deinit();879 defer arena_allocator.deinit();
880 const arena = arena_allocator.getAllocator();880 const arena = arena_allocator.allocator();
881881
882 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.882 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.
883883
src/link/Elf.zig+1-1
...@@ -1243,7 +1243,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {...@@ -1243,7 +1243,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
12431243
1244 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);1244 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);
1245 defer arena_allocator.deinit();1245 defer arena_allocator.deinit();
1246 const arena = arena_allocator.getAllocator();1246 const arena = arena_allocator.allocator();
12471247
1248 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.1248 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.
12491249
src/link/MachO.zig+2-2
...@@ -412,7 +412,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {...@@ -412,7 +412,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
412412
413 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);413 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);
414 defer arena_allocator.deinit();414 defer arena_allocator.deinit();
415 const arena = arena_allocator.getAllocator();415 const arena = arena_allocator.allocator();
416416
417 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.417 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.
418418
...@@ -5379,7 +5379,7 @@ fn snapshotState(self: *MachO) !void {...@@ -5379,7 +5379,7 @@ fn snapshotState(self: *MachO) !void {
53795379
5380 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);5380 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);
5381 defer arena_allocator.deinit();5381 defer arena_allocator.deinit();
5382 const arena = arena_allocator.getAllocator();5382 const arena = arena_allocator.allocator();
53835383
5384 const out_file = try emit.directory.handle.createFile("snapshots.json", .{5384 const out_file = try emit.directory.handle.createFile("snapshots.json", .{
5385 .truncate = self.cold_start,5385 .truncate = self.cold_start,
src/link/Plan9.zig+1-1
...@@ -168,7 +168,7 @@ fn putFn(self: *Plan9, decl: *Module.Decl, out: FnDeclOutput) !void {...@@ -168,7 +168,7 @@ fn putFn(self: *Plan9, decl: *Module.Decl, out: FnDeclOutput) !void {
168 try fn_map_res.value_ptr.functions.put(gpa, decl, out);168 try fn_map_res.value_ptr.functions.put(gpa, decl, out);
169 } else {169 } else {
170 const file = decl.getFileScope();170 const file = decl.getFileScope();
171 const arena = self.path_arena.getAllocator();171 const arena = self.path_arena.allocator();
172 // each file gets a symbol172 // each file gets a symbol
173 fn_map_res.value_ptr.* = .{173 fn_map_res.value_ptr.* = .{
174 .sym_index = blk: {174 .sym_index = blk: {
src/link/Wasm.zig+1-1
...@@ -950,7 +950,7 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {...@@ -950,7 +950,7 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
950950
951 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);951 var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator);
952 defer arena_allocator.deinit();952 defer arena_allocator.deinit();
953 const arena = arena_allocator.getAllocator();953 const arena = arena_allocator.allocator();
954954
955 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.955 const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type.
956956
src/link/tapi.zig+3-3
...@@ -120,7 +120,7 @@ pub const LibStub = struct {...@@ -120,7 +120,7 @@ pub const LibStub = struct {
120 err: {120 err: {
121 log.debug("trying to parse as []TbdV4", .{});121 log.debug("trying to parse as []TbdV4", .{});
122 const inner = lib_stub.yaml.parse([]TbdV4) catch break :err;122 const inner = lib_stub.yaml.parse([]TbdV4) catch break :err;
123 var out = try lib_stub.yaml.arena.getAllocator().alloc(Tbd, inner.len);123 var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, inner.len);
124 for (inner) |doc, i| {124 for (inner) |doc, i| {
125 out[i] = .{ .v4 = doc };125 out[i] = .{ .v4 = doc };
126 }126 }
...@@ -130,7 +130,7 @@ pub const LibStub = struct {...@@ -130,7 +130,7 @@ pub const LibStub = struct {
130 err: {130 err: {
131 log.debug("trying to parse as TbdV4", .{});131 log.debug("trying to parse as TbdV4", .{});
132 const inner = lib_stub.yaml.parse(TbdV4) catch break :err;132 const inner = lib_stub.yaml.parse(TbdV4) catch break :err;
133 var out = try lib_stub.yaml.arena.getAllocator().alloc(Tbd, 1);133 var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, 1);
134 out[0] = .{ .v4 = inner };134 out[0] = .{ .v4 = inner };
135 break :blk out;135 break :blk out;
136 }136 }
...@@ -148,7 +148,7 @@ pub const LibStub = struct {...@@ -148,7 +148,7 @@ pub const LibStub = struct {
148 err: {148 err: {
149 log.debug("trying to parse as TbdV3", .{});149 log.debug("trying to parse as TbdV3", .{});
150 const inner = lib_stub.yaml.parse(TbdV3) catch break :err;150 const inner = lib_stub.yaml.parse(TbdV3) catch break :err;
151 var out = try lib_stub.yaml.arena.getAllocator().alloc(Tbd, 1);151 var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, 1);
152 out[0] = .{ .v3 = inner };152 out[0] = .{ .v3 = inner };
153 break :blk out;153 break :blk out;
154 }154 }
src/link/tapi/yaml.zig+4-4
...@@ -248,7 +248,7 @@ pub const Yaml = struct {...@@ -248,7 +248,7 @@ pub const Yaml = struct {
248248
249 pub fn load(allocator: Allocator, source: []const u8) !Yaml {249 pub fn load(allocator: Allocator, source: []const u8) !Yaml {
250 var arena = ArenaAllocator.init(allocator);250 var arena = ArenaAllocator.init(allocator);
251 const arena_allocator = arena.getAllocator();251 const arena_allocator = arena.allocator();
252252
253 var tree = Tree.init(arena_allocator);253 var tree = Tree.init(arena_allocator);
254 try tree.parse(source);254 try tree.parse(source);
...@@ -300,7 +300,7 @@ pub const Yaml = struct {...@@ -300,7 +300,7 @@ pub const Yaml = struct {
300 .Pointer => |info| {300 .Pointer => |info| {
301 switch (info.size) {301 switch (info.size) {
302 .Slice => {302 .Slice => {
303 var parsed = try self.arena.getAllocator().alloc(info.child, self.docs.items.len);303 var parsed = try self.arena.allocator().alloc(info.child, self.docs.items.len);
304 for (self.docs.items) |doc, i| {304 for (self.docs.items) |doc, i| {
305 parsed[i] = try self.parseValue(info.child, doc);305 parsed[i] = try self.parseValue(info.child, doc);
306 }306 }
...@@ -362,7 +362,7 @@ pub const Yaml = struct {...@@ -362,7 +362,7 @@ pub const Yaml = struct {
362362
363 inline for (struct_info.fields) |field| {363 inline for (struct_info.fields) |field| {
364 const value: ?Value = map.get(field.name) orelse blk: {364 const value: ?Value = map.get(field.name) orelse blk: {
365 const field_name = try mem.replaceOwned(u8, self.arena.getAllocator(), field.name, "_", "-");365 const field_name = try mem.replaceOwned(u8, self.arena.allocator(), field.name, "_", "-");
366 break :blk map.get(field_name);366 break :blk map.get(field_name);
367 };367 };
368368
...@@ -383,7 +383,7 @@ pub const Yaml = struct {...@@ -383,7 +383,7 @@ pub const Yaml = struct {
383383
384 fn parsePointer(self: *Yaml, comptime T: type, value: Value) Error!T {384 fn parsePointer(self: *Yaml, comptime T: type, value: Value) Error!T {
385 const ptr_info = @typeInfo(T).Pointer;385 const ptr_info = @typeInfo(T).Pointer;
386 const arena = self.arena.getAllocator();386 const arena = self.arena.allocator();
387387
388 switch (ptr_info.size) {388 switch (ptr_info.size) {
389 .Slice => {389 .Slice => {
src/main.zig+4-4
...@@ -139,7 +139,7 @@ pub fn main() anyerror!void {...@@ -139,7 +139,7 @@ pub fn main() anyerror!void {
139 const gpa = gpa: {139 const gpa = gpa: {
140 if (!builtin.link_libc) {140 if (!builtin.link_libc) {
141 gpa_need_deinit = true;141 gpa_need_deinit = true;
142 break :gpa general_purpose_allocator.getAllocator();142 break :gpa general_purpose_allocator.allocator();
143 }143 }
144 // We would prefer to use raw libc allocator here, but cannot144 // We would prefer to use raw libc allocator here, but cannot
145 // use it if it won't support the alignment we need.145 // use it if it won't support the alignment we need.
...@@ -153,7 +153,7 @@ pub fn main() anyerror!void {...@@ -153,7 +153,7 @@ pub fn main() anyerror!void {
153 };153 };
154 var arena_instance = std.heap.ArenaAllocator.init(gpa);154 var arena_instance = std.heap.ArenaAllocator.init(gpa);
155 defer arena_instance.deinit();155 defer arena_instance.deinit();
156 const arena = arena_instance.getAllocator();156 const arena = arena_instance.allocator();
157157
158 const args = try process.argsAlloc(arena);158 const args = try process.argsAlloc(arena);
159159
...@@ -3619,7 +3619,7 @@ pub fn cmdFmt(gpa: Allocator, arena: Allocator, args: []const []const u8) !void...@@ -3619,7 +3619,7 @@ pub fn cmdFmt(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
3619 var errors = std.ArrayList(Compilation.AllErrors.Message).init(gpa);3619 var errors = std.ArrayList(Compilation.AllErrors.Message).init(gpa);
3620 defer errors.deinit();3620 defer errors.deinit();
36213621
3622 try Compilation.AllErrors.addZir(arena_instance.getAllocator(), &errors, &file);3622 try Compilation.AllErrors.addZir(arena_instance.allocator(), &errors, &file);
3623 const ttyconf: std.debug.TTY.Config = switch (color) {3623 const ttyconf: std.debug.TTY.Config = switch (color) {
3624 .auto => std.debug.detectTTYConfig(),3624 .auto => std.debug.detectTTYConfig(),
3625 .on => .escape_codes,3625 .on => .escape_codes,
...@@ -3818,7 +3818,7 @@ fn fmtPathFile(...@@ -3818,7 +3818,7 @@ fn fmtPathFile(
3818 var errors = std.ArrayList(Compilation.AllErrors.Message).init(fmt.gpa);3818 var errors = std.ArrayList(Compilation.AllErrors.Message).init(fmt.gpa);
3819 defer errors.deinit();3819 defer errors.deinit();
38203820
3821 try Compilation.AllErrors.addZir(arena_instance.getAllocator(), &errors, &file);3821 try Compilation.AllErrors.addZir(arena_instance.allocator(), &errors, &file);
3822 const ttyconf: std.debug.TTY.Config = switch (fmt.color) {3822 const ttyconf: std.debug.TTY.Config = switch (fmt.color) {
3823 .auto => std.debug.detectTTYConfig(),3823 .auto => std.debug.detectTTYConfig(),
3824 .on => .escape_codes,3824 .on => .escape_codes,
src/mingw.zig+2-2
...@@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {...@@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
25 }25 }
26 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);26 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
27 defer arena_allocator.deinit();27 defer arena_allocator.deinit();
28 const arena = arena_allocator.getAllocator();28 const arena = arena_allocator.allocator();
2929
30 switch (crt_file) {30 switch (crt_file) {
31 .crt2_o => {31 .crt2_o => {
...@@ -281,7 +281,7 @@ fn add_cc_args(...@@ -281,7 +281,7 @@ fn add_cc_args(
281pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {281pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
282 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);282 var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa);
283 defer arena_allocator.deinit();283 defer arena_allocator.deinit();
284 const arena = arena_allocator.getAllocator();284 const arena = arena_allocator.allocator();
285285
286 const def_file_path = findDef(comp, arena, lib_name) catch |err| switch (err) {286 const def_file_path = findDef(comp, arena, lib_name) catch |err| switch (err) {
287 error.FileNotFound => {287 error.FileNotFound => {
src/musl.zig+1-1
...@@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {...@@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
25 const gpa = comp.gpa;25 const gpa = comp.gpa;
26 var arena_allocator = std.heap.ArenaAllocator.init(gpa);26 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
27 defer arena_allocator.deinit();27 defer arena_allocator.deinit();
28 const arena = arena_allocator.getAllocator();28 const arena = arena_allocator.allocator();
2929
30 switch (crt_file) {30 switch (crt_file) {
31 .crti_o => {31 .crti_o => {
src/print_air.zig+1-1
...@@ -47,7 +47,7 @@ pub fn dump(gpa: Allocator, air: Air, zir: Zir, liveness: Liveness) void {...@@ -47,7 +47,7 @@ pub fn dump(gpa: Allocator, air: Air, zir: Zir, liveness: Liveness) void {
4747
48 var writer: Writer = .{48 var writer: Writer = .{
49 .gpa = gpa,49 .gpa = gpa,
50 .arena = arena.getAllocator(),50 .arena = arena.allocator(),
51 .air = air,51 .air = air,
52 .zir = zir,52 .zir = zir,
53 .liveness = liveness,53 .liveness = liveness,
src/print_zir.zig+3-3
...@@ -19,7 +19,7 @@ pub fn renderAsTextToFile(...@@ -19,7 +19,7 @@ pub fn renderAsTextToFile(
1919
20 var writer: Writer = .{20 var writer: Writer = .{
21 .gpa = gpa,21 .gpa = gpa,
22 .arena = arena.getAllocator(),22 .arena = arena.allocator(),
23 .file = scope_file,23 .file = scope_file,
24 .code = scope_file.zir,24 .code = scope_file.zir,
25 .indent = 0,25 .indent = 0,
...@@ -74,7 +74,7 @@ pub fn renderInstructionContext(...@@ -74,7 +74,7 @@ pub fn renderInstructionContext(
7474
75 var writer: Writer = .{75 var writer: Writer = .{
76 .gpa = gpa,76 .gpa = gpa,
77 .arena = arena.getAllocator(),77 .arena = arena.allocator(),
78 .file = scope_file,78 .file = scope_file,
79 .code = scope_file.zir,79 .code = scope_file.zir,
80 .indent = if (indent < 2) 2 else indent,80 .indent = if (indent < 2) 2 else indent,
...@@ -106,7 +106,7 @@ pub fn renderSingleInstruction(...@@ -106,7 +106,7 @@ pub fn renderSingleInstruction(
106106
107 var writer: Writer = .{107 var writer: Writer = .{
108 .gpa = gpa,108 .gpa = gpa,
109 .arena = arena.getAllocator(),109 .arena = arena.allocator(),
110 .file = scope_file,110 .file = scope_file,
111 .code = scope_file.zir,111 .code = scope_file.zir,
112 .indent = indent,112 .indent = indent,
src/stage1.zig+1-1
...@@ -38,7 +38,7 @@ pub fn main(argc: c_int, argv: [*][*:0]u8) callconv(.C) c_int {...@@ -38,7 +38,7 @@ pub fn main(argc: c_int, argv: [*][*:0]u8) callconv(.C) c_int {
38 const gpa = std.heap.c_allocator;38 const gpa = std.heap.c_allocator;
39 var arena_instance = std.heap.ArenaAllocator.init(gpa);39 var arena_instance = std.heap.ArenaAllocator.init(gpa);
40 defer arena_instance.deinit();40 defer arena_instance.deinit();
41 const arena = arena_instance.getAllocator();41 const arena = arena_instance.allocator();
4242
43 const args = arena.alloc([]const u8, @intCast(usize, argc)) catch fatal("{s}", .{"OutOfMemory"});43 const args = arena.alloc([]const u8, @intCast(usize, argc)) catch fatal("{s}", .{"OutOfMemory"});
44 for (args) |*arg, i| {44 for (args) |*arg, i| {
src/test.zig+1-1
...@@ -692,7 +692,7 @@ pub const TestContext = struct {...@@ -692,7 +692,7 @@ pub const TestContext = struct {
692692
693 var arena_allocator = std.heap.ArenaAllocator.init(allocator);693 var arena_allocator = std.heap.ArenaAllocator.init(allocator);
694 defer arena_allocator.deinit();694 defer arena_allocator.deinit();
695 const arena = arena_allocator.getAllocator();695 const arena = arena_allocator.allocator();
696696
697 var tmp = std.testing.tmpDir(.{});697 var tmp = std.testing.tmpDir(.{});
698 defer tmp.cleanup();698 defer tmp.cleanup();
src/translate_c.zig+1-1
...@@ -373,7 +373,7 @@ pub fn translate(...@@ -373,7 +373,7 @@ pub fn translate(
373 // from this function.373 // from this function.
374 var arena = std.heap.ArenaAllocator.init(gpa);374 var arena = std.heap.ArenaAllocator.init(gpa);
375 errdefer arena.deinit();375 errdefer arena.deinit();
376 const arena_allocator = arena.getAllocator();376 const arena_allocator = arena.allocator();
377377
378 var context = Context{378 var context = Context{
379 .gpa = gpa,379 .gpa = gpa,
src/wasi_libc.zig+1-1
...@@ -67,7 +67,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {...@@ -67,7 +67,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
67 const gpa = comp.gpa;67 const gpa = comp.gpa;
68 var arena_allocator = std.heap.ArenaAllocator.init(gpa);68 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
69 defer arena_allocator.deinit();69 defer arena_allocator.deinit();
70 const arena = arena_allocator.getAllocator();70 const arena = arena_allocator.allocator();
7171
72 switch (crt_file) {72 switch (crt_file) {
73 .crt1_reactor_o => {73 .crt1_reactor_o => {
test/cli.zig+1-1
...@@ -16,7 +16,7 @@ pub fn main() !void {...@@ -16,7 +16,7 @@ pub fn main() !void {
16 // skip my own exe name16 // skip my own exe name
17 _ = arg_it.skip();17 _ = arg_it.skip();
1818
19 a = arena.getAllocator();19 a = arena.allocator();
2020
21 const zig_exe_rel = try (arg_it.next(a) orelse {21 const zig_exe_rel = try (arg_it.next(a) orelse {
22 std.debug.print("Expected first argument to be path to zig compiler\n", .{});22 std.debug.print("Expected first argument to be path to zig compiler\n", .{});
test/compare_output.zig+1-1
...@@ -491,7 +491,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {...@@ -491,7 +491,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
491 \\pub fn main() !void {491 \\pub fn main() !void {
492 \\ var allocator_buf: [10]u8 = undefined;492 \\ var allocator_buf: [10]u8 = undefined;
493 \\ var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));493 \\ var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));
494 \\ const allocator = std.heap.loggingAllocator(fixedBufferAllocator.getAllocator()).getAllocator();494 \\ const allocator = std.heap.loggingAllocator(fixedBufferAllocator.allocator()).allocator();
495 \\495 \\
496 \\ var a = try allocator.alloc(u8, 10);496 \\ var a = try allocator.alloc(u8, 10);
497 \\ a = allocator.shrink(a, 5);497 \\ a = allocator.shrink(a, 5);
test/standalone/brace_expansion/main.zig+1-1
...@@ -16,7 +16,7 @@ const Token = union(enum) {...@@ -16,7 +16,7 @@ const Token = union(enum) {
16};16};
1717
18var gpa = std.heap.GeneralPurposeAllocator(.{}){};18var gpa = std.heap.GeneralPurposeAllocator(.{}){};
19const global_allocator = gpa.getAllocator();19const global_allocator = gpa.allocator();
2020
21fn tokenize(input: []const u8) !ArrayList(Token) {21fn tokenize(input: []const u8) !ArrayList(Token) {
22 const State = enum {22 const State = enum {
test/standalone/cat/main.zig+1-1
...@@ -8,7 +8,7 @@ const warn = std.log.warn;...@@ -8,7 +8,7 @@ const warn = std.log.warn;
8pub fn main() !void {8pub fn main() !void {
9 var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);9 var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
10 defer arena_instance.deinit();10 defer arena_instance.deinit();
11 const arena = arena_instance.getAllocator();11 const arena = arena_instance.allocator();
1212
13 const args = try process.argsAlloc(arena);13 const args = try process.argsAlloc(arena);
1414
tools/gen_spirv_spec.zig+1-1
...@@ -4,7 +4,7 @@ const g = @import("spirv/grammar.zig");...@@ -4,7 +4,7 @@ const g = @import("spirv/grammar.zig");
4pub fn main() !void {4pub fn main() !void {
5 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);5 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
6 defer arena.deinit();6 defer arena.deinit();
7 const allocator = arena.getAllocator();7 const allocator = arena.allocator();
88
9 const args = try std.process.argsAlloc(allocator);9 const args = try std.process.argsAlloc(allocator);
10 if (args.len != 2) {10 if (args.len != 2) {
tools/gen_stubs.zig+1-1
...@@ -25,7 +25,7 @@ pub fn main() !void {...@@ -25,7 +25,7 @@ pub fn main() !void {
2525
26 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);26 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
27 defer arena.deinit();27 defer arena.deinit();
28 const ally = arena.getAllocator();28 const ally = arena.allocator();
2929
30 var symbols = std.ArrayList(Symbol).init(ally);30 var symbols = std.ArrayList(Symbol).init(ally);
31 var sections = std.ArrayList([]const u8).init(ally);31 var sections = std.ArrayList([]const u8).init(ally);
tools/merge_anal_dumps.zig+1-1
...@@ -9,7 +9,7 @@ pub fn main() anyerror!void {...@@ -9,7 +9,7 @@ pub fn main() anyerror!void {
9 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);9 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
10 defer arena.deinit();10 defer arena.deinit();
1111
12 const allocator = arena.getAllocator();12 const allocator = arena.allocator();
1313
14 const args = try std.process.argsAlloc(allocator);14 const args = try std.process.argsAlloc(allocator);
1515
tools/process_headers.zig+1-1
...@@ -284,7 +284,7 @@ const LibCVendor = enum {...@@ -284,7 +284,7 @@ const LibCVendor = enum {
284284
285pub fn main() !void {285pub fn main() !void {
286 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);286 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
287 const allocator = arena.getAllocator();287 const allocator = arena.allocator();
288 const args = try std.process.argsAlloc(allocator);288 const args = try std.process.argsAlloc(allocator);
289 var search_paths = std.ArrayList([]const u8).init(allocator);289 var search_paths = std.ArrayList([]const u8).init(allocator);
290 var opt_out_dir: ?[]const u8 = null;290 var opt_out_dir: ?[]const u8 = null;
tools/update-license-headers.zig+1-1
...@@ -10,7 +10,7 @@ pub fn main() !void {...@@ -10,7 +10,7 @@ pub fn main() !void {
10 defer root_node.end();10 defer root_node.end();
1111
12 var arena_allocator = std.heap.ArenaAllocator.init(std.heap.page_allocator);12 var arena_allocator = std.heap.ArenaAllocator.init(std.heap.page_allocator);
13 const arena = arena_allocator.getAllocator();13 const arena = arena_allocator.allocator();
1414
15 const args = try std.process.argsAlloc(arena);15 const args = try std.process.argsAlloc(arena);
16 const path_to_walk = args[1];16 const path_to_walk = args[1];
tools/update_clang_options.zig+1-6
...@@ -450,13 +450,8 @@ const cpu_targets = struct {...@@ -450,13 +450,8 @@ const cpu_targets = struct {
450pub fn main() anyerror!void {450pub fn main() anyerror!void {
451 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);451 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
452 defer arena.deinit();452 defer arena.deinit();
453<<<<<<< HEAD
454 const allocator = &arena.allocator;
455453
456=======454 const allocator = arena.allocator();
457
458 const allocator = arena.getAllocator();
459>>>>>>> 11157e318 (allocgate: stage 1 and 2 building)
460 const args = try std.process.argsAlloc(allocator);455 const args = try std.process.argsAlloc(allocator);
461456
462 if (args.len <= 1) {457 if (args.len <= 1) {
tools/update_cpu_features.zig+2-2
...@@ -769,7 +769,7 @@ const llvm_targets = [_]LlvmTarget{...@@ -769,7 +769,7 @@ const llvm_targets = [_]LlvmTarget{
769pub fn main() anyerror!void {769pub fn main() anyerror!void {
770 var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);770 var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
771 defer arena_state.deinit();771 defer arena_state.deinit();
772 const arena = arena_state.getAllocator();772 const arena = arena_state.allocator();
773773
774 const args = try std.process.argsAlloc(arena);774 const args = try std.process.argsAlloc(arena);
775 if (args.len <= 1) {775 if (args.len <= 1) {
...@@ -845,7 +845,7 @@ fn processOneTarget(job: Job) anyerror!void {...@@ -845,7 +845,7 @@ fn processOneTarget(job: Job) anyerror!void {
845845
846 var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);846 var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
847 defer arena_state.deinit();847 defer arena_state.deinit();
848 const arena = arena_state.getAllocator();848 const arena = arena_state.allocator();
849849
850 var progress_node = job.root_progress.start(llvm_target.zig_name, 3);850 var progress_node = job.root_progress.start(llvm_target.zig_name, 3);
851 progress_node.activate();851 progress_node.activate();
tools/update_glibc.zig+1-1
...@@ -133,7 +133,7 @@ const Function = struct {...@@ -133,7 +133,7 @@ const Function = struct {
133133
134pub fn main() !void {134pub fn main() !void {
135 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);135 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
136 const allocator = arena.getAllocator();136 const allocator = arena.allocator();
137 const args = try std.process.argsAlloc(allocator);137 const args = try std.process.argsAlloc(allocator);
138 const in_glibc_dir = args[1]; // path to the unzipped tarball of glibc, e.g. ~/downloads/glibc-2.25138 const in_glibc_dir = args[1]; // path to the unzipped tarball of glibc, e.g. ~/downloads/glibc-2.25
139 const zig_src_dir = args[2]; // path to the source checkout of zig, lib dir, e.g. ~/zig-src/lib139 const zig_src_dir = args[2]; // path to the source checkout of zig, lib dir, e.g. ~/zig-src/lib
tools/update_spirv_features.zig+1-1
...@@ -48,7 +48,7 @@ const Version = struct {...@@ -48,7 +48,7 @@ const Version = struct {
48pub fn main() !void {48pub fn main() !void {
49 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);49 var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
50 defer arena.deinit();50 defer arena.deinit();
51 const allocator = arena.getAllocator();51 const allocator = arena.allocator();
5252
53 const args = try std.process.argsAlloc(allocator);53 const args = try std.process.argsAlloc(allocator);
5454