diff options
Diffstat (limited to 'src')
69 files changed, 572 insertions, 549 deletions
diff --git a/src/Air.zig b/src/Air.zig index 2a6da5a431..0e8a63acb1 100644 --- a/src/Air.zig +++ b/src/Air.zig @@ -841,7 +841,7 @@ pub fn extraData(air: Air, comptime T: type, index: usize) struct { data: T, end }; } -pub fn deinit(air: *Air, gpa: *std.mem.Allocator) void { +pub fn deinit(air: *Air, gpa: std.mem.Allocator) void { air.instructions.deinit(gpa); gpa.free(air.extra); gpa.free(air.values); diff --git a/src/AstGen.zig b/src/AstGen.zig index e677320e03..248a0ff999 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -16,7 +16,7 @@ const indexToRef = Zir.indexToRef; const trace = @import("tracy.zig").trace; const BuiltinFn = @import("BuiltinFn.zig"); -gpa: *Allocator, +gpa: Allocator, tree: *const Ast, instructions: std.MultiArrayList(Zir.Inst) = .{}, extra: ArrayListUnmanaged(u32) = .{}, @@ -33,7 +33,7 @@ source_line: u32 = 0, source_column: u32 = 0, /// Used for temporary allocations; freed after AstGen is complete. /// The resulting ZIR code has no references to anything in this arena. -arena: *Allocator, +arena: Allocator, string_table: std.HashMapUnmanaged(u32, void, StringIndexContext, std.hash_map.default_max_load_percentage) = .{}, compile_errors: ArrayListUnmanaged(Zir.Inst.CompileErrors.Item) = .{}, /// The topmost block of the current function. @@ -92,13 +92,13 @@ fn appendRefsAssumeCapacity(astgen: *AstGen, refs: []const Zir.Inst.Ref) void { astgen.extra.appendSliceAssumeCapacity(coerced); } -pub fn generate(gpa: *Allocator, tree: Ast) Allocator.Error!Zir { +pub fn generate(gpa: Allocator, tree: Ast) Allocator.Error!Zir { var arena = std.heap.ArenaAllocator.init(gpa); defer arena.deinit(); var astgen: AstGen = .{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena.allocator(), .tree = &tree, }; defer astgen.deinit(gpa); @@ -196,7 +196,7 @@ pub fn generate(gpa: *Allocator, tree: Ast) Allocator.Error!Zir { }; } -pub fn deinit(astgen: *AstGen, gpa: *Allocator) void { +pub fn deinit(astgen: *AstGen, gpa: Allocator) void { astgen.instructions.deinit(gpa); astgen.extra.deinit(gpa); astgen.string_table.deinit(gpa); @@ -1939,6 +1939,7 @@ fn blockExprStmts(gz: *GenZir, parent_scope: *Scope, statements: []const Ast.Nod var block_arena = std.heap.ArenaAllocator.init(gz.astgen.gpa); defer block_arena.deinit(); + const block_arena_allocator = block_arena.allocator(); var noreturn_src_node: Ast.Node.Index = 0; var scope = parent_scope; @@ -1959,13 +1960,13 @@ fn blockExprStmts(gz: *GenZir, parent_scope: *Scope, statements: []const Ast.Nod } switch (node_tags[statement]) { // zig fmt: off - .global_var_decl => scope = try varDecl(gz, scope, statement, &block_arena.allocator, tree.globalVarDecl(statement)), - .local_var_decl => scope = try varDecl(gz, scope, statement, &block_arena.allocator, tree.localVarDecl(statement)), - .simple_var_decl => scope = try varDecl(gz, scope, statement, &block_arena.allocator, tree.simpleVarDecl(statement)), - .aligned_var_decl => scope = try varDecl(gz, scope, statement, &block_arena.allocator, tree.alignedVarDecl(statement)), + .global_var_decl => scope = try varDecl(gz, scope, statement, block_arena_allocator, tree.globalVarDecl(statement)), + .local_var_decl => scope = try varDecl(gz, scope, statement, block_arena_allocator, tree.localVarDecl(statement)), + .simple_var_decl => scope = try varDecl(gz, scope, statement, block_arena_allocator, tree.simpleVarDecl(statement)), + .aligned_var_decl => scope = try varDecl(gz, scope, statement, block_arena_allocator, tree.alignedVarDecl(statement)), - .@"defer" => scope = try makeDeferScope(gz.astgen, scope, statement, &block_arena.allocator, .defer_normal), - .@"errdefer" => scope = try makeDeferScope(gz.astgen, scope, statement, &block_arena.allocator, .defer_error), + .@"defer" => scope = try makeDeferScope(gz.astgen, scope, statement, block_arena_allocator, .defer_normal), + .@"errdefer" => scope = try makeDeferScope(gz.astgen, scope, statement, block_arena_allocator, .defer_error), .assign => try assign(gz, scope, statement), @@ -2460,7 +2461,7 @@ fn makeDeferScope( astgen: *AstGen, scope: *Scope, node: Ast.Node.Index, - block_arena: *Allocator, + block_arena: Allocator, scope_tag: Scope.Tag, ) InnerError!*Scope { const tree = astgen.tree; @@ -2486,7 +2487,7 @@ fn varDecl( gz: *GenZir, scope: *Scope, node: Ast.Node.Index, - block_arena: *Allocator, + block_arena: Allocator, var_decl: Ast.full.VarDecl, ) InnerError!*Scope { try emitDbgNode(gz, node); @@ -3030,7 +3031,7 @@ const WipMembers = struct { /// (4 for src_hash + line + name + value + align + link_section + address_space) const max_decl_size = 10; - pub fn init(gpa: *Allocator, payload: *ArrayListUnmanaged(u32), decl_count: u32, field_count: u32, comptime bits_per_field: u32, comptime max_field_size: u32) Allocator.Error!Self { + pub fn init(gpa: Allocator, payload: *ArrayListUnmanaged(u32), decl_count: u32, field_count: u32, comptime bits_per_field: u32, comptime max_field_size: u32) Allocator.Error!Self { const payload_top = @intCast(u32, payload.items.len); const decls_start = payload_top + (decl_count + decls_per_u32 - 1) / decls_per_u32; const field_bits_start = decls_start + decl_count * max_decl_size; @@ -6178,7 +6179,7 @@ fn tunnelThroughClosure( ns: ?*Scope.Namespace, value: Zir.Inst.Ref, token: Ast.TokenIndex, - gpa: *Allocator, + gpa: Allocator, ) !Zir.Inst.Ref { // For trivial values, we don't need a tunnel. // Just return the ref. @@ -8852,7 +8853,7 @@ const Scope = struct { /// ref of the capture for decls in this namespace captures: std.AutoArrayHashMapUnmanaged(Zir.Inst.Index, Zir.Inst.Index) = .{}, - pub fn deinit(self: *Namespace, gpa: *Allocator) void { + pub fn deinit(self: *Namespace, gpa: Allocator) void { self.decls.deinit(gpa); self.captures.deinit(gpa); self.* = undefined; diff --git a/src/Cache.zig b/src/Cache.zig index fe769cb32a..1362f6d816 100644 --- a/src/Cache.zig +++ b/src/Cache.zig @@ -1,4 +1,4 @@ -gpa: *Allocator, +gpa: Allocator, manifest_dir: fs.Dir, hash: HashHelper = .{}, @@ -48,7 +48,7 @@ pub const File = struct { bin_digest: BinDigest, contents: ?[]const u8, - pub fn deinit(self: *File, allocator: *Allocator) void { + pub fn deinit(self: *File, allocator: Allocator) void { if (self.path) |owned_slice| { allocator.free(owned_slice); self.path = null; diff --git a/src/Compilation.zig b/src/Compilation.zig index d1af993cbe..ce7f204dd6 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -36,7 +36,7 @@ const libtsan = @import("libtsan.zig"); const Zir = @import("Zir.zig"); /// General-purpose allocator. Used for both temporary and long-term storage. -gpa: *Allocator, +gpa: Allocator, /// Arena-allocated memory used during initialization. Should be untouched until deinit. arena_state: std.heap.ArenaAllocator.State, bin_file: *link.File, @@ -164,7 +164,7 @@ pub const CRTFile = struct { lock: Cache.Lock, full_object_path: []const u8, - fn deinit(self: *CRTFile, gpa: *Allocator) void { + fn deinit(self: *CRTFile, gpa: Allocator) void { self.lock.release(); gpa.free(self.full_object_path); self.* = undefined; @@ -253,14 +253,14 @@ pub const CObject = struct { line: u32, column: u32, - pub fn destroy(em: *ErrorMsg, gpa: *Allocator) void { + pub fn destroy(em: *ErrorMsg, gpa: Allocator) void { gpa.free(em.msg); gpa.destroy(em); } }; /// Returns if there was failure. - pub fn clearStatus(self: *CObject, gpa: *Allocator) bool { + pub fn clearStatus(self: *CObject, gpa: Allocator) bool { switch (self.status) { .new => return false, .failure, .failure_retryable => { @@ -276,7 +276,7 @@ pub const CObject = struct { } } - pub fn destroy(self: *CObject, gpa: *Allocator) void { + pub fn destroy(self: *CObject, gpa: Allocator) void { _ = self.clearStatus(gpa); gpa.destroy(self); } @@ -305,7 +305,7 @@ pub const MiscError = struct { msg: []u8, children: ?AllErrors = null, - pub fn deinit(misc_err: *MiscError, gpa: *Allocator) void { + pub fn deinit(misc_err: *MiscError, gpa: Allocator) void { gpa.free(misc_err.msg); if (misc_err.children) |*children| { children.deinit(gpa); @@ -402,7 +402,7 @@ pub const AllErrors = struct { } }; - pub fn deinit(self: *AllErrors, gpa: *Allocator) void { + pub fn deinit(self: *AllErrors, gpa: Allocator) void { self.arena.promote(gpa).deinit(); } @@ -412,28 +412,29 @@ pub const AllErrors = struct { errors: *std.ArrayList(Message), module_err_msg: Module.ErrorMsg, ) !void { - const notes = try arena.allocator.alloc(Message, module_err_msg.notes.len); + const allocator = arena.allocator(); + const notes = try allocator.alloc(Message, module_err_msg.notes.len); for (notes) |*note, i| { const module_note = module_err_msg.notes[i]; const source = try module_note.src_loc.file_scope.getSource(module.gpa); const byte_offset = try module_note.src_loc.byteOffset(module.gpa); const loc = std.zig.findLineColumn(source, byte_offset); - const file_path = try module_note.src_loc.file_scope.fullPath(&arena.allocator); + const file_path = try module_note.src_loc.file_scope.fullPath(allocator); note.* = .{ .src = .{ .src_path = file_path, - .msg = try arena.allocator.dupe(u8, module_note.msg), + .msg = try allocator.dupe(u8, module_note.msg), .byte_offset = byte_offset, .line = @intCast(u32, loc.line), .column = @intCast(u32, loc.column), - .source_line = try arena.allocator.dupe(u8, loc.source_line), + .source_line = try allocator.dupe(u8, loc.source_line), }, }; } if (module_err_msg.src_loc.lazy == .entire_file) { try errors.append(.{ .plain = .{ - .msg = try arena.allocator.dupe(u8, module_err_msg.msg), + .msg = try allocator.dupe(u8, module_err_msg.msg), }, }); return; @@ -441,22 +442,22 @@ pub const AllErrors = struct { const source = try module_err_msg.src_loc.file_scope.getSource(module.gpa); const byte_offset = try module_err_msg.src_loc.byteOffset(module.gpa); const loc = std.zig.findLineColumn(source, byte_offset); - const file_path = try module_err_msg.src_loc.file_scope.fullPath(&arena.allocator); + const file_path = try module_err_msg.src_loc.file_scope.fullPath(allocator); try errors.append(.{ .src = .{ .src_path = file_path, - .msg = try arena.allocator.dupe(u8, module_err_msg.msg), + .msg = try allocator.dupe(u8, module_err_msg.msg), .byte_offset = byte_offset, .line = @intCast(u32, loc.line), .column = @intCast(u32, loc.column), .notes = notes, - .source_line = try arena.allocator.dupe(u8, loc.source_line), + .source_line = try allocator.dupe(u8, loc.source_line), }, }); } pub fn addZir( - arena: *Allocator, + arena: Allocator, errors: *std.ArrayList(Message), file: *Module.File, ) !void { @@ -548,18 +549,19 @@ pub const AllErrors = struct { msg: []const u8, optional_children: ?AllErrors, ) !void { - const duped_msg = try arena.allocator.dupe(u8, msg); + const allocator = arena.allocator(); + const duped_msg = try allocator.dupe(u8, msg); if (optional_children) |*children| { try errors.append(.{ .plain = .{ .msg = duped_msg, - .notes = try dupeList(children.list, &arena.allocator), + .notes = try dupeList(children.list, allocator), } }); } else { try errors.append(.{ .plain = .{ .msg = duped_msg } }); } } - fn dupeList(list: []const Message, arena: *Allocator) Allocator.Error![]Message { + fn dupeList(list: []const Message, arena: Allocator) Allocator.Error![]Message { const duped_list = try arena.alloc(Message, list.len); for (list) |item, i| { duped_list[i] = switch (item) { @@ -589,7 +591,7 @@ pub const Directory = struct { path: ?[]const u8, handle: std.fs.Dir, - pub fn join(self: Directory, allocator: *Allocator, paths: []const []const u8) ![]u8 { + pub fn join(self: Directory, allocator: Allocator, paths: []const []const u8) ![]u8 { if (self.path) |p| { // TODO clean way to do this with only 1 allocation const part2 = try std.fs.path.join(allocator, paths); @@ -600,7 +602,7 @@ pub const Directory = struct { } } - pub fn joinZ(self: Directory, allocator: *Allocator, paths: []const []const u8) ![:0]u8 { + pub fn joinZ(self: Directory, allocator: Allocator, paths: []const []const u8) ![:0]u8 { if (self.path) |p| { // TODO clean way to do this with only 1 allocation const part2 = try std.fs.path.join(allocator, paths); @@ -786,7 +788,7 @@ fn addPackageTableToCacheHash( seen_table: *std.AutoHashMap(*Package, void), hash_type: union(enum) { path_bytes, files: *Cache.Manifest }, ) (error{OutOfMemory} || std.os.GetCwdError)!void { - const allocator = &arena.allocator; + const allocator = arena.allocator(); const packages = try allocator.alloc(Package.Table.KV, pkg_table.count()); { @@ -829,7 +831,7 @@ fn addPackageTableToCacheHash( } } -pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { +pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { const is_dyn_lib = switch (options.output_mode) { .Obj, .Exe => false, .Lib => (options.link_mode orelse .Static) == .Dynamic, @@ -850,7 +852,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { // initialization and then is freed in deinit(). var arena_allocator = std.heap.ArenaAllocator.init(gpa); errdefer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); // We put the `Compilation` itself in the arena. Freeing the arena will free the module. // It's initialized later after we prepare the initialization options. @@ -1212,7 +1214,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { { var local_arena = std.heap.ArenaAllocator.init(gpa); defer local_arena.deinit(); - var seen_table = std.AutoHashMap(*Package, void).init(&local_arena.allocator); + var seen_table = std.AutoHashMap(*Package, void).init(local_arena.allocator()); try addPackageTableToCacheHash(&hash, &local_arena, main_pkg.table, &seen_table, .path_bytes); } hash.add(valgrind); @@ -2015,6 +2017,7 @@ pub fn totalErrorCount(self: *Compilation) usize { pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors { var arena = std.heap.ArenaAllocator.init(self.gpa); errdefer arena.deinit(); + const arena_allocator = arena.allocator(); var errors = std.ArrayList(AllErrors.Message).init(self.gpa); defer errors.deinit(); @@ -2028,8 +2031,8 @@ pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors { // C error reporting bubbling up. try errors.append(.{ .src = .{ - .src_path = try arena.allocator.dupe(u8, c_object.src.src_path), - .msg = try std.fmt.allocPrint(&arena.allocator, "unable to build C object: {s}", .{ + .src_path = try arena_allocator.dupe(u8, c_object.src.src_path), + .msg = try std.fmt.allocPrint(arena_allocator, "unable to build C object: {s}", .{ err_msg.msg, }), .byte_offset = 0, @@ -2054,7 +2057,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors { // must have completed successfully. const tree = try entry.key_ptr.*.getTree(module.gpa); assert(tree.errors.len == 0); - try AllErrors.addZir(&arena.allocator, &errors, entry.key_ptr.*); + try AllErrors.addZir(arena_allocator, &errors, entry.key_ptr.*); } } } @@ -2093,7 +2096,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors { if (errors.items.len == 0 and self.link_error_flags.no_entry_point_found) { try errors.append(.{ .plain = .{ - .msg = try std.fmt.allocPrint(&arena.allocator, "no entry point found", .{}), + .msg = try std.fmt.allocPrint(arena_allocator, "no entry point found", .{}), }, }); } @@ -2125,7 +2128,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors { assert(errors.items.len == self.totalErrorCount()); return AllErrors{ - .list = try arena.allocator.dupe(AllErrors.Message, errors.items), + .list = try arena_allocator.dupe(AllErrors.Message, errors.items), .arena = arena.state, }; } @@ -2296,7 +2299,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress var tmp_arena = std.heap.ArenaAllocator.init(gpa); defer tmp_arena.deinit(); - const sema_arena = &tmp_arena.allocator; + const sema_arena = tmp_arena.allocator(); const sema_frame = tracy.namedFrame("sema"); var sema_frame_ended = false; @@ -2391,7 +2394,7 @@ fn processOneJob(comp: *Compilation, job: Job, main_progress_node: *std.Progress .decl = decl, .fwd_decl = fwd_decl.toManaged(gpa), .typedefs = c_codegen.TypedefMap.init(gpa), - .typedefs_arena = &typedefs_arena.allocator, + .typedefs_arena = typedefs_arena.allocator(), }; defer dg.fwd_decl.deinit(); defer dg.typedefs.deinit(); @@ -2845,7 +2848,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult { const digest = if (!actual_hit) digest: { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const tmp_digest = man.hash.peek(); const tmp_dir_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &tmp_digest }); @@ -3100,7 +3103,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const c_source_basename = std.fs.path.basename(c_object.src.src_path); @@ -3267,7 +3270,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P }; } -pub fn tmpFilePath(comp: *Compilation, arena: *Allocator, suffix: []const u8) error{OutOfMemory}![]const u8 { +pub fn tmpFilePath(comp: *Compilation, arena: Allocator, suffix: []const u8) error{OutOfMemory}![]const u8 { const s = std.fs.path.sep_str; const rand_int = std.crypto.random.int(u64); if (comp.local_cache_directory.path) |p| { @@ -3279,7 +3282,7 @@ pub fn tmpFilePath(comp: *Compilation, arena: *Allocator, suffix: []const u8) er pub fn addTranslateCCArgs( comp: *Compilation, - arena: *Allocator, + arena: Allocator, argv: *std.ArrayList([]const u8), ext: FileExt, out_dep_path: ?[]const u8, @@ -3293,7 +3296,7 @@ pub fn addTranslateCCArgs( /// Add common C compiler args between translate-c and C object compilation. pub fn addCCArgs( comp: *const Compilation, - arena: *Allocator, + arena: Allocator, argv: *std.ArrayList([]const u8), ext: FileExt, out_dep_path: ?[]const u8, @@ -3780,7 +3783,7 @@ const LibCDirs = struct { libc_installation: ?*const LibCInstallation, }; -fn getZigShippedLibCIncludeDirsDarwin(arena: *Allocator, zig_lib_dir: []const u8, target: Target) !LibCDirs { +fn getZigShippedLibCIncludeDirsDarwin(arena: Allocator, zig_lib_dir: []const u8, target: Target) !LibCDirs { const arch_name = @tagName(target.cpu.arch); const os_name = try std.fmt.allocPrint(arena, "{s}.{d}", .{ @tagName(target.os.tag), @@ -3812,7 +3815,7 @@ fn getZigShippedLibCIncludeDirsDarwin(arena: *Allocator, zig_lib_dir: []const u8 } fn detectLibCIncludeDirs( - arena: *Allocator, + arena: Allocator, zig_lib_dir: []const u8, target: Target, is_native_abi: bool, @@ -3937,7 +3940,7 @@ fn detectLibCIncludeDirs( }; } -fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const LibCInstallation) !LibCDirs { +fn detectLibCFromLibCInstallation(arena: Allocator, target: Target, lci: *const LibCInstallation) !LibCDirs { var list = try std.ArrayList([]const u8).initCapacity(arena, 4); list.appendAssumeCapacity(lci.include_dir.?); @@ -3969,7 +3972,7 @@ fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const }; } -pub fn get_libc_crt_file(comp: *Compilation, arena: *Allocator, basename: []const u8) ![]const u8 { +pub fn get_libc_crt_file(comp: *Compilation, arena: Allocator, basename: []const u8) ![]const u8 { if (comp.wantBuildGLibCFromSource() or comp.wantBuildMuslFromSource() or comp.wantBuildMinGWFromSource() or @@ -4070,7 +4073,7 @@ pub fn dump_argv(argv: []const []const u8) void { std.debug.print("{s}\n", .{argv[argv.len - 1]}); } -pub fn generateBuiltinZigSource(comp: *Compilation, allocator: *Allocator) Allocator.Error![]u8 { +pub fn generateBuiltinZigSource(comp: *Compilation, allocator: Allocator) Allocator.Error![]u8 { const t = trace(@src()); defer t.end(); @@ -4421,7 +4424,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); // Here we use the legacy stage1 C++ compiler to compile Zig code. const mod = comp.bin_file.options.module.?; @@ -4458,7 +4461,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node _ = try man.addFile(main_zig_file, null); { - var seen_table = std.AutoHashMap(*Package, void).init(&arena_allocator.allocator); + var seen_table = std.AutoHashMap(*Package, void).init(arena_allocator.allocator()); try addPackageTableToCacheHash(&man.hash, &arena_allocator, mod.main_pkg.table, &seen_table, .{ .files = &man }); } man.hash.add(comp.bin_file.options.valgrind); @@ -4721,14 +4724,14 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node comp.stage1_lock = man.toOwnedLock(); } -fn stage1LocPath(arena: *Allocator, opt_loc: ?EmitLoc, cache_directory: Directory) ![]const u8 { +fn stage1LocPath(arena: Allocator, opt_loc: ?EmitLoc, cache_directory: Directory) ![]const u8 { const loc = opt_loc orelse return ""; const directory = loc.directory orelse cache_directory; return directory.join(arena, &[_][]const u8{loc.basename}); } fn createStage1Pkg( - arena: *Allocator, + arena: Allocator, name: []const u8, pkg: *Package, parent_pkg: ?*stage1.Pkg, diff --git a/src/DepTokenizer.zig b/src/DepTokenizer.zig index 0fd26532f0..09712baa99 100644 --- a/src/DepTokenizer.zig +++ b/src/DepTokenizer.zig @@ -878,7 +878,7 @@ test "error prereq - continuation expecting end-of-line" { // - tokenize input, emit textual representation, and compare to expect fn depTokenizer(input: []const u8, expect: []const u8) !void { var arena_allocator = std.heap.ArenaAllocator.init(std.testing.allocator); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); defer arena_allocator.deinit(); var it: Tokenizer = .{ .bytes = input }; diff --git a/src/Liveness.zig b/src/Liveness.zig index 24e4a16b1c..f090329d5a 100644 --- a/src/Liveness.zig +++ b/src/Liveness.zig @@ -51,7 +51,7 @@ pub const SwitchBr = struct { else_death_count: u32, }; -pub fn analyze(gpa: *Allocator, air: Air, zir: Zir) Allocator.Error!Liveness { +pub fn analyze(gpa: Allocator, air: Air, zir: Zir) Allocator.Error!Liveness { const tracy = trace(@src()); defer tracy.end(); @@ -136,7 +136,7 @@ pub fn getCondBr(l: Liveness, inst: Air.Inst.Index) CondBrSlices { }; } -pub fn deinit(l: *Liveness, gpa: *Allocator) void { +pub fn deinit(l: *Liveness, gpa: Allocator) void { gpa.free(l.tomb_bits); gpa.free(l.extra); l.special.deinit(gpa); @@ -150,7 +150,7 @@ pub const OperandInt = std.math.Log2Int(Bpi); /// In-progress data; on successful analysis converted into `Liveness`. const Analysis = struct { - gpa: *Allocator, + gpa: Allocator, air: Air, table: std.AutoHashMapUnmanaged(Air.Inst.Index, void), tomb_bits: []usize, diff --git a/src/Module.zig b/src/Module.zig index 805d02b650..0e5e3690bd 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -30,7 +30,7 @@ const target_util = @import("target.zig"); const build_options = @import("build_options"); /// General-purpose allocator. Used for both temporary and long-term storage. -gpa: *Allocator, +gpa: Allocator, comp: *Compilation, /// Where our incremental compilation metadata serialization will go. @@ -299,10 +299,10 @@ pub const CaptureScope = struct { pub const WipCaptureScope = struct { scope: *CaptureScope, finalized: bool, - gpa: *Allocator, - perm_arena: *Allocator, + gpa: Allocator, + perm_arena: Allocator, - pub fn init(gpa: *Allocator, perm_arena: *Allocator, parent: ?*CaptureScope) !@This() { + pub fn init(gpa: Allocator, perm_arena: Allocator, parent: ?*CaptureScope) !@This() { const scope = try perm_arena.create(CaptureScope); scope.* = .{ .parent = parent }; return @This(){ @@ -469,7 +469,7 @@ pub const Decl = struct { pub const DepsTable = std.AutoArrayHashMapUnmanaged(*Decl, void); - pub fn clearName(decl: *Decl, gpa: *Allocator) void { + pub fn clearName(decl: *Decl, gpa: Allocator) void { gpa.free(mem.sliceTo(decl.name, 0)); decl.name = undefined; } @@ -499,7 +499,7 @@ pub const Decl = struct { } } - pub fn clearValues(decl: *Decl, gpa: *Allocator) void { + pub fn clearValues(decl: *Decl, gpa: Allocator) void { if (decl.getFunction()) |func| { func.deinit(gpa); gpa.destroy(func); @@ -517,7 +517,7 @@ pub const Decl = struct { pub fn finalizeNewArena(decl: *Decl, arena: *std.heap.ArenaAllocator) !void { assert(decl.value_arena == null); - const arena_state = try arena.allocator.create(std.heap.ArenaAllocator.State); + const arena_state = try arena.allocator().create(std.heap.ArenaAllocator.State); arena_state.* = arena.state; decl.value_arena = arena_state; } @@ -636,7 +636,7 @@ pub const Decl = struct { return decl.src_namespace.renderFullyQualifiedDebugName(unqualified_name, writer); } - pub fn getFullyQualifiedName(decl: Decl, gpa: *Allocator) ![:0]u8 { + pub fn getFullyQualifiedName(decl: Decl, gpa: Allocator) ![:0]u8 { var buffer = std.ArrayList(u8).init(gpa); defer buffer.deinit(); try decl.renderFullyQualifiedName(buffer.writer()); @@ -855,7 +855,7 @@ pub const Struct = struct { is_comptime: bool, }; - pub fn getFullyQualifiedName(s: *Struct, gpa: *Allocator) ![:0]u8 { + pub fn getFullyQualifiedName(s: *Struct, gpa: Allocator) ![:0]u8 { return s.owner_decl.getFullyQualifiedName(gpa); } @@ -999,7 +999,7 @@ pub const Union = struct { pub const Fields = std.StringArrayHashMapUnmanaged(Field); - pub fn getFullyQualifiedName(s: *Union, gpa: *Allocator) ![:0]u8 { + pub fn getFullyQualifiedName(s: *Union, gpa: Allocator) ![:0]u8 { return s.owner_decl.getFullyQualifiedName(gpa); } @@ -1178,7 +1178,7 @@ pub const Opaque = struct { }; } - pub fn getFullyQualifiedName(s: *Opaque, gpa: *Allocator) ![:0]u8 { + pub fn getFullyQualifiedName(s: *Opaque, gpa: Allocator) ![:0]u8 { return s.owner_decl.getFullyQualifiedName(gpa); } }; @@ -1225,7 +1225,7 @@ pub const Fn = struct { success, }; - pub fn deinit(func: *Fn, gpa: *Allocator) void { + pub fn deinit(func: *Fn, gpa: Allocator) void { if (func.getInferredErrorSet()) |map| { map.deinit(gpa); } @@ -1422,27 +1422,27 @@ pub const File = struct { /// successful, this field is unloaded. prev_zir: ?*Zir = null, - pub fn unload(file: *File, gpa: *Allocator) void { + pub fn unload(file: *File, gpa: Allocator) void { file.unloadTree(gpa); file.unloadSource(gpa); file.unloadZir(gpa); } - pub fn unloadTree(file: *File, gpa: *Allocator) void { + pub fn unloadTree(file: *File, gpa: Allocator) void { if (file.tree_loaded) { file.tree_loaded = false; file.tree.deinit(gpa); } } - pub fn unloadSource(file: *File, gpa: *Allocator) void { + pub fn unloadSource(file: *File, gpa: Allocator) void { if (file.source_loaded) { file.source_loaded = false; gpa.free(file.source); } } - pub fn unloadZir(file: *File, gpa: *Allocator) void { + pub fn unloadZir(file: *File, gpa: Allocator) void { if (file.zir_loaded) { file.zir_loaded = false; file.zir.deinit(gpa); @@ -1466,7 +1466,7 @@ pub const File = struct { file.* = undefined; } - pub fn getSource(file: *File, gpa: *Allocator) ![:0]const u8 { + pub fn getSource(file: *File, gpa: Allocator) ![:0]const u8 { if (file.source_loaded) return file.source; const root_dir_path = file.pkg.root_src_directory.path orelse "."; @@ -1499,7 +1499,7 @@ pub const File = struct { return source; } - pub fn getTree(file: *File, gpa: *Allocator) !*const Ast { + pub fn getTree(file: *File, gpa: Allocator) !*const Ast { if (file.tree_loaded) return &file.tree; const source = try file.getSource(gpa); @@ -1531,7 +1531,7 @@ pub const File = struct { }; } - pub fn fullyQualifiedNameZ(file: File, gpa: *Allocator) ![:0]u8 { + pub fn fullyQualifiedNameZ(file: File, gpa: Allocator) ![:0]u8 { var buf = std.ArrayList(u8).init(gpa); defer buf.deinit(); try file.renderFullyQualifiedName(buf.writer()); @@ -1539,7 +1539,7 @@ pub const File = struct { } /// Returns the full path to this file relative to its package. - pub fn fullPath(file: File, ally: *Allocator) ![]u8 { + pub fn fullPath(file: File, ally: Allocator) ![]u8 { return file.pkg.root_src_directory.join(ally, &[_][]const u8{file.sub_file_path}); } @@ -1594,7 +1594,7 @@ pub const ErrorMsg = struct { notes: []ErrorMsg = &.{}, pub fn create( - gpa: *Allocator, + gpa: Allocator, src_loc: SrcLoc, comptime format: []const u8, args: anytype, @@ -1607,13 +1607,13 @@ pub const ErrorMsg = struct { /// Assumes the ErrorMsg struct and msg were both allocated with `gpa`, /// as well as all notes. - pub fn destroy(err_msg: *ErrorMsg, gpa: *Allocator) void { + pub fn destroy(err_msg: *ErrorMsg, gpa: Allocator) void { err_msg.deinit(gpa); gpa.destroy(err_msg); } pub fn init( - gpa: *Allocator, + gpa: Allocator, src_loc: SrcLoc, comptime format: []const u8, args: anytype, @@ -1624,7 +1624,7 @@ pub const ErrorMsg = struct { }; } - pub fn deinit(err_msg: *ErrorMsg, gpa: *Allocator) void { + pub fn deinit(err_msg: *ErrorMsg, gpa: Allocator) void { for (err_msg.notes) |*note| { note.deinit(gpa); } @@ -1651,7 +1651,7 @@ pub const SrcLoc = struct { return @bitCast(Ast.Node.Index, offset + @bitCast(i32, src_loc.parent_decl_node)); } - pub fn byteOffset(src_loc: SrcLoc, gpa: *Allocator) !u32 { + pub fn byteOffset(src_loc: SrcLoc, gpa: Allocator) !u32 { switch (src_loc.lazy) { .unneeded => unreachable, .entire_file => return 0, @@ -2066,7 +2066,7 @@ pub const SrcLoc = struct { pub fn byteOffsetBuiltinCallArg( src_loc: SrcLoc, - gpa: *Allocator, + gpa: Allocator, node_off: i32, arg_index: u32, ) !u32 { @@ -2464,7 +2464,7 @@ pub fn deinit(mod: *Module) void { } } -fn freeExportList(gpa: *Allocator, export_list: []*Export) void { +fn freeExportList(gpa: Allocator, export_list: []*Export) void { for (export_list) |exp| { gpa.free(exp.options.name); if (exp.options.section) |s| gpa.free(s); @@ -2871,7 +2871,7 @@ pub fn astGenFile(mod: *Module, file: *File) !void { /// * Decl.zir_index /// * Fn.zir_body_inst /// * Decl.zir_decl_index -fn updateZirRefs(gpa: *Allocator, file: *File, old_zir: Zir) !void { +fn updateZirRefs(gpa: Allocator, file: *File, old_zir: Zir) !void { const new_zir = file.zir; // Maps from old ZIR to new ZIR, struct_decl, enum_decl, etc. Any instruction which @@ -2965,7 +2965,7 @@ fn updateZirRefs(gpa: *Allocator, file: *File, old_zir: Zir) !void { } pub fn mapOldZirToNew( - gpa: *Allocator, + gpa: Allocator, old_zir: Zir, new_zir: Zir, inst_map: *std.AutoHashMapUnmanaged(Zir.Inst.Index, Zir.Inst.Index), @@ -3159,10 +3159,11 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void { const gpa = mod.gpa; var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const struct_obj = try new_decl_arena.allocator.create(Module.Struct); - const struct_ty = try Type.Tag.@"struct".create(&new_decl_arena.allocator, struct_obj); - const struct_val = try Value.Tag.ty.create(&new_decl_arena.allocator, struct_ty); + const struct_obj = try new_decl_arena_allocator.create(Module.Struct); + const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj); + const struct_val = try Value.Tag.ty.create(new_decl_arena_allocator, struct_ty); const ty_ty = comptime Type.initTag(.type); struct_obj.* = .{ .owner_decl = undefined, // set below @@ -3202,12 +3203,13 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void { var sema_arena = std.heap.ArenaAllocator.init(gpa); defer sema_arena.deinit(); + const sema_arena_allocator = sema_arena.allocator(); var sema: Sema = .{ .mod = mod, .gpa = gpa, - .arena = &sema_arena.allocator, - .perm_arena = &new_decl_arena.allocator, + .arena = sema_arena_allocator, + .perm_arena = new_decl_arena_allocator, .code = file.zir, .owner_decl = new_decl, .func = null, @@ -3216,7 +3218,7 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void { }; defer sema.deinit(); - var wip_captures = try WipCaptureScope.init(gpa, &new_decl_arena.allocator, null); + var wip_captures = try WipCaptureScope.init(gpa, new_decl_arena_allocator, null); defer wip_captures.deinit(); var block_scope: Sema.Block = .{ @@ -3265,15 +3267,17 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { // We need the memory for the Type to go into the arena for the Decl var decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer decl_arena.deinit(); + const decl_arena_allocator = decl_arena.allocator(); var analysis_arena = std.heap.ArenaAllocator.init(gpa); defer analysis_arena.deinit(); + const analysis_arena_allocator = analysis_arena.allocator(); var sema: Sema = .{ .mod = mod, .gpa = gpa, - .arena = &analysis_arena.allocator, - .perm_arena = &decl_arena.allocator, + .arena = analysis_arena_allocator, + .perm_arena = decl_arena_allocator, .code = zir, .owner_decl = decl, .func = null, @@ -3296,7 +3300,7 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { } log.debug("semaDecl {*} ({s})", .{ decl, decl.name }); - var wip_captures = try WipCaptureScope.init(gpa, &decl_arena.allocator, decl.src_scope); + var wip_captures = try WipCaptureScope.init(gpa, decl_arena_allocator, decl.src_scope); defer wip_captures.deinit(); var block_scope: Sema.Block = .{ @@ -3356,7 +3360,7 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { // not the struct itself. try sema.resolveTypeLayout(&block_scope, src, decl_tv.ty); - const decl_arena_state = try decl_arena.allocator.create(std.heap.ArenaAllocator.State); + const decl_arena_state = try decl_arena_allocator.create(std.heap.ArenaAllocator.State); if (decl.is_usingnamespace) { const ty_ty = Type.initTag(.type); @@ -3370,7 +3374,7 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { } decl.ty = ty_ty; - decl.val = try Value.Tag.ty.create(&decl_arena.allocator, ty); + decl.val = try Value.Tag.ty.create(decl_arena_allocator, ty); decl.align_val = Value.initTag(.null_value); decl.linksection_val = Value.initTag(.null_value); decl.has_tv = true; @@ -3400,10 +3404,10 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { decl.clearValues(gpa); } - decl.ty = try decl_tv.ty.copy(&decl_arena.allocator); - decl.val = try decl_tv.val.copy(&decl_arena.allocator); - decl.align_val = try align_val.copy(&decl_arena.allocator); - decl.linksection_val = try linksection_val.copy(&decl_arena.allocator); + decl.ty = try decl_tv.ty.copy(decl_arena_allocator); + decl.val = try decl_tv.val.copy(decl_arena_allocator); + decl.align_val = try align_val.copy(decl_arena_allocator); + decl.linksection_val = try linksection_val.copy(decl_arena_allocator); decl.@"addrspace" = address_space; decl.has_tv = true; decl.owns_tv = owns_tv; @@ -3453,7 +3457,7 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { decl.owns_tv = true; queue_linker_work = true; - const copied_init = try variable.init.copy(&decl_arena.allocator); + const copied_init = try variable.init.copy(decl_arena_allocator); variable.init = copied_init; } }, @@ -3476,10 +3480,10 @@ fn semaDecl(mod: *Module, decl: *Decl) !bool { }, } - decl.ty = try decl_tv.ty.copy(&decl_arena.allocator); - decl.val = try decl_tv.val.copy(&decl_arena.allocator); - decl.align_val = try align_val.copy(&decl_arena.allocator); - decl.linksection_val = try linksection_val.copy(&decl_arena.allocator); + decl.ty = try decl_tv.ty.copy(decl_arena_allocator); + decl.val = try decl_tv.val.copy(decl_arena_allocator); + decl.align_val = try align_val.copy(decl_arena_allocator); + decl.linksection_val = try linksection_val.copy(decl_arena_allocator); decl.@"addrspace" = address_space; decl.has_tv = true; decl_arena_state.* = decl_arena.state; @@ -4119,7 +4123,7 @@ fn deleteDeclExports(mod: *Module, decl: *Decl) void { mod.gpa.free(kv.value); } -pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: *Allocator) SemaError!Air { +pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: Allocator) SemaError!Air { const tracy = trace(@src()); defer tracy.end(); @@ -4128,12 +4132,13 @@ pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: *Allocator) Se // Use the Decl's arena for captured values. var decl_arena = decl.value_arena.?.promote(gpa); defer decl.value_arena.?.* = decl_arena.state; + const decl_arena_allocator = decl_arena.allocator(); var sema: Sema = .{ .mod = mod, .gpa = gpa, .arena = arena, - .perm_arena = &decl_arena.allocator, + .perm_arena = decl_arena_allocator, .code = decl.getFileScope().zir, .owner_decl = decl, .func = func, @@ -4147,7 +4152,7 @@ pub fn analyzeFnBody(mod: *Module, decl: *Decl, func: *Fn, arena: *Allocator) Se try sema.air_extra.ensureTotalCapacity(gpa, reserved_count); sema.air_extra.items.len += reserved_count; - var wip_captures = try WipCaptureScope.init(gpa, &decl_arena.allocator, decl.src_scope); + var wip_captures = try WipCaptureScope.init(gpa, decl_arena_allocator, decl.src_scope); defer wip_captures.deinit(); var inner_block: Sema.Block = .{ @@ -4427,7 +4432,7 @@ pub fn getNextAnonNameIndex(mod: *Module) usize { return @atomicRmw(usize, &mod.next_anon_name_index, .Add, 1, .Monotonic); } -pub fn makeIntType(arena: *Allocator, signedness: std.builtin.Signedness, bits: u16) !Type { +pub fn makeIntType(arena: Allocator, signedness: std.builtin.Signedness, bits: u16) !Type { const int_payload = try arena.create(Type.Payload.Bits); int_payload.* = .{ .base = .{ @@ -4459,7 +4464,7 @@ pub fn errNoteNonLazy( } pub fn errorUnionType( - arena: *Allocator, + arena: Allocator, error_set: Type, payload: Type, ) Allocator.Error!Type { @@ -4511,7 +4516,7 @@ pub const SwitchProngSrc = union(enum) { /// the LazySrcLoc in order to emit a compile error. pub fn resolve( prong_src: SwitchProngSrc, - gpa: *Allocator, + gpa: Allocator, decl: *Decl, switch_node_offset: i32, range_expand: RangeExpand, @@ -4605,7 +4610,7 @@ pub const PeerTypeCandidateSrc = union(enum) { pub fn resolve( self: PeerTypeCandidateSrc, - gpa: *Allocator, + gpa: Allocator, decl: *Decl, candidate_i: usize, ) ?LazySrcLoc { @@ -4751,7 +4756,7 @@ pub fn populateTestFunctions(mod: *Module) !void { // decl reference it as a slice. var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); - const arena = &new_decl_arena.allocator; + const arena = new_decl_arena.allocator(); const test_fn_vals = try arena.alloc(Value, mod.test_functions.count()); const array_decl = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, null, .{ @@ -4770,10 +4775,10 @@ pub fn populateTestFunctions(mod: *Module) !void { const test_name_decl = n: { var name_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer name_decl_arena.deinit(); - const bytes = try name_decl_arena.allocator.dupe(u8, test_name_slice); + const bytes = try arena.dupe(u8, test_name_slice); const test_name_decl = try mod.createAnonymousDeclFromDecl(array_decl, array_decl.src_namespace, null, .{ - .ty = try Type.Tag.array_u8.create(&name_decl_arena.allocator, bytes.len), - .val = try Value.Tag.bytes.create(&name_decl_arena.allocator, bytes), + .ty = try Type.Tag.array_u8.create(arena, bytes.len), + .val = try Value.Tag.bytes.create(arena, bytes), }); try test_name_decl.finalizeNewArena(&name_decl_arena); break :n test_name_decl; @@ -4802,7 +4807,7 @@ pub fn populateTestFunctions(mod: *Module) !void { { var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); - const arena = &new_decl_arena.allocator; + const arena = new_decl_arena.allocator(); // This copy accesses the old Decl Type/Value so it must be done before `clearValues`. const new_ty = try Type.Tag.const_slice.create(arena, try tmp_test_fn_ty.copy(arena)); diff --git a/src/Package.zig b/src/Package.zig index 976e92d096..df894280a9 100644 --- a/src/Package.zig +++ b/src/Package.zig @@ -21,7 +21,7 @@ root_src_directory_owned: bool = false, /// Allocate a Package. No references to the slices passed are kept. pub fn create( - gpa: *Allocator, + gpa: Allocator, /// Null indicates the current working directory root_src_dir_path: ?[]const u8, /// Relative to root_src_dir_path @@ -49,7 +49,7 @@ pub fn create( } pub fn createWithDir( - gpa: *Allocator, + gpa: Allocator, directory: Compilation.Directory, /// Relative to `directory`. If null, means `directory` is the root src dir /// and is owned externally. @@ -87,7 +87,7 @@ pub fn createWithDir( /// Free all memory associated with this package. It does not destroy any packages /// inside its table; the caller is responsible for calling destroy() on them. -pub fn destroy(pkg: *Package, gpa: *Allocator) void { +pub fn destroy(pkg: *Package, gpa: Allocator) void { gpa.free(pkg.root_src_path); if (pkg.root_src_directory_owned) { @@ -104,7 +104,7 @@ pub fn destroy(pkg: *Package, gpa: *Allocator) void { } /// Only frees memory associated with the table. -pub fn deinitTable(pkg: *Package, gpa: *Allocator) void { +pub fn deinitTable(pkg: *Package, gpa: Allocator) void { var it = pkg.table.keyIterator(); while (it.next()) |key| { gpa.free(key.*); @@ -113,13 +113,13 @@ pub fn deinitTable(pkg: *Package, gpa: *Allocator) void { pkg.table.deinit(gpa); } -pub fn add(pkg: *Package, gpa: *Allocator, name: []const u8, package: *Package) !void { +pub fn add(pkg: *Package, gpa: Allocator, name: []const u8, package: *Package) !void { try pkg.table.ensureUnusedCapacity(gpa, 1); const name_dupe = try gpa.dupe(u8, name); pkg.table.putAssumeCapacityNoClobber(name_dupe, package); } -pub fn addAndAdopt(parent: *Package, gpa: *Allocator, name: []const u8, child: *Package) !void { +pub fn addAndAdopt(parent: *Package, gpa: Allocator, name: []const u8, child: *Package) !void { assert(child.parent == null); // make up your mind, who is the parent?? child.parent = parent; return parent.add(gpa, name, child); diff --git a/src/RangeSet.zig b/src/RangeSet.zig index 2a8a55a077..e4d65353a9 100644 --- a/src/RangeSet.zig +++ b/src/RangeSet.zig @@ -13,7 +13,7 @@ pub const Range = struct { src: SwitchProngSrc, }; -pub fn init(allocator: *std.mem.Allocator) RangeSet { +pub fn init(allocator: std.mem.Allocator) RangeSet { return .{ .ranges = std.ArrayList(Range).init(allocator), }; diff --git a/src/Sema.zig b/src/Sema.zig index c88841e0d2..7bf36d9ae0 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -7,13 +7,13 @@ mod: *Module, /// Alias to `mod.gpa`. -gpa: *Allocator, +gpa: Allocator, /// Points to the temporary arena allocator of the Sema. /// This arena will be cleared when the sema is destroyed. -arena: *Allocator, +arena: Allocator, /// Points to the arena allocator for the owner_decl. /// This arena will persist until the decl is invalidated. -perm_arena: *Allocator, +perm_arena: Allocator, code: Zir, air_instructions: std.MultiArrayList(Air.Inst) = .{}, air_extra: std.ArrayListUnmanaged(u32) = .{}, @@ -417,8 +417,8 @@ pub const Block = struct { new_decl_arena: std.heap.ArenaAllocator, finished: bool, - pub fn arena(wad: *WipAnonDecl) *Allocator { - return &wad.new_decl_arena.allocator; + pub fn arena(wad: *WipAnonDecl) Allocator { + return wad.new_decl_arena.allocator(); } pub fn deinit(wad: *WipAnonDecl) void { @@ -1594,10 +1594,11 @@ fn zirStructDecl( var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const struct_obj = try new_decl_arena.allocator.create(Module.Struct); - const struct_ty = try Type.Tag.@"struct".create(&new_decl_arena.allocator, struct_obj); - const struct_val = try Value.Tag.ty.create(&new_decl_arena.allocator, struct_ty); + const struct_obj = try new_decl_arena_allocator.create(Module.Struct); + const struct_ty = try Type.Tag.@"struct".create(new_decl_arena_allocator, struct_obj); + const struct_val = try Value.Tag.ty.create(new_decl_arena_allocator, struct_ty); const type_name = try sema.createTypeName(block, small.name_strategy); const new_decl = try sema.mod.createAnonymousDeclNamed(block, .{ .ty = Type.type, @@ -1698,15 +1699,16 @@ fn zirEnumDecl( var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const enum_obj = try new_decl_arena.allocator.create(Module.EnumFull); - const enum_ty_payload = try new_decl_arena.allocator.create(Type.Payload.EnumFull); + const enum_obj = try new_decl_arena_allocator.create(Module.EnumFull); + const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumFull); enum_ty_payload.* = .{ .base = .{ .tag = if (small.nonexhaustive) .enum_nonexhaustive else .enum_full }, .data = enum_obj, }; const enum_ty = Type.initPayload(&enum_ty_payload.base); - const enum_val = try Value.Tag.ty.create(&new_decl_arena.allocator, enum_ty); + const enum_val = try Value.Tag.ty.create(new_decl_arena_allocator, enum_ty); const type_name = try sema.createTypeName(block, small.name_strategy); const new_decl = try mod.createAnonymousDeclNamed(block, .{ .ty = Type.type, @@ -1790,17 +1792,17 @@ fn zirEnumDecl( break :blk try sema.resolveType(block, src, tag_type_ref); } const bits = std.math.log2_int_ceil(usize, fields_len); - break :blk try Type.Tag.int_unsigned.create(&new_decl_arena.allocator, bits); + break :blk try Type.Tag.int_unsigned.create(new_decl_arena_allocator, bits); }; enum_obj.tag_ty = tag_ty; } - try enum_obj.fields.ensureTotalCapacity(&new_decl_arena.allocator, fields_len); + try enum_obj.fields.ensureTotalCapacity(new_decl_arena_allocator, fields_len); const any_values = for (sema.code.extra[body_end..][0..bit_bags_count]) |bag| { if (bag != 0) break true; } else false; if (any_values) { - try enum_obj.values.ensureTotalCapacityContext(&new_decl_arena.allocator, fields_len, .{ + try enum_obj.values.ensureTotalCapacityContext(new_decl_arena_allocator, fields_len, .{ .ty = enum_obj.tag_ty, }); } @@ -1820,7 +1822,7 @@ fn zirEnumDecl( extra_index += 1; // This string needs to outlive the ZIR code. - const field_name = try new_decl_arena.allocator.dupe(u8, field_name_zir); + const field_name = try new_decl_arena_allocator.dupe(u8, field_name_zir); const gop = enum_obj.fields.getOrPutAssumeCapacity(field_name); if (gop.found_existing) { @@ -1843,12 +1845,12 @@ fn zirEnumDecl( // that points to this default value expression rather than the struct. // But only resolve the source location if we need to emit a compile error. const tag_val = (try sema.resolveInstConst(block, src, tag_val_ref)).val; - const copied_tag_val = try tag_val.copy(&new_decl_arena.allocator); + const copied_tag_val = try tag_val.copy(new_decl_arena_allocator); enum_obj.values.putAssumeCapacityNoClobberContext(copied_tag_val, {}, .{ .ty = enum_obj.tag_ty, }); } else if (any_values) { - const tag_val = try Value.Tag.int_u64.create(&new_decl_arena.allocator, field_i); + const tag_val = try Value.Tag.int_u64.create(new_decl_arena_allocator, field_i); enum_obj.values.putAssumeCapacityNoClobberContext(tag_val, {}, .{ .ty = enum_obj.tag_ty }); } } @@ -1887,16 +1889,17 @@ fn zirUnionDecl( var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const union_obj = try new_decl_arena.allocator.create(Module.Union); + const union_obj = try new_decl_arena_allocator.create(Module.Union); const type_tag: Type.Tag = if (small.has_tag_type or small.auto_enum_tag) .union_tagged else .@"union"; - const union_payload = try new_decl_arena.allocator.create(Type.Payload.Union); + const union_payload = try new_decl_arena_allocator.create(Type.Payload.Union); union_payload.* = .{ .base = .{ .tag = type_tag }, .data = union_obj, }; const union_ty = Type.initPayload(&union_payload.base); - const union_val = try Value.Tag.ty.create(&new_decl_arena.allocator, union_ty); + const union_val = try Value.Tag.ty.create(new_decl_arena_allocator, union_ty); const type_name = try sema.createTypeName(block, small.name_strategy); const new_decl = try sema.mod.createAnonymousDeclNamed(block, .{ .ty = Type.type, @@ -1955,15 +1958,16 @@ fn zirOpaqueDecl( var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const opaque_obj = try new_decl_arena.allocator.create(Module.Opaque); - const opaque_ty_payload = try new_decl_arena.allocator.create(Type.Payload.Opaque); + const opaque_obj = try new_decl_arena_allocator.create(Module.Opaque); + const opaque_ty_payload = try new_decl_arena_allocator.create(Type.Payload.Opaque); opaque_ty_payload.* = .{ .base = .{ .tag = .@"opaque" }, .data = opaque_obj, }; const opaque_ty = Type.initPayload(&opaque_ty_payload.base); - const opaque_val = try Value.Tag.ty.create(&new_decl_arena.allocator, opaque_ty); + const opaque_val = try Value.Tag.ty.create(new_decl_arena_allocator, opaque_ty); const type_name = try sema.createTypeName(block, small.name_strategy); const new_decl = try mod.createAnonymousDeclNamed(block, .{ .ty = Type.type, @@ -2008,10 +2012,11 @@ fn zirErrorSetDecl( var new_decl_arena = std.heap.ArenaAllocator.init(gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const error_set = try new_decl_arena.allocator.create(Module.ErrorSet); - const error_set_ty = try Type.Tag.error_set.create(&new_decl_arena.allocator, error_set); - const error_set_val = try Value.Tag.ty.create(&new_decl_arena.allocator, error_set_ty); + const error_set = try new_decl_arena_allocator.create(Module.ErrorSet); + const error_set_ty = try Type.Tag.error_set.create(new_decl_arena_allocator, error_set); + const error_set_val = try Value.Tag.ty.create(new_decl_arena_allocator, error_set_ty); const type_name = try sema.createTypeName(block, name_strategy); const new_decl = try sema.mod.createAnonymousDeclNamed(block, .{ .ty = Type.type, @@ -2019,9 +2024,9 @@ fn zirErrorSetDecl( }, type_name); new_decl.owns_tv = true; errdefer sema.mod.abortAnonDecl(new_decl); - const names = try new_decl_arena.allocator.alloc([]const u8, fields.len); + const names = try new_decl_arena_allocator.alloc([]const u8, fields.len); for (fields) |str_index, i| { - names[i] = try new_decl_arena.allocator.dupe(u8, sema.code.nullTerminatedString(str_index)); + names[i] = try new_decl_arena_allocator.dupe(u8, sema.code.nullTerminatedString(str_index)); } error_set.* = .{ .owner_decl = new_decl, @@ -3935,7 +3940,7 @@ fn analyzeCall( { var arena_allocator = std.heap.ArenaAllocator.init(gpa); errdefer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); for (memoized_call_key.args) |*arg| { arg.* = try arg.*.copy(arena); @@ -4069,6 +4074,7 @@ fn analyzeCall( var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); // Re-run the block that creates the function, with the comptime parameters // pre-populated inside `inst_map`. This causes `param_comptime` and @@ -4078,13 +4084,13 @@ fn analyzeCall( .mod = mod, .gpa = gpa, .arena = sema.arena, - .perm_arena = &new_decl_arena.allocator, + .perm_arena = new_decl_arena_allocator, .code = fn_zir, .owner_decl = new_decl, .func = null, .fn_ret_ty = Type.void, .owner_func = null, - .comptime_args = try new_decl_arena.allocator.alloc(TypedValue, uncasted_args.len), + .comptime_args = try new_decl_arena_allocator.alloc(TypedValue, uncasted_args.len), .comptime_args_fn_inst = module_fn.zir_body_inst, .preallocated_new_func = new_module_func, }; @@ -4168,7 +4174,7 @@ fn analyzeCall( else => continue, } const arg = child_sema.inst_map.get(inst).?; - const copied_arg_ty = try child_sema.typeOf(arg).copy(&new_decl_arena.allocator); + const copied_arg_ty = try child_sema.typeOf(arg).copy(new_decl_arena_allocator); if (child_sema.resolveMaybeUndefValAllowVariables( &child_block, .unneeded, @@ -4176,7 +4182,7 @@ fn analyzeCall( ) catch unreachable) |arg_val| { child_sema.comptime_args[arg_i] = .{ .ty = copied_arg_ty, - .val = try arg_val.copy(&new_decl_arena.allocator), + .val = try arg_val.copy(new_decl_arena_allocator), }; } else { child_sema.comptime_args[arg_i] = .{ @@ -4191,8 +4197,8 @@ fn analyzeCall( try wip_captures.finalize(); // Populate the Decl ty/val with the function and its type. - new_decl.ty = try child_sema.typeOf(new_func_inst).copy(&new_decl_arena.allocator); - new_decl.val = try Value.Tag.function.create(&new_decl_arena.allocator, new_func); + new_decl.ty = try child_sema.typeOf(new_func_inst).copy(new_decl_arena_allocator); + new_decl.val = try Value.Tag.function.create(new_decl_arena_allocator, new_func); new_decl.analysis = .complete; log.debug("generic function '{s}' instantiated with type {}", .{ @@ -6047,8 +6053,8 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError defer arena.deinit(); const target = sema.mod.getTarget(); - const min_int = try operand_ty.minInt(&arena.allocator, target); - const max_int = try operand_ty.maxInt(&arena.allocator, target); + const min_int = try operand_ty.minInt(arena.allocator(), target); + const max_int = try operand_ty.maxInt(arena.allocator(), target); if (try range_set.spans(min_int, max_int, operand_ty)) { if (special_prong == .@"else") { return sema.fail( @@ -12793,9 +12799,9 @@ const ComptimePtrMutationKit = struct { ty: Type, decl_arena: std.heap.ArenaAllocator = undefined, - fn beginArena(self: *ComptimePtrMutationKit, gpa: *Allocator) *Allocator { + fn beginArena(self: *ComptimePtrMutationKit, gpa: Allocator) Allocator { self.decl_arena = self.decl_ref_mut.decl.value_arena.?.promote(gpa); - return &self.decl_arena.allocator; + return self.decl_arena.allocator(); } fn finishArena(self: *ComptimePtrMutationKit) void { @@ -14287,6 +14293,7 @@ fn semaStructFields( var decl_arena = decl.value_arena.?.promote(gpa); defer decl.value_arena.?.* = decl_arena.state; + const decl_arena_allocator = decl_arena.allocator(); var analysis_arena = std.heap.ArenaAllocator.init(gpa); defer analysis_arena.deinit(); @@ -14294,8 +14301,8 @@ fn semaStructFields( var sema: Sema = .{ .mod = mod, .gpa = gpa, - .arena = &analysis_arena.allocator, - .perm_arena = &decl_arena.allocator, + .arena = analysis_arena.allocator(), + .perm_arena = decl_arena_allocator, .code = zir, .owner_decl = decl, .func = null, @@ -14304,7 +14311,7 @@ fn semaStructFields( }; defer sema.deinit(); - var wip_captures = try WipCaptureScope.init(gpa, &decl_arena.allocator, decl.src_scope); + var wip_captures = try WipCaptureScope.init(gpa, decl_arena_allocator, decl.src_scope); defer wip_captures.deinit(); var block_scope: Block = .{ @@ -14328,7 +14335,7 @@ fn semaStructFields( try wip_captures.finalize(); - try struct_obj.fields.ensureTotalCapacity(&decl_arena.allocator, fields_len); + try struct_obj.fields.ensureTotalCapacity(decl_arena_allocator, fields_len); const bits_per_field = 4; const fields_per_u32 = 32 / bits_per_field; @@ -14359,7 +14366,7 @@ fn semaStructFields( extra_index += 1; // This string needs to outlive the ZIR code. - const field_name = try decl_arena.allocator.dupe(u8, field_name_zir); + const field_name = try decl_arena_allocator.dupe(u8, field_name_zir); const field_ty: Type = if (field_type_ref == .none) Type.initTag(.noreturn) else @@ -14371,7 +14378,7 @@ fn semaStructFields( const gop = struct_obj.fields.getOrPutAssumeCapacity(field_name); assert(!gop.found_existing); gop.value_ptr.* = .{ - .ty = try field_ty.copy(&decl_arena.allocator), + .ty = try field_ty.copy(decl_arena_allocator), .abi_align = Value.initTag(.abi_align_default), .default_val = Value.initTag(.unreachable_value), .is_comptime = is_comptime, @@ -14385,7 +14392,7 @@ fn semaStructFields( // that points to this alignment expression rather than the struct. // But only resolve the source location if we need to emit a compile error. const abi_align_val = (try sema.resolveInstConst(&block_scope, src, align_ref)).val; - gop.value_ptr.abi_align = try abi_align_val.copy(&decl_arena.allocator); + gop.value_ptr.abi_align = try abi_align_val.copy(decl_arena_allocator); } if (has_default) { const default_ref = @intToEnum(Zir.Inst.Ref, zir.extra[extra_index]); @@ -14396,7 +14403,7 @@ fn semaStructFields( // But only resolve the source location if we need to emit a compile error. const default_val = (try sema.resolveMaybeUndefVal(&block_scope, src, default_inst)) orelse return sema.failWithNeededComptime(&block_scope, src); - gop.value_ptr.default_val = try default_val.copy(&decl_arena.allocator); + gop.value_ptr.default_val = try default_val.copy(decl_arena_allocator); } } } @@ -14454,6 +14461,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { var decl_arena = union_obj.owner_decl.value_arena.?.promote(gpa); defer union_obj.owner_decl.value_arena.?.* = decl_arena.state; + const decl_arena_allocator = decl_arena.allocator(); var analysis_arena = std.heap.ArenaAllocator.init(gpa); defer analysis_arena.deinit(); @@ -14461,8 +14469,8 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { var sema: Sema = .{ .mod = mod, .gpa = gpa, - .arena = &analysis_arena.allocator, - .perm_arena = &decl_arena.allocator, + .arena = analysis_arena.allocator(), + .perm_arena = decl_arena_allocator, .code = zir, .owner_decl = decl, .func = null, @@ -14471,7 +14479,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { }; defer sema.deinit(); - var wip_captures = try WipCaptureScope.init(gpa, &decl_arena.allocator, decl.src_scope); + var wip_captures = try WipCaptureScope.init(gpa, decl_arena_allocator, decl.src_scope); defer wip_captures.deinit(); var block_scope: Block = .{ @@ -14495,7 +14503,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { try wip_captures.finalize(); - try union_obj.fields.ensureTotalCapacity(&decl_arena.allocator, fields_len); + try union_obj.fields.ensureTotalCapacity(decl_arena_allocator, fields_len); var int_tag_ty: Type = undefined; var enum_field_names: ?*Module.EnumNumbered.NameMap = null; @@ -14571,7 +14579,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { } // This string needs to outlive the ZIR code. - const field_name = try decl_arena.allocator.dupe(u8, field_name_zir); + const field_name = try decl_arena_allocator.dupe(u8, field_name_zir); if (enum_field_names) |set| { set.putAssumeCapacity(field_name, {}); } @@ -14589,7 +14597,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { const gop = union_obj.fields.getOrPutAssumeCapacity(field_name); assert(!gop.found_existing); gop.value_ptr.* = .{ - .ty = try field_ty.copy(&decl_arena.allocator), + .ty = try field_ty.copy(decl_arena_allocator), .abi_align = Value.initTag(.abi_align_default), }; @@ -14598,7 +14606,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void { // that points to this alignment expression rather than the struct. // But only resolve the source location if we need to emit a compile error. const abi_align_val = (try sema.resolveInstConst(&block_scope, src, align_ref)).val; - gop.value_ptr.abi_align = try abi_align_val.copy(&decl_arena.allocator); + gop.value_ptr.abi_align = try abi_align_val.copy(decl_arena_allocator); } else { gop.value_ptr.abi_align = Value.initTag(.abi_align_default); } @@ -14615,15 +14623,16 @@ fn generateUnionTagTypeNumbered( var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const enum_obj = try new_decl_arena.allocator.create(Module.EnumNumbered); - const enum_ty_payload = try new_decl_arena.allocator.create(Type.Payload.EnumNumbered); + const enum_obj = try new_decl_arena_allocator.create(Module.EnumNumbered); + const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumNumbered); enum_ty_payload.* = .{ .base = .{ .tag = .enum_numbered }, .data = enum_obj, }; const enum_ty = Type.initPayload(&enum_ty_payload.base); - const enum_val = try Value.Tag.ty.create(&new_decl_arena.allocator, enum_ty); + const enum_val = try Value.Tag.ty.create(new_decl_arena_allocator, enum_ty); // TODO better type name const new_decl = try mod.createAnonymousDecl(block, .{ .ty = Type.type, @@ -14640,8 +14649,8 @@ fn generateUnionTagTypeNumbered( .node_offset = 0, }; // Here we pre-allocate the maps using the decl arena. - try enum_obj.fields.ensureTotalCapacity(&new_decl_arena.allocator, fields_len); - try enum_obj.values.ensureTotalCapacityContext(&new_decl_arena.allocator, fields_len, .{ .ty = int_ty }); + try enum_obj.fields.ensureTotalCapacity(new_decl_arena_allocator, fields_len); + try enum_obj.values.ensureTotalCapacityContext(new_decl_arena_allocator, fields_len, .{ .ty = int_ty }); try new_decl.finalizeNewArena(&new_decl_arena); return enum_ty; } @@ -14651,15 +14660,16 @@ fn generateUnionTagTypeSimple(sema: *Sema, block: *Block, fields_len: u32) !Type var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa); errdefer new_decl_arena.deinit(); + const new_decl_arena_allocator = new_decl_arena.allocator(); - const enum_obj = try new_decl_arena.allocator.create(Module.EnumSimple); - const enum_ty_payload = try new_decl_arena.allocator.create(Type.Payload.EnumSimple); + const enum_obj = try new_decl_arena_allocator.create(Module.EnumSimple); + const enum_ty_payload = try new_decl_arena_allocator.create(Type.Payload.EnumSimple); enum_ty_payload.* = .{ .base = .{ .tag = .enum_simple }, .data = enum_obj, }; const enum_ty = Type.initPayload(&enum_ty_payload.base); - const enum_val = try Value.Tag.ty.create(&new_decl_arena.allocator, enum_ty); + const enum_val = try Value.Tag.ty.create(new_decl_arena_allocator, enum_ty); // TODO better type name const new_decl = try mod.createAnonymousDecl(block, .{ .ty = Type.type, @@ -14674,7 +14684,7 @@ fn generateUnionTagTypeSimple(sema: *Sema, block: *Block, fields_len: u32) !Type .node_offset = 0, }; // Here we pre-allocate the maps using the decl arena. - try enum_obj.fields.ensureTotalCapacity(&new_decl_arena.allocator, fields_len); + try enum_obj.fields.ensureTotalCapacity(new_decl_arena_allocator, fields_len); try new_decl.finalizeNewArena(&new_decl_arena); return enum_ty; } diff --git a/src/ThreadPool.zig b/src/ThreadPool.zig index a3ba3c6115..4f9d8dc015 100644 --- a/src/ThreadPool.zig +++ b/src/ThreadPool.zig @@ -9,7 +9,7 @@ const ThreadPool = @This(); mutex: std.Thread.Mutex = .{}, is_running: bool = true, -allocator: *std.mem.Allocator, +allocator: std.mem.Allocator, workers: []Worker, run_queue: RunQueue = .{}, idle_queue: IdleQueue = .{}, @@ -55,7 +55,7 @@ const Worker = struct { } }; -pub fn init(self: *ThreadPool, allocator: *std.mem.Allocator) !void { +pub fn init(self: *ThreadPool, allocator: std.mem.Allocator) !void { self.* = .{ .allocator = allocator, .workers = &[_]Worker{}, diff --git a/src/TypedValue.zig b/src/TypedValue.zig index 09ded3745e..1fa4813a34 100644 --- a/src/TypedValue.zig +++ b/src/TypedValue.zig @@ -16,14 +16,14 @@ pub const Managed = struct { /// If this is `null` then there is no memory management needed. arena: ?*std.heap.ArenaAllocator.State = null, - pub fn deinit(self: *Managed, allocator: *Allocator) void { + pub fn deinit(self: *Managed, allocator: Allocator) void { if (self.arena) |a| a.promote(allocator).deinit(); self.* = undefined; } }; /// Assumes arena allocation. Does a recursive copy. -pub fn copy(self: TypedValue, arena: *Allocator) error{OutOfMemory}!TypedValue { +pub fn copy(self: TypedValue, arena: Allocator) error{OutOfMemory}!TypedValue { return TypedValue{ .ty = try self.ty.copy(arena), .val = try self.val.copy(arena), diff --git a/src/Zir.zig b/src/Zir.zig index 7e5937e40d..e32200f78c 100644 --- a/src/Zir.zig +++ b/src/Zir.zig @@ -101,7 +101,7 @@ pub fn hasCompileErrors(code: Zir) bool { return code.extra[@enumToInt(ExtraIndex.compile_errors)] != 0; } -pub fn deinit(code: *Zir, gpa: *Allocator) void { +pub fn deinit(code: *Zir, gpa: Allocator) void { code.instructions.deinit(gpa); gpa.free(code.string_bytes); gpa.free(code.extra); diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index 84996410f1..1cd9ac95a9 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -33,7 +33,7 @@ const InnerError = error{ CodegenFail, }; -gpa: *Allocator, +gpa: Allocator, air: Air, liveness: Liveness, bin_file: *link.File, @@ -164,7 +164,7 @@ const MCValue = union(enum) { const Branch = struct { inst_table: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, MCValue) = .{}, - fn deinit(self: *Branch, gpa: *Allocator) void { + fn deinit(self: *Branch, gpa: Allocator) void { self.inst_table.deinit(gpa); self.* = undefined; } diff --git a/src/arch/aarch64/Mir.zig b/src/arch/aarch64/Mir.zig index 5035b80304..cb26288d1b 100644 --- a/src/arch/aarch64/Mir.zig +++ b/src/arch/aarch64/Mir.zig @@ -229,7 +229,7 @@ pub const Inst = struct { // } }; -pub fn deinit(mir: *Mir, gpa: *std.mem.Allocator) void { +pub fn deinit(mir: *Mir, gpa: std.mem.Allocator) void { mir.instructions.deinit(gpa); gpa.free(mir.extra); mir.* = undefined; diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index a4624becf8..44df03472f 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -33,7 +33,7 @@ const InnerError = error{ CodegenFail, }; -gpa: *Allocator, +gpa: Allocator, air: Air, liveness: Liveness, bin_file: *link.File, @@ -164,7 +164,7 @@ const MCValue = union(enum) { const Branch = struct { inst_table: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, MCValue) = .{}, - fn deinit(self: *Branch, gpa: *Allocator) void { + fn deinit(self: *Branch, gpa: Allocator) void { self.inst_table.deinit(gpa); self.* = undefined; } diff --git a/src/arch/arm/Mir.zig b/src/arch/arm/Mir.zig index 91e2aa9415..5ed7097a88 100644 --- a/src/arch/arm/Mir.zig +++ b/src/arch/arm/Mir.zig @@ -193,7 +193,7 @@ pub const Inst = struct { // } }; -pub fn deinit(mir: *Mir, gpa: *std.mem.Allocator) void { +pub fn deinit(mir: *Mir, gpa: std.mem.Allocator) void { mir.instructions.deinit(gpa); gpa.free(mir.extra); mir.* = undefined; diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index 68789e6e43..17ef79b725 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -33,7 +33,7 @@ const InnerError = error{ CodegenFail, }; -gpa: *Allocator, +gpa: Allocator, air: Air, liveness: Liveness, bin_file: *link.File, @@ -158,7 +158,7 @@ const MCValue = union(enum) { const Branch = struct { inst_table: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, MCValue) = .{}, - fn deinit(self: *Branch, gpa: *Allocator) void { + fn deinit(self: *Branch, gpa: Allocator) void { self.inst_table.deinit(gpa); self.* = undefined; } diff --git a/src/arch/riscv64/Mir.zig b/src/arch/riscv64/Mir.zig index 23a1da54d5..70546e0803 100644 --- a/src/arch/riscv64/Mir.zig +++ b/src/arch/riscv64/Mir.zig @@ -101,7 +101,7 @@ pub const Inst = struct { // } }; -pub fn deinit(mir: *Mir, gpa: *std.mem.Allocator) void { +pub fn deinit(mir: *Mir, gpa: std.mem.Allocator) void { mir.instructions.deinit(gpa); gpa.free(mir.extra); mir.* = undefined; diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 55b0aff81f..3f75056e59 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -508,7 +508,7 @@ const Self = @This(); decl: *Decl, air: Air, liveness: Liveness, -gpa: *mem.Allocator, +gpa: mem.Allocator, /// Table to save `WValue`'s generated by an `Air.Inst` values: ValueTable, /// Mapping from Air.Inst.Index to block ids @@ -983,7 +983,7 @@ const CallWValues = struct { args: []WValue, return_value: WValue, - fn deinit(self: *CallWValues, gpa: *Allocator) void { + fn deinit(self: *CallWValues, gpa: Allocator) void { gpa.free(self.args); self.* = undefined; } diff --git a/src/arch/wasm/Mir.zig b/src/arch/wasm/Mir.zig index 5891893f33..c14a40ecce 100644 --- a/src/arch/wasm/Mir.zig +++ b/src/arch/wasm/Mir.zig @@ -411,7 +411,7 @@ pub const Inst = struct { }; }; -pub fn deinit(self: *Mir, gpa: *std.mem.Allocator) void { +pub fn deinit(self: *Mir, gpa: std.mem.Allocator) void { self.instructions.deinit(gpa); gpa.free(self.extra); self.* = undefined; diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 55e51dcc00..4580395fd8 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -33,7 +33,7 @@ const InnerError = error{ CodegenFail, }; -gpa: *Allocator, +gpa: Allocator, air: Air, liveness: Liveness, bin_file: *link.File, @@ -174,7 +174,7 @@ pub const MCValue = union(enum) { const Branch = struct { inst_table: std.AutoArrayHashMapUnmanaged(Air.Inst.Index, MCValue) = .{}, - fn deinit(self: *Branch, gpa: *Allocator) void { + fn deinit(self: *Branch, gpa: Allocator) void { self.inst_table.deinit(gpa); self.* = undefined; } diff --git a/src/arch/x86_64/Mir.zig b/src/arch/x86_64/Mir.zig index 690b1ce5f2..501a5428d2 100644 --- a/src/arch/x86_64/Mir.zig +++ b/src/arch/x86_64/Mir.zig @@ -347,7 +347,7 @@ pub const ArgDbgInfo = struct { arg_index: u32, }; -pub fn deinit(mir: *Mir, gpa: *std.mem.Allocator) void { +pub fn deinit(mir: *Mir, gpa: std.mem.Allocator) void { mir.instructions.deinit(gpa); gpa.free(mir.extra); mir.* = undefined; diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 11c899bdd2..f54ae7f76d 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -163,14 +163,14 @@ pub const Object = struct { /// This data is available both when outputting .c code and when outputting an .h file. pub const DeclGen = struct { - gpa: *std.mem.Allocator, + gpa: std.mem.Allocator, module: *Module, decl: *Decl, fwd_decl: std.ArrayList(u8), error_msg: ?*Module.ErrorMsg, /// The key of this map is Type which has references to typedefs_arena. typedefs: TypedefMap, - typedefs_arena: *std.mem.Allocator, + typedefs_arena: std.mem.Allocator, fn fail(dg: *DeclGen, comptime format: []const u8, args: anytype) error{ AnalysisFail, OutOfMemory } { @setCold(true); @@ -390,6 +390,7 @@ pub const DeclGen = struct { // Fall back to generic implementation. var arena = std.heap.ArenaAllocator.init(dg.module.gpa); defer arena.deinit(); + const arena_allocator = arena.allocator(); try writer.writeAll("{"); var index: usize = 0; @@ -397,7 +398,7 @@ pub const DeclGen = struct { const elem_ty = ty.elemType(); while (index < len) : (index += 1) { if (index != 0) try writer.writeAll(","); - const elem_val = try val.elemValue(&arena.allocator, index); + const elem_val = try val.elemValue(arena_allocator, index); try dg.renderValue(writer, elem_ty, elem_val); } if (ty.sentinel()) |sentinel_val| { diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 21fa0187e3..4600c2e07e 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -23,7 +23,7 @@ const LazySrcLoc = Module.LazySrcLoc; const Error = error{ OutOfMemory, CodegenFail }; -pub fn targetTriple(allocator: *Allocator, target: std.Target) ![:0]u8 { +pub fn targetTriple(allocator: Allocator, target: std.Target) ![:0]u8 { const llvm_arch = switch (target.cpu.arch) { .arm => "arm", .armeb => "armeb", @@ -190,14 +190,14 @@ pub const Object = struct { std.hash_map.default_max_load_percentage, ); - pub fn create(gpa: *Allocator, sub_path: []const u8, options: link.Options) !*Object { + pub fn create(gpa: Allocator, sub_path: []const u8, options: link.Options) !*Object { const obj = try gpa.create(Object); errdefer gpa.destroy(obj); obj.* = try Object.init(gpa, sub_path, options); return obj; } - pub fn init(gpa: *Allocator, sub_path: []const u8, options: link.Options) !Object { + pub fn init(gpa: Allocator, sub_path: []const u8, options: link.Options) !Object { const context = llvm.Context.create(); errdefer context.dispose(); @@ -287,7 +287,7 @@ pub const Object = struct { }; } - pub fn deinit(self: *Object, gpa: *Allocator) void { + pub fn deinit(self: *Object, gpa: Allocator) void { self.target_machine.dispose(); self.llvm_module.dispose(); self.context.dispose(); @@ -297,13 +297,13 @@ pub const Object = struct { self.* = undefined; } - pub fn destroy(self: *Object, gpa: *Allocator) void { + pub fn destroy(self: *Object, gpa: Allocator) void { self.deinit(gpa); gpa.destroy(self); } fn locPath( - arena: *Allocator, + arena: Allocator, opt_loc: ?Compilation.EmitLoc, cache_directory: Compilation.Directory, ) !?[*:0]u8 { @@ -331,7 +331,7 @@ pub const Object = struct { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const mod = comp.bin_file.options.module.?; const cache_dir = mod.zig_cache_artifact_directory; @@ -554,7 +554,7 @@ pub const DeclGen = struct { object: *Object, module: *Module, decl: *Module.Decl, - gpa: *Allocator, + gpa: Allocator, err_msg: ?*Module.ErrorMsg, fn todo(self: *DeclGen, comptime format: []const u8, args: anytype) Error { @@ -779,7 +779,7 @@ pub const DeclGen = struct { // The Type memory is ephemeral; since we want to store a longer-lived // reference, we need to copy it here. - gop.key_ptr.* = try t.copy(&dg.object.type_map_arena.allocator); + gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator()); const opaque_obj = t.castTag(.@"opaque").?.data; const name = try opaque_obj.getFullyQualifiedName(gpa); @@ -837,7 +837,7 @@ pub const DeclGen = struct { // The Type memory is ephemeral; since we want to store a longer-lived // reference, we need to copy it here. - gop.key_ptr.* = try t.copy(&dg.object.type_map_arena.allocator); + gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator()); const struct_obj = t.castTag(.@"struct").?.data; @@ -871,7 +871,7 @@ pub const DeclGen = struct { // The Type memory is ephemeral; since we want to store a longer-lived // reference, we need to copy it here. - gop.key_ptr.* = try t.copy(&dg.object.type_map_arena.allocator); + gop.key_ptr.* = try t.copy(dg.object.type_map_arena.allocator()); const union_obj = t.cast(Type.Payload.Union).?.data; const target = dg.module.getTarget(); @@ -1621,7 +1621,7 @@ pub const DeclGen = struct { }; pub const FuncGen = struct { - gpa: *Allocator, + gpa: Allocator, dg: *DeclGen, air: Air, liveness: Liveness, @@ -2485,7 +2485,7 @@ pub const FuncGen = struct { var arena_allocator = std.heap.ArenaAllocator.init(self.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const llvm_params_len = args.len; const llvm_param_types = try arena.alloc(*const llvm.Type, llvm_params_len); diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig index 67faf32471..39363064a7 100644 --- a/src/codegen/spirv.zig +++ b/src/codegen/spirv.zig @@ -70,7 +70,7 @@ pub fn writeInstructionWithString(code: *std.ArrayList(Word), opcode: Opcode, ar /// of data which needs to be persistent over different calls to Decl code generation. pub const SPIRVModule = struct { /// A general-purpose allocator which may be used to allocate temporary resources required for compilation. - gpa: *Allocator, + gpa: Allocator, /// The parent module. module: *Module, @@ -103,7 +103,7 @@ pub const SPIRVModule = struct { /// just the ones for OpLine. Note that OpLine needs the result of OpString, and not that of OpSource. file_names: std.StringHashMap(ResultId), - pub fn init(gpa: *Allocator, module: *Module) SPIRVModule { + pub fn init(gpa: Allocator, module: *Module) SPIRVModule { return .{ .gpa = gpa, .module = module, diff --git a/src/crash_report.zig b/src/crash_report.zig index f11f95fe0c..5d96ebc669 100644 --- a/src/crash_report.zig +++ b/src/crash_report.zig @@ -85,7 +85,7 @@ fn dumpStatusReport() !void { const anal = zir_state orelse return; // Note: We have the panic mutex here, so we can safely use the global crash heap. var fba = std.heap.FixedBufferAllocator.init(&crash_heap); - const allocator = &fba.allocator; + const allocator = fba.allocator(); const stderr = io.getStdErr().writer(); const block: *Sema.Block = anal.block; diff --git a/src/glibc.zig b/src/glibc.zig index fd143bac7e..e67c3360e9 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -34,7 +34,7 @@ pub const ABI = struct { version_table: std.AutoHashMapUnmanaged(target_util.ArchOsAbi, [*]VerList), arena_state: std.heap.ArenaAllocator.State, - pub fn destroy(abi: *ABI, gpa: *Allocator) void { + pub fn destroy(abi: *ABI, gpa: Allocator) void { abi.version_table.deinit(gpa); abi.arena_state.promote(gpa).deinit(); // Frees the ABI memory too. } @@ -59,13 +59,13 @@ pub const LoadMetaDataError = error{ /// This function will emit a log error when there is a problem with the zig installation and then return /// `error.ZigInstallationCorrupt`. -pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!*ABI { +pub fn loadMetaData(gpa: Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!*ABI { const tracy = trace(@src()); defer tracy.end(); var arena_allocator = std.heap.ArenaAllocator.init(gpa); errdefer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); var all_versions = std.ArrayListUnmanaged(std.builtin.Version){}; var all_functions = std.ArrayListUnmanaged(Fn){}; @@ -256,7 +256,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { const gpa = comp.gpa; var arena_allocator = std.heap.ArenaAllocator.init(gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); switch (crt_file) { .crti_o => { @@ -433,7 +433,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { } } -fn start_asm_path(comp: *Compilation, arena: *Allocator, basename: []const u8) ![]const u8 { +fn start_asm_path(comp: *Compilation, arena: Allocator, basename: []const u8) ![]const u8 { const arch = comp.getTarget().cpu.arch; const is_ppc = arch == .powerpc or arch == .powerpc64 or arch == .powerpc64le; const is_aarch64 = arch == .aarch64 or arch == .aarch64_be; @@ -493,7 +493,7 @@ fn start_asm_path(comp: *Compilation, arena: *Allocator, basename: []const u8) ! return result.items; } -fn add_include_dirs(comp: *Compilation, arena: *Allocator, args: *std.ArrayList([]const u8)) error{OutOfMemory}!void { +fn add_include_dirs(comp: *Compilation, arena: Allocator, args: *std.ArrayList([]const u8)) error{OutOfMemory}!void { const target = comp.getTarget(); const arch = target.cpu.arch; const opt_nptl: ?[]const u8 = if (target.os.tag == .linux) "nptl" else "htl"; @@ -566,7 +566,7 @@ fn add_include_dirs(comp: *Compilation, arena: *Allocator, args: *std.ArrayList( } fn add_include_dirs_arch( - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), arch: std.Target.Cpu.Arch, opt_nptl: ?[]const u8, @@ -677,14 +677,14 @@ fn add_include_dirs_arch( } } -fn path_from_lib(comp: *Compilation, arena: *Allocator, sub_path: []const u8) ![]const u8 { +fn path_from_lib(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 { return path.join(arena, &[_][]const u8{ comp.zig_lib_directory.path.?, sub_path }); } const lib_libc = "libc" ++ path.sep_str; const lib_libc_glibc = lib_libc ++ "glibc" ++ path.sep_str; -fn lib_path(comp: *Compilation, arena: *Allocator, sub_path: []const u8) ![]const u8 { +fn lib_path(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 { return path.join(arena, &[_][]const u8{ comp.zig_lib_directory.path.?, sub_path }); } @@ -692,7 +692,7 @@ pub const BuiltSharedObjects = struct { lock: Cache.Lock, dir_path: []u8, - pub fn deinit(self: *BuiltSharedObjects, gpa: *Allocator) void { + pub fn deinit(self: *BuiltSharedObjects, gpa: Allocator) void { self.lock.release(); gpa.free(self.dir_path); self.* = undefined; @@ -711,7 +711,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const target = comp.getTarget(); const target_version = target.os.version_range.linux.glibc; @@ -915,7 +915,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void { fn buildSharedLib( comp: *Compilation, - arena: *Allocator, + arena: Allocator, zig_cache_directory: Compilation.Directory, bin_directory: Compilation.Directory, asm_file_basename: []const u8, diff --git a/src/introspect.zig b/src/introspect.zig index be974d3efe..562d6b04f4 100644 --- a/src/introspect.zig +++ b/src/introspect.zig @@ -33,7 +33,7 @@ fn testZigInstallPrefix(base_dir: fs.Dir) ?Compilation.Directory { } /// Both the directory handle and the path are newly allocated resources which the caller now owns. -pub fn findZigLibDir(gpa: *mem.Allocator) !Compilation.Directory { +pub fn findZigLibDir(gpa: mem.Allocator) !Compilation.Directory { const self_exe_path = try fs.selfExePathAlloc(gpa); defer gpa.free(self_exe_path); @@ -42,7 +42,7 @@ pub fn findZigLibDir(gpa: *mem.Allocator) !Compilation.Directory { /// Both the directory handle and the path are newly allocated resources which the caller now owns. pub fn findZigLibDirFromSelfExe( - allocator: *mem.Allocator, + allocator: mem.Allocator, self_exe_path: []const u8, ) error{ OutOfMemory, FileNotFound }!Compilation.Directory { const cwd = fs.cwd(); @@ -61,7 +61,7 @@ pub fn findZigLibDirFromSelfExe( } /// Caller owns returned memory. -pub fn resolveGlobalCacheDir(allocator: *mem.Allocator) ![]u8 { +pub fn resolveGlobalCacheDir(allocator: mem.Allocator) ![]u8 { if (std.process.getEnvVarOwned(allocator, "ZIG_GLOBAL_CACHE_DIR")) |value| { if (value.len > 0) { return value; diff --git a/src/libc_installation.zig b/src/libc_installation.zig index be0abe301b..4cd43c7567 100644 --- a/src/libc_installation.zig +++ b/src/libc_installation.zig @@ -39,7 +39,7 @@ pub const LibCInstallation = struct { }; pub fn parse( - allocator: *Allocator, + allocator: Allocator, libc_file: []const u8, target: std.zig.CrossTarget, ) !LibCInstallation { @@ -175,7 +175,7 @@ pub const LibCInstallation = struct { } pub const FindNativeOptions = struct { - allocator: *Allocator, + allocator: Allocator, /// If enabled, will print human-friendly errors to stderr. verbose: bool = false, @@ -234,7 +234,7 @@ pub const LibCInstallation = struct { } /// Must be the same allocator passed to `parse` or `findNative`. - pub fn deinit(self: *LibCInstallation, allocator: *Allocator) void { + pub fn deinit(self: *LibCInstallation, allocator: Allocator) void { const fields = std.meta.fields(LibCInstallation); inline for (fields) |field| { if (@field(self, field.name)) |payload| { @@ -562,7 +562,7 @@ pub const LibCInstallation = struct { }; pub const CCPrintFileNameOptions = struct { - allocator: *Allocator, + allocator: Allocator, search_basename: []const u8, want_dirname: enum { full_path, only_dir }, verbose: bool = false, diff --git a/src/libcxx.zig b/src/libcxx.zig index 9986c922ba..fe96207c48 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -89,7 +89,7 @@ pub fn buildLibCXX(comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const root_name = "c++"; const output_mode = .Lib; @@ -236,7 +236,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const root_name = "c++abi"; const output_mode = .Lib; diff --git a/src/libtsan.zig b/src/libtsan.zig index 57f1f8c78e..0f05957387 100644 --- a/src/libtsan.zig +++ b/src/libtsan.zig @@ -15,7 +15,7 @@ pub fn buildTsan(comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const root_name = "tsan"; const output_mode = .Lib; diff --git a/src/libunwind.zig b/src/libunwind.zig index 50c329c6d6..95c58936fa 100644 --- a/src/libunwind.zig +++ b/src/libunwind.zig @@ -17,7 +17,7 @@ pub fn buildStaticLib(comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const root_name = "unwind"; const output_mode = .Lib; diff --git a/src/link.zig b/src/link.zig index 77464737b0..79a1c63462 100644 --- a/src/link.zig +++ b/src/link.zig @@ -165,7 +165,7 @@ pub const File = struct { tag: Tag, options: Options, file: ?fs.File, - allocator: *Allocator, + allocator: Allocator, /// When linking with LLD, this linker code will output an object file only at /// this location, and then this path can be placed on the LLD linker line. intermediary_basename: ?[]const u8 = null, @@ -221,7 +221,7 @@ pub const File = struct { /// incremental linking fails, falls back to truncating the file and /// rewriting it. A malicious file is detected as incremental link failure /// and does not cause Illegal Behavior. This operation is not atomic. - pub fn openPath(allocator: *Allocator, options: Options) !*File { + pub fn openPath(allocator: Allocator, options: Options) !*File { if (options.object_format == .macho) { return &(try MachO.openPath(allocator, options)).base; } @@ -628,7 +628,7 @@ pub const File = struct { var arena_allocator = std.heap.ArenaAllocator.init(base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const directory = base.options.emit.?.directory; // Just an alias to make it shorter to type. diff --git a/src/link/C.zig b/src/link/C.zig index 5ca389ae62..6599008c73 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -36,7 +36,7 @@ const DeclBlock = struct { /// Any arena memory the Type points to lives in the `arena` field of `C`. typedefs: codegen.TypedefMap.Unmanaged = .{}, - fn deinit(db: *DeclBlock, gpa: *Allocator) void { + fn deinit(db: *DeclBlock, gpa: Allocator) void { db.code.deinit(gpa); db.fwd_decl.deinit(gpa); for (db.typedefs.values()) |typedef| { @@ -47,7 +47,7 @@ const DeclBlock = struct { } }; -pub fn openPath(gpa: *Allocator, sub_path: []const u8, options: link.Options) !*C { +pub fn openPath(gpa: Allocator, sub_path: []const u8, options: link.Options) !*C { assert(options.object_format == .c); if (options.use_llvm) return error.LLVMHasNoCBackend; @@ -128,7 +128,7 @@ pub fn updateFunc(self: *C, module: *Module, func: *Module.Fn, air: Air, livenes .decl = decl, .fwd_decl = fwd_decl.toManaged(module.gpa), .typedefs = typedefs.promote(module.gpa), - .typedefs_arena = &self.arena.allocator, + .typedefs_arena = self.arena.allocator(), }, .code = code.toManaged(module.gpa), .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 { .decl = decl, .fwd_decl = fwd_decl.toManaged(module.gpa), .typedefs = typedefs.promote(module.gpa), - .typedefs_arena = &self.arena.allocator, + .typedefs_arena = self.arena.allocator(), }, .code = code.toManaged(module.gpa), .indent_writer = undefined, // set later so we can get a pointer to object.code @@ -336,7 +336,7 @@ const Flush = struct { std.hash_map.default_max_load_percentage, ); - fn deinit(f: *Flush, gpa: *Allocator) void { + fn deinit(f: *Flush, gpa: Allocator) void { f.all_buffers.deinit(gpa); f.err_typedef_buf.deinit(gpa); f.typedefs.deinit(gpa); diff --git a/src/link/Coff.zig b/src/link/Coff.zig index c5ed618895..2445b11caf 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -125,7 +125,7 @@ pub const TextBlock = struct { pub const SrcFn = void; -pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Options) !*Coff { +pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Coff { assert(options.object_format == .coff); if (build_options.have_llvm and options.use_llvm) { @@ -396,7 +396,7 @@ pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Optio return self; } -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*Coff { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*Coff { const ptr_width: PtrWidth = switch (options.target.cpu.arch.ptrBitWidth()) { 0...32 => .p32, 33...64 => .p64, @@ -877,7 +877,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type. @@ -1394,7 +1394,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void { } } -fn findLib(self: *Coff, arena: *Allocator, name: []const u8) !?[]const u8 { +fn findLib(self: *Coff, arena: Allocator, name: []const u8) !?[]const u8 { for (self.base.options.lib_dirs) |lib_dir| { const full_path = try fs.path.join(arena, &.{ lib_dir, name }); fs.cwd().access(full_path, .{}) catch |err| switch (err) { diff --git a/src/link/Elf.zig b/src/link/Elf.zig index fd615bc109..24f8a02b95 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -228,7 +228,7 @@ pub const SrcFn = struct { }; }; -pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Options) !*Elf { +pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Elf { assert(options.object_format == .elf); if (build_options.have_llvm and options.use_llvm) { @@ -281,7 +281,7 @@ pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Optio return self; } -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*Elf { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*Elf { const ptr_width: PtrWidth = switch (options.target.cpu.arch.ptrBitWidth()) { 0...32 => .p32, 33...64 => .p64, @@ -1243,7 +1243,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type. @@ -2205,7 +2205,7 @@ pub fn freeDecl(self: *Elf, decl: *Module.Decl) void { } } -fn deinitRelocs(gpa: *Allocator, table: *File.DbgInfoTypeRelocsTable) void { +fn deinitRelocs(gpa: Allocator, table: *File.DbgInfoTypeRelocsTable) void { var it = table.valueIterator(); while (it.next()) |value| { value.relocs.deinit(gpa); @@ -3360,7 +3360,7 @@ const CsuObjects = struct { crtend: ?[]const u8 = null, crtn: ?[]const u8 = null, - fn init(arena: *mem.Allocator, link_options: link.Options, comp: *const Compilation) !CsuObjects { + fn init(arena: mem.Allocator, link_options: link.Options, comp: *const Compilation) !CsuObjects { // crt objects are only required for libc. if (!link_options.link_libc) return CsuObjects{}; diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 56f6483cd0..fc592ab5e8 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -280,7 +280,7 @@ pub const SrcFn = struct { }; }; -pub fn openPath(allocator: *Allocator, options: link.Options) !*MachO { +pub fn openPath(allocator: Allocator, options: link.Options) !*MachO { assert(options.object_format == .macho); const use_stage1 = build_options.is_stage1 and options.use_stage1; @@ -366,7 +366,7 @@ pub fn openPath(allocator: *Allocator, options: link.Options) !*MachO { return self; } -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*MachO { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO { const self = try gpa.create(MachO); const cpu_arch = options.target.cpu.arch; const os_tag = options.target.os.tag; @@ -412,7 +412,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type. @@ -1032,7 +1032,7 @@ pub fn flushObject(self: *MachO, comp: *Compilation) !void { } fn resolveSearchDir( - arena: *Allocator, + arena: Allocator, dir: []const u8, syslibroot: ?[]const u8, ) !?[]const u8 { @@ -1074,7 +1074,7 @@ fn resolveSearchDir( } fn resolveLib( - arena: *Allocator, + arena: Allocator, search_dirs: []const []const u8, name: []const u8, ext: []const u8, @@ -1098,7 +1098,7 @@ fn resolveLib( } fn resolveFramework( - arena: *Allocator, + arena: Allocator, search_dirs: []const []const u8, name: []const u8, ext: []const u8, @@ -1288,7 +1288,7 @@ fn parseDependentLibs(self: *MachO, syslibroot: ?[]const u8, dependent_libs: any // TODO this should not be performed if the user specifies `-flat_namespace` flag. // See ld64 manpages. var arena_alloc = std.heap.ArenaAllocator.init(self.base.allocator); - const arena = &arena_alloc.allocator; + const arena = arena_alloc.allocator(); defer arena_alloc.deinit(); while (dependent_libs.readItem()) |*id| { @@ -5379,7 +5379,7 @@ fn snapshotState(self: *MachO) !void { var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const out_file = try emit.directory.handle.createFile("snapshots.json", .{ .truncate = self.cold_start, diff --git a/src/link/MachO/Archive.zig b/src/link/MachO/Archive.zig index 0d17f305b9..1ebb122423 100644 --- a/src/link/MachO/Archive.zig +++ b/src/link/MachO/Archive.zig @@ -92,7 +92,7 @@ const ar_hdr = extern struct { } }; -pub fn deinit(self: *Archive, allocator: *Allocator) void { +pub fn deinit(self: *Archive, allocator: Allocator) void { for (self.toc.keys()) |*key| { allocator.free(key.*); } @@ -103,7 +103,7 @@ pub fn deinit(self: *Archive, allocator: *Allocator) void { allocator.free(self.name); } -pub fn parse(self: *Archive, allocator: *Allocator, target: std.Target) !void { +pub fn parse(self: *Archive, allocator: Allocator, target: std.Target) !void { const reader = self.file.reader(); self.library_offset = try fat.getLibraryOffset(reader, target); try self.file.seekTo(self.library_offset); @@ -128,7 +128,7 @@ pub fn parse(self: *Archive, allocator: *Allocator, target: std.Target) !void { try reader.context.seekTo(0); } -fn parseName(allocator: *Allocator, header: ar_hdr, reader: anytype) ![]u8 { +fn parseName(allocator: Allocator, header: ar_hdr, reader: anytype) ![]u8 { const name_or_length = try header.nameOrLength(); var name: []u8 = undefined; switch (name_or_length) { @@ -146,7 +146,7 @@ fn parseName(allocator: *Allocator, header: ar_hdr, reader: anytype) ![]u8 { return name; } -fn parseTableOfContents(self: *Archive, allocator: *Allocator, reader: anytype) !void { +fn parseTableOfContents(self: *Archive, allocator: Allocator, reader: anytype) !void { const symtab_size = try reader.readIntLittle(u32); var symtab = try allocator.alloc(u8, symtab_size); defer allocator.free(symtab); @@ -188,7 +188,7 @@ fn parseTableOfContents(self: *Archive, allocator: *Allocator, reader: anytype) } } -pub fn parseObject(self: Archive, allocator: *Allocator, target: std.Target, offset: u32) !Object { +pub fn parseObject(self: Archive, allocator: Allocator, target: std.Target, offset: u32) !Object { const reader = self.file.reader(); try reader.context.seekTo(offset + self.library_offset); diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index f5148ac8ee..87c1e92559 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -195,7 +195,7 @@ pub const empty = Atom{ .dbg_info_len = undefined, }; -pub fn deinit(self: *Atom, allocator: *Allocator) void { +pub fn deinit(self: *Atom, allocator: Allocator) void { self.dices.deinit(allocator); self.lazy_bindings.deinit(allocator); self.bindings.deinit(allocator); @@ -246,7 +246,7 @@ pub fn freeListEligible(self: Atom, macho_file: MachO) bool { const RelocContext = struct { base_addr: u64 = 0, - allocator: *Allocator, + allocator: Allocator, object: *Object, macho_file: *MachO, }; diff --git a/src/link/MachO/CodeSignature.zig b/src/link/MachO/CodeSignature.zig index 18c85eb8f7..41c7c07741 100644 --- a/src/link/MachO/CodeSignature.zig +++ b/src/link/MachO/CodeSignature.zig @@ -58,7 +58,7 @@ cdir: ?CodeDirectory = null, pub fn calcAdhocSignature( self: *CodeSignature, - allocator: *Allocator, + allocator: Allocator, file: fs.File, id: []const u8, text_segment: macho.segment_command_64, @@ -145,7 +145,7 @@ pub fn write(self: CodeSignature, writer: anytype) !void { try self.cdir.?.write(writer); } -pub fn deinit(self: *CodeSignature, allocator: *Allocator) void { +pub fn deinit(self: *CodeSignature, allocator: Allocator) void { if (self.cdir) |*cdir| { cdir.data.deinit(allocator); } diff --git a/src/link/MachO/DebugSymbols.zig b/src/link/MachO/DebugSymbols.zig index 1aa63f60d0..9724a1ae03 100644 --- a/src/link/MachO/DebugSymbols.zig +++ b/src/link/MachO/DebugSymbols.zig @@ -104,7 +104,7 @@ const min_nop_size = 2; /// You must call this function *after* `MachO.populateMissingMetadata()` /// has been called to get a viable debug symbols output. -pub fn populateMissingMetadata(self: *DebugSymbols, allocator: *Allocator) !void { +pub fn populateMissingMetadata(self: *DebugSymbols, allocator: Allocator) !void { if (self.uuid_cmd_index == null) { const base_cmd = self.base.load_commands.items[self.base.uuid_cmd_index.?]; self.uuid_cmd_index = @intCast(u16, self.load_commands.items.len); @@ -268,7 +268,7 @@ fn allocateSection(self: *DebugSymbols, sectname: []const u8, size: u64, alignme return index; } -pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Options) !void { +pub fn flushModule(self: *DebugSymbols, allocator: Allocator, options: link.Options) !void { // TODO This linker code currently assumes there is only 1 compilation unit and it corresponds to the // Zig source code. const module = options.module orelse return error.LinkingWithoutZigSourceUnimplemented; @@ -577,7 +577,7 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt assert(!self.debug_string_table_dirty); } -pub fn deinit(self: *DebugSymbols, allocator: *Allocator) void { +pub fn deinit(self: *DebugSymbols, allocator: Allocator) void { self.dbg_info_decl_free_list.deinit(allocator); self.dbg_line_fn_free_list.deinit(allocator); self.debug_string_table.deinit(allocator); @@ -588,7 +588,7 @@ pub fn deinit(self: *DebugSymbols, allocator: *Allocator) void { self.file.close(); } -fn copySegmentCommand(self: *DebugSymbols, allocator: *Allocator, base_cmd: SegmentCommand) !SegmentCommand { +fn copySegmentCommand(self: *DebugSymbols, allocator: Allocator, base_cmd: SegmentCommand) !SegmentCommand { var cmd = SegmentCommand{ .inner = .{ .segname = undefined, @@ -648,7 +648,7 @@ fn updateDwarfSegment(self: *DebugSymbols) void { } /// Writes all load commands and section headers. -fn writeLoadCommands(self: *DebugSymbols, allocator: *Allocator) !void { +fn writeLoadCommands(self: *DebugSymbols, allocator: Allocator) !void { if (!self.load_commands_dirty) return; var sizeofcmds: u32 = 0; @@ -834,7 +834,7 @@ pub const DeclDebugBuffers = struct { /// Caller owns the returned memory. pub fn initDeclDebugBuffers( self: *DebugSymbols, - allocator: *Allocator, + allocator: Allocator, module: *Module, decl: *Module.Decl, ) !DeclDebugBuffers { @@ -930,7 +930,7 @@ pub fn initDeclDebugBuffers( pub fn commitDeclDebugInfo( self: *DebugSymbols, - allocator: *Allocator, + allocator: Allocator, module: *Module, decl: *Module.Decl, debug_buffers: *DeclDebugBuffers, @@ -1141,7 +1141,7 @@ fn addDbgInfoType( fn updateDeclDebugInfoAllocation( self: *DebugSymbols, - allocator: *Allocator, + allocator: Allocator, text_block: *TextBlock, len: u32, ) !void { @@ -1256,7 +1256,7 @@ fn getDebugLineProgramEnd(self: DebugSymbols) u32 { } /// TODO Improve this to use a table. -fn makeDebugString(self: *DebugSymbols, allocator: *Allocator, bytes: []const u8) !u32 { +fn makeDebugString(self: *DebugSymbols, allocator: Allocator, bytes: []const u8) !u32 { try self.debug_string_table.ensureUnusedCapacity(allocator, bytes.len + 1); const result = self.debug_string_table.items.len; self.debug_string_table.appendSliceAssumeCapacity(bytes); diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig index 2835e57f0c..5f7bd9b763 100644 --- a/src/link/MachO/Dylib.zig +++ b/src/link/MachO/Dylib.zig @@ -44,7 +44,7 @@ pub const Id = struct { current_version: u32, compatibility_version: u32, - pub fn default(allocator: *Allocator, name: []const u8) !Id { + pub fn default(allocator: Allocator, name: []const u8) !Id { return Id{ .name = try allocator.dupe(u8, name), .timestamp = 2, @@ -53,7 +53,7 @@ pub const Id = struct { }; } - pub fn fromLoadCommand(allocator: *Allocator, lc: commands.GenericCommandWithData(macho.dylib_command)) !Id { + pub fn fromLoadCommand(allocator: Allocator, lc: commands.GenericCommandWithData(macho.dylib_command)) !Id { const dylib = lc.inner.dylib; const dylib_name = @ptrCast([*:0]const u8, lc.data[dylib.name - @sizeOf(macho.dylib_command) ..]); const name = try allocator.dupe(u8, mem.sliceTo(dylib_name, 0)); @@ -66,7 +66,7 @@ pub const Id = struct { }; } - pub fn deinit(id: *Id, allocator: *Allocator) void { + pub fn deinit(id: *Id, allocator: Allocator) void { allocator.free(id.name); } @@ -125,7 +125,7 @@ pub const Id = struct { } }; -pub fn deinit(self: *Dylib, allocator: *Allocator) void { +pub fn deinit(self: *Dylib, allocator: Allocator) void { for (self.load_commands.items) |*lc| { lc.deinit(allocator); } @@ -143,7 +143,7 @@ pub fn deinit(self: *Dylib, allocator: *Allocator) void { } } -pub fn parse(self: *Dylib, allocator: *Allocator, target: std.Target, dependent_libs: anytype) !void { +pub fn parse(self: *Dylib, allocator: Allocator, target: std.Target, dependent_libs: anytype) !void { log.debug("parsing shared library '{s}'", .{self.name}); self.library_offset = try fat.getLibraryOffset(self.file.reader(), target); @@ -170,7 +170,7 @@ pub fn parse(self: *Dylib, allocator: *Allocator, target: std.Target, dependent_ try self.parseSymbols(allocator); } -fn readLoadCommands(self: *Dylib, allocator: *Allocator, reader: anytype, dependent_libs: anytype) !void { +fn readLoadCommands(self: *Dylib, allocator: Allocator, reader: anytype, dependent_libs: anytype) !void { const should_lookup_reexports = self.header.?.flags & macho.MH_NO_REEXPORTED_DYLIBS == 0; try self.load_commands.ensureUnusedCapacity(allocator, self.header.?.ncmds); @@ -203,7 +203,7 @@ fn readLoadCommands(self: *Dylib, allocator: *Allocator, reader: anytype, depend } } -fn parseId(self: *Dylib, allocator: *Allocator) !void { +fn parseId(self: *Dylib, allocator: Allocator) !void { const index = self.id_cmd_index orelse { log.debug("no LC_ID_DYLIB load command found; using hard-coded defaults...", .{}); self.id = try Id.default(allocator, self.name); @@ -212,7 +212,7 @@ fn parseId(self: *Dylib, allocator: *Allocator) !void { self.id = try Id.fromLoadCommand(allocator, self.load_commands.items[index].Dylib); } -fn parseSymbols(self: *Dylib, allocator: *Allocator) !void { +fn parseSymbols(self: *Dylib, allocator: Allocator) !void { const index = self.symtab_cmd_index orelse return; const symtab_cmd = self.load_commands.items[index].Symtab; @@ -236,7 +236,7 @@ fn parseSymbols(self: *Dylib, allocator: *Allocator) !void { } } -fn addObjCClassSymbol(self: *Dylib, allocator: *Allocator, sym_name: []const u8) !void { +fn addObjCClassSymbol(self: *Dylib, allocator: Allocator, sym_name: []const u8) !void { const expanded = &[_][]const u8{ try std.fmt.allocPrint(allocator, "_OBJC_CLASS_$_{s}", .{sym_name}), try std.fmt.allocPrint(allocator, "_OBJC_METACLASS_$_{s}", .{sym_name}), @@ -248,29 +248,29 @@ fn addObjCClassSymbol(self: *Dylib, allocator: *Allocator, sym_name: []const u8) } } -fn addObjCIVarSymbol(self: *Dylib, allocator: *Allocator, sym_name: []const u8) !void { +fn addObjCIVarSymbol(self: *Dylib, allocator: Allocator, sym_name: []const u8) !void { const expanded = try std.fmt.allocPrint(allocator, "_OBJC_IVAR_$_{s}", .{sym_name}); if (self.symbols.contains(expanded)) return; try self.symbols.putNoClobber(allocator, expanded, .{}); } -fn addObjCEhTypeSymbol(self: *Dylib, allocator: *Allocator, sym_name: []const u8) !void { +fn addObjCEhTypeSymbol(self: *Dylib, allocator: Allocator, sym_name: []const u8) !void { const expanded = try std.fmt.allocPrint(allocator, "_OBJC_EHTYPE_$_{s}", .{sym_name}); if (self.symbols.contains(expanded)) return; try self.symbols.putNoClobber(allocator, expanded, .{}); } -fn addSymbol(self: *Dylib, allocator: *Allocator, sym_name: []const u8) !void { +fn addSymbol(self: *Dylib, allocator: Allocator, sym_name: []const u8) !void { if (self.symbols.contains(sym_name)) return; try self.symbols.putNoClobber(allocator, try allocator.dupe(u8, sym_name), {}); } const TargetMatcher = struct { - allocator: *Allocator, + allocator: Allocator, target: std.Target, target_strings: std.ArrayListUnmanaged([]const u8) = .{}, - fn init(allocator: *Allocator, target: std.Target) !TargetMatcher { + fn init(allocator: Allocator, target: std.Target) !TargetMatcher { var self = TargetMatcher{ .allocator = allocator, .target = target, @@ -297,7 +297,7 @@ const TargetMatcher = struct { self.target_strings.deinit(self.allocator); } - fn targetToAppleString(allocator: *Allocator, target: std.Target) ![]const u8 { + fn targetToAppleString(allocator: Allocator, target: std.Target) ![]const u8 { const arch = switch (target.cpu.arch) { .aarch64 => "arm64", .x86_64 => "x86_64", @@ -336,7 +336,7 @@ const TargetMatcher = struct { pub fn parseFromStub( self: *Dylib, - allocator: *Allocator, + allocator: Allocator, target: std.Target, lib_stub: LibStub, dependent_libs: anytype, diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index a7db856600..d7cc7c5405 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -74,7 +74,7 @@ const DebugInfo = struct { debug_line: []u8, debug_ranges: []u8, - pub fn parseFromObject(allocator: *Allocator, object: *const Object) !?DebugInfo { + pub fn parseFromObject(allocator: Allocator, object: *const Object) !?DebugInfo { var debug_info = blk: { const index = object.dwarf_debug_info_index orelse return null; break :blk try object.readSection(allocator, index); @@ -118,7 +118,7 @@ const DebugInfo = struct { }; } - pub fn deinit(self: *DebugInfo, allocator: *Allocator) void { + pub fn deinit(self: *DebugInfo, allocator: Allocator) void { allocator.free(self.debug_info); allocator.free(self.debug_abbrev); allocator.free(self.debug_str); @@ -130,7 +130,7 @@ const DebugInfo = struct { } }; -pub fn deinit(self: *Object, allocator: *Allocator) void { +pub fn deinit(self: *Object, allocator: Allocator) void { for (self.load_commands.items) |*lc| { lc.deinit(allocator); } @@ -160,7 +160,7 @@ pub fn deinit(self: *Object, allocator: *Allocator) void { } } -pub fn free(self: *Object, allocator: *Allocator, macho_file: *MachO) void { +pub fn free(self: *Object, allocator: Allocator, macho_file: *MachO) void { log.debug("freeObject {*}", .{self}); var it = self.end_atoms.iterator(); @@ -227,7 +227,7 @@ fn freeAtoms(self: *Object, macho_file: *MachO) void { } } -pub fn parse(self: *Object, allocator: *Allocator, target: std.Target) !void { +pub fn parse(self: *Object, allocator: Allocator, target: std.Target) !void { const reader = self.file.reader(); if (self.file_offset) |offset| { try reader.context.seekTo(offset); @@ -263,7 +263,7 @@ pub fn parse(self: *Object, allocator: *Allocator, target: std.Target) !void { try self.parseDebugInfo(allocator); } -pub fn readLoadCommands(self: *Object, allocator: *Allocator, reader: anytype) !void { +pub fn readLoadCommands(self: *Object, allocator: Allocator, reader: anytype) !void { const header = self.header orelse unreachable; // Unreachable here signifies a fatal unexplored condition. const offset = self.file_offset orelse 0; @@ -381,7 +381,7 @@ fn filterDice(dices: []macho.data_in_code_entry, start_addr: u64, end_addr: u64) return dices[start..end]; } -pub fn parseIntoAtoms(self: *Object, allocator: *Allocator, macho_file: *MachO) !void { +pub fn parseIntoAtoms(self: *Object, allocator: Allocator, macho_file: *MachO) !void { const tracy = trace(@src()); defer tracy.end(); @@ -555,7 +555,7 @@ pub fn parseIntoAtoms(self: *Object, allocator: *Allocator, macho_file: *MachO) } } -fn parseSymtab(self: *Object, allocator: *Allocator) !void { +fn parseSymtab(self: *Object, allocator: Allocator) !void { const index = self.symtab_cmd_index orelse return; const symtab_cmd = self.load_commands.items[index].Symtab; @@ -571,7 +571,7 @@ fn parseSymtab(self: *Object, allocator: *Allocator) !void { try self.strtab.appendSlice(allocator, strtab); } -pub fn parseDebugInfo(self: *Object, allocator: *Allocator) !void { +pub fn parseDebugInfo(self: *Object, allocator: Allocator) !void { log.debug("parsing debug info in '{s}'", .{self.name}); var debug_info = blk: { @@ -603,7 +603,7 @@ pub fn parseDebugInfo(self: *Object, allocator: *Allocator) !void { } } -pub fn parseDataInCode(self: *Object, allocator: *Allocator) !void { +pub fn parseDataInCode(self: *Object, allocator: Allocator) !void { const index = self.data_in_code_cmd_index orelse return; const data_in_code = self.load_commands.items[index].LinkeditData; @@ -623,7 +623,7 @@ pub fn parseDataInCode(self: *Object, allocator: *Allocator) !void { } } -fn readSection(self: Object, allocator: *Allocator, index: u16) ![]u8 { +fn readSection(self: Object, allocator: Allocator, index: u16) ![]u8 { const seg = self.load_commands.items[self.segment_cmd_index.?].Segment; const sect = seg.sections.items[index]; var buffer = try allocator.alloc(u8, @intCast(usize, sect.size)); diff --git a/src/link/MachO/Trie.zig b/src/link/MachO/Trie.zig index c166aaf432..d85aabe63d 100644 --- a/src/link/MachO/Trie.zig +++ b/src/link/MachO/Trie.zig @@ -65,7 +65,7 @@ pub const Node = struct { to: *Node, label: []u8, - fn deinit(self: *Edge, allocator: *Allocator) void { + fn deinit(self: *Edge, allocator: Allocator) void { self.to.deinit(allocator); allocator.destroy(self.to); allocator.free(self.label); @@ -75,7 +75,7 @@ pub const Node = struct { } }; - fn deinit(self: *Node, allocator: *Allocator) void { + fn deinit(self: *Node, allocator: Allocator) void { for (self.edges.items) |*edge| { edge.deinit(allocator); } @@ -83,7 +83,7 @@ pub const Node = struct { } /// Inserts a new node starting from `self`. - fn put(self: *Node, allocator: *Allocator, label: []const u8) !*Node { + fn put(self: *Node, allocator: Allocator, label: []const u8) !*Node { // Check for match with edges from this node. for (self.edges.items) |*edge| { const match = mem.indexOfDiff(u8, edge.label, label) orelse return edge.to; @@ -126,7 +126,7 @@ pub const Node = struct { } /// Recursively parses the node from the input byte stream. - fn read(self: *Node, allocator: *Allocator, reader: anytype) Trie.ReadError!usize { + fn read(self: *Node, allocator: Allocator, reader: anytype) Trie.ReadError!usize { self.node_dirty = true; const trie_offset = try reader.context.getPos(); self.trie_offset = trie_offset; @@ -308,7 +308,7 @@ pub const ExportSymbol = struct { /// Insert a symbol into the trie, updating the prefixes in the process. /// This operation may change the layout of the trie by splicing edges in /// certain circumstances. -pub fn put(self: *Trie, allocator: *Allocator, symbol: ExportSymbol) !void { +pub fn put(self: *Trie, allocator: Allocator, symbol: ExportSymbol) !void { try self.createRoot(allocator); const node = try self.root.?.put(allocator, symbol.name); node.terminal_info = .{ @@ -322,7 +322,7 @@ pub fn put(self: *Trie, allocator: *Allocator, symbol: ExportSymbol) !void { /// This step performs multiple passes through the trie ensuring /// there are no gaps after every `Node` is ULEB128 encoded. /// Call this method before trying to `write` the trie to a byte stream. -pub fn finalize(self: *Trie, allocator: *Allocator) !void { +pub fn finalize(self: *Trie, allocator: Allocator) !void { if (!self.trie_dirty) return; self.ordered_nodes.shrinkRetainingCapacity(0); @@ -361,7 +361,7 @@ const ReadError = error{ }; /// Parse the trie from a byte stream. -pub fn read(self: *Trie, allocator: *Allocator, reader: anytype) ReadError!usize { +pub fn read(self: *Trie, allocator: Allocator, reader: anytype) ReadError!usize { try self.createRoot(allocator); return self.root.?.read(allocator, reader); } @@ -377,7 +377,7 @@ pub fn write(self: Trie, writer: anytype) !u64 { return counting_writer.bytes_written; } -pub fn deinit(self: *Trie, allocator: *Allocator) void { +pub fn deinit(self: *Trie, allocator: Allocator) void { if (self.root) |root| { root.deinit(allocator); allocator.destroy(root); @@ -385,7 +385,7 @@ pub fn deinit(self: *Trie, allocator: *Allocator) void { self.ordered_nodes.deinit(allocator); } -fn createRoot(self: *Trie, allocator: *Allocator) !void { +fn createRoot(self: *Trie, allocator: Allocator) !void { if (self.root == null) { const root = try allocator.create(Node); root.* = .{ .base = self }; diff --git a/src/link/MachO/commands.zig b/src/link/MachO/commands.zig index b3a96c8047..41ea52b9df 100644 --- a/src/link/MachO/commands.zig +++ b/src/link/MachO/commands.zig @@ -50,7 +50,7 @@ pub const LoadCommand = union(enum) { Rpath: GenericCommandWithData(macho.rpath_command), Unknown: GenericCommandWithData(macho.load_command), - pub fn read(allocator: *Allocator, reader: anytype) !LoadCommand { + pub fn read(allocator: Allocator, reader: anytype) !LoadCommand { const header = try reader.readStruct(macho.load_command); var buffer = try allocator.alloc(u8, header.cmdsize); defer allocator.free(buffer); @@ -177,7 +177,7 @@ pub const LoadCommand = union(enum) { }; } - pub fn deinit(self: *LoadCommand, allocator: *Allocator) void { + pub fn deinit(self: *LoadCommand, allocator: Allocator) void { return switch (self.*) { .Segment => |*x| x.deinit(allocator), .Dylinker => |*x| x.deinit(allocator), @@ -218,7 +218,7 @@ pub const SegmentCommand = struct { inner: macho.segment_command_64, sections: std.ArrayListUnmanaged(macho.section_64) = .{}, - pub fn read(alloc: *Allocator, reader: anytype) !SegmentCommand { + pub fn read(alloc: Allocator, reader: anytype) !SegmentCommand { const inner = try reader.readStruct(macho.segment_command_64); var segment = SegmentCommand{ .inner = inner, @@ -241,7 +241,7 @@ pub const SegmentCommand = struct { } } - pub fn deinit(self: *SegmentCommand, alloc: *Allocator) void { + pub fn deinit(self: *SegmentCommand, alloc: Allocator) void { self.sections.deinit(alloc); } @@ -299,7 +299,7 @@ pub fn GenericCommandWithData(comptime Cmd: type) type { const Self = @This(); - pub fn read(allocator: *Allocator, reader: anytype) !Self { + pub fn read(allocator: Allocator, reader: anytype) !Self { const inner = try reader.readStruct(Cmd); var data = try allocator.alloc(u8, inner.cmdsize - @sizeOf(Cmd)); errdefer allocator.free(data); @@ -315,7 +315,7 @@ pub fn GenericCommandWithData(comptime Cmd: type) type { try writer.writeAll(self.data); } - pub fn deinit(self: *Self, allocator: *Allocator) void { + pub fn deinit(self: *Self, allocator: Allocator) void { allocator.free(self.data); } @@ -327,7 +327,7 @@ pub fn GenericCommandWithData(comptime Cmd: type) type { } pub fn createLoadDylibCommand( - allocator: *Allocator, + allocator: Allocator, name: []const u8, timestamp: u32, current_version: u32, @@ -395,7 +395,7 @@ pub fn sectionIsDontDeadStripIfReferencesLive(sect: macho.section_64) bool { return sectionAttrs(sect) & macho.S_ATTR_LIVE_SUPPORT != 0; } -fn testRead(allocator: *Allocator, buffer: []const u8, expected: anytype) !void { +fn testRead(allocator: Allocator, buffer: []const u8, expected: anytype) !void { var stream = io.fixedBufferStream(buffer); var given = try LoadCommand.read(allocator, stream.reader()); defer given.deinit(allocator); diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index b25f095326..7dfbee2a1f 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -132,7 +132,7 @@ pub fn defaultBaseAddrs(arch: std.Target.Cpu.Arch) Bases { pub const PtrWidth = enum { p32, p64 }; -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*Plan9 { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*Plan9 { if (options.use_llvm) return error.LLVMBackendDoesNotSupportPlan9; const sixtyfour_bit: bool = switch (options.target.cpu.arch.ptrBitWidth()) { @@ -168,7 +168,7 @@ fn putFn(self: *Plan9, decl: *Module.Decl, out: FnDeclOutput) !void { try fn_map_res.value_ptr.functions.put(gpa, decl, out); } else { const file = decl.getFileScope(); - const arena = &self.path_arena.allocator; + const arena = self.path_arena.allocator(); // each file gets a symbol fn_map_res.value_ptr.* = .{ .sym_index = blk: { @@ -621,7 +621,7 @@ pub fn deinit(self: *Plan9) void { pub const Export = ?usize; pub const base_tag = .plan9; -pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Options) !*Plan9 { +pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Plan9 { if (options.use_llvm) return error.LLVMBackendDoesNotSupportPlan9; assert(options.object_format == .plan9); diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig index f9d3f7a1e6..7fc54d509e 100644 --- a/src/link/SpirV.zig +++ b/src/link/SpirV.zig @@ -58,7 +58,7 @@ const DeclGenContext = struct { liveness: Liveness, }; -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*SpirV { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*SpirV { const spirv = try gpa.create(SpirV); spirv.* = .{ .base = .{ @@ -87,7 +87,7 @@ pub fn createEmpty(gpa: *Allocator, options: link.Options) !*SpirV { return spirv; } -pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Options) !*SpirV { +pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*SpirV { assert(options.object_format == .spirv); if (options.use_llvm) return error.LLVM_BackendIsTODO_ForSpirV; // TODO: LLVM Doesn't support SpirV at all. diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 8933bdef9f..367f3376f0 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -97,7 +97,7 @@ pub const FnData = struct { }; }; -pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Options) !*Wasm { +pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Wasm { assert(options.object_format == .wasm); if (build_options.have_llvm and options.use_llvm) { @@ -138,7 +138,7 @@ pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Optio return wasm_bin; } -pub fn createEmpty(gpa: *Allocator, options: link.Options) !*Wasm { +pub fn createEmpty(gpa: Allocator, options: link.Options) !*Wasm { const wasm_bin = try gpa.create(Wasm); wasm_bin.* = .{ .base = .{ @@ -950,7 +950,7 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void { var arena_allocator = std.heap.ArenaAllocator.init(self.base.allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const directory = self.base.options.emit.?.directory; // Just an alias to make it shorter to type. diff --git a/src/link/Wasm/Atom.zig b/src/link/Wasm/Atom.zig index 0055955bde..cabd9f1571 100644 --- a/src/link/Wasm/Atom.zig +++ b/src/link/Wasm/Atom.zig @@ -42,7 +42,7 @@ pub const empty: Atom = .{ }; /// Frees all resources owned by this `Atom`. -pub fn deinit(self: *Atom, gpa: *Allocator) void { +pub fn deinit(self: *Atom, gpa: Allocator) void { self.relocs.deinit(gpa); self.code.deinit(gpa); } diff --git a/src/link/tapi.zig b/src/link/tapi.zig index 0bde3100dd..e31ca92ed9 100644 --- a/src/link/tapi.zig +++ b/src/link/tapi.zig @@ -106,7 +106,7 @@ pub const LibStub = struct { /// Typed contents of the tbd file. inner: []Tbd, - pub fn loadFromFile(allocator: *Allocator, file: fs.File) !LibStub { + pub fn loadFromFile(allocator: Allocator, file: fs.File) !LibStub { const source = try file.readToEndAlloc(allocator, std.math.maxInt(u32)); defer allocator.free(source); @@ -120,7 +120,7 @@ pub const LibStub = struct { err: { log.debug("trying to parse as []TbdV4", .{}); const inner = lib_stub.yaml.parse([]TbdV4) catch break :err; - var out = try lib_stub.yaml.arena.allocator.alloc(Tbd, inner.len); + var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, inner.len); for (inner) |doc, i| { out[i] = .{ .v4 = doc }; } @@ -130,7 +130,7 @@ pub const LibStub = struct { err: { log.debug("trying to parse as TbdV4", .{}); const inner = lib_stub.yaml.parse(TbdV4) catch break :err; - var out = try lib_stub.yaml.arena.allocator.alloc(Tbd, 1); + var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, 1); out[0] = .{ .v4 = inner }; break :blk out; } @@ -138,7 +138,7 @@ pub const LibStub = struct { err: { log.debug("trying to parse as []TbdV3", .{}); const inner = lib_stub.yaml.parse([]TbdV3) catch break :err; - var out = try lib_stub.yaml.arena.allocator.alloc(Tbd, inner.len); + var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, inner.len); for (inner) |doc, i| { out[i] = .{ .v3 = doc }; } @@ -148,7 +148,7 @@ pub const LibStub = struct { err: { log.debug("trying to parse as TbdV3", .{}); const inner = lib_stub.yaml.parse(TbdV3) catch break :err; - var out = try lib_stub.yaml.arena.allocator.alloc(Tbd, 1); + var out = try lib_stub.yaml.arena.allocator().alloc(Tbd, 1); out[0] = .{ .v3 = inner }; break :blk out; } diff --git a/src/link/tapi/parse.zig b/src/link/tapi/parse.zig index 0c923f961b..0c40f613dc 100644 --- a/src/link/tapi/parse.zig +++ b/src/link/tapi/parse.zig @@ -37,7 +37,7 @@ pub const Node = struct { return @fieldParentPtr(T, "base", self); } - pub fn deinit(self: *Node, allocator: *Allocator) void { + pub fn deinit(self: *Node, allocator: Allocator) void { switch (self.tag) { .doc => @fieldParentPtr(Node.Doc, "base", self).deinit(allocator), .map => @fieldParentPtr(Node.Map, "base", self).deinit(allocator), @@ -69,7 +69,7 @@ pub const Node = struct { pub const base_tag: Node.Tag = .doc; - pub fn deinit(self: *Doc, allocator: *Allocator) void { + pub fn deinit(self: *Doc, allocator: Allocator) void { if (self.value) |node| { node.deinit(allocator); allocator.destroy(node); @@ -113,7 +113,7 @@ pub const Node = struct { value: *Node, }; - pub fn deinit(self: *Map, allocator: *Allocator) void { + pub fn deinit(self: *Map, allocator: Allocator) void { for (self.values.items) |entry| { entry.value.deinit(allocator); allocator.destroy(entry.value); @@ -149,7 +149,7 @@ pub const Node = struct { pub const base_tag: Node.Tag = .list; - pub fn deinit(self: *List, allocator: *Allocator) void { + pub fn deinit(self: *List, allocator: Allocator) void { for (self.values.items) |node| { node.deinit(allocator); allocator.destroy(node); @@ -198,12 +198,12 @@ pub const Node = struct { }; pub const Tree = struct { - allocator: *Allocator, + allocator: Allocator, source: []const u8, tokens: []Token, docs: std.ArrayListUnmanaged(*Node) = .{}, - pub fn init(allocator: *Allocator) Tree { + pub fn init(allocator: Allocator) Tree { return .{ .allocator = allocator, .source = undefined, @@ -266,7 +266,7 @@ pub const Tree = struct { }; const Parser = struct { - allocator: *Allocator, + allocator: Allocator, tree: *Tree, token_it: *TokenIterator, scopes: std.ArrayListUnmanaged(Scope) = .{}, diff --git a/src/link/tapi/yaml.zig b/src/link/tapi/yaml.zig index 25d2c73e82..7c1997604d 100644 --- a/src/link/tapi/yaml.zig +++ b/src/link/tapi/yaml.zig @@ -149,7 +149,7 @@ pub const Value = union(ValueType) { }; } - fn fromNode(arena: *Allocator, tree: *const Tree, node: *const Node, type_hint: ?ValueType) YamlError!Value { + fn fromNode(arena: Allocator, tree: *const Tree, node: *const Node, type_hint: ?ValueType) YamlError!Value { if (node.cast(Node.Doc)) |doc| { const inner = doc.value orelse { // empty doc @@ -246,17 +246,18 @@ pub const Yaml = struct { } } - pub fn load(allocator: *Allocator, source: []const u8) !Yaml { + pub fn load(allocator: Allocator, source: []const u8) !Yaml { var arena = ArenaAllocator.init(allocator); + const arena_allocator = arena.allocator(); - var tree = Tree.init(&arena.allocator); + var tree = Tree.init(arena_allocator); try tree.parse(source); - var docs = std.ArrayList(Value).init(&arena.allocator); + var docs = std.ArrayList(Value).init(arena_allocator); try docs.ensureUnusedCapacity(tree.docs.items.len); for (tree.docs.items) |node| { - const value = try Value.fromNode(&arena.allocator, &tree, node, null); + const value = try Value.fromNode(arena_allocator, &tree, node, null); docs.appendAssumeCapacity(value); } @@ -299,7 +300,7 @@ pub const Yaml = struct { .Pointer => |info| { switch (info.size) { .Slice => { - var parsed = try self.arena.allocator.alloc(info.child, self.docs.items.len); + var parsed = try self.arena.allocator().alloc(info.child, self.docs.items.len); for (self.docs.items) |doc, i| { parsed[i] = try self.parseValue(info.child, doc); } @@ -361,7 +362,7 @@ pub const Yaml = struct { inline for (struct_info.fields) |field| { const value: ?Value = map.get(field.name) orelse blk: { - const field_name = try mem.replaceOwned(u8, &self.arena.allocator, field.name, "_", "-"); + const field_name = try mem.replaceOwned(u8, self.arena.allocator(), field.name, "_", "-"); break :blk map.get(field_name); }; @@ -382,7 +383,7 @@ pub const Yaml = struct { fn parsePointer(self: *Yaml, comptime T: type, value: Value) Error!T { const ptr_info = @typeInfo(T).Pointer; - const arena = &self.arena.allocator; + const arena = self.arena.allocator(); switch (ptr_info.size) { .Slice => { diff --git a/src/main.zig b/src/main.zig index a0dd94d422..5fd87b8703 100644 --- a/src/main.zig +++ b/src/main.zig @@ -139,7 +139,7 @@ pub fn main() anyerror!void { const gpa = gpa: { if (!builtin.link_libc) { gpa_need_deinit = true; - break :gpa &general_purpose_allocator.allocator; + break :gpa general_purpose_allocator.allocator(); } // We would prefer to use raw libc allocator here, but cannot // use it if it won't support the alignment we need. @@ -153,19 +153,19 @@ pub fn main() anyerror!void { }; var arena_instance = std.heap.ArenaAllocator.init(gpa); defer arena_instance.deinit(); - const arena = &arena_instance.allocator; + const arena = arena_instance.allocator(); const args = try process.argsAlloc(arena); if (tracy.enable_allocation) { var gpa_tracy = tracy.tracyAllocator(gpa); - return mainArgs(&gpa_tracy.allocator, arena, args); + return mainArgs(gpa_tracy.allocator(), arena, args); } return mainArgs(gpa, arena, args); } -pub fn mainArgs(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !void { +pub fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void { if (args.len <= 1) { std.log.info("{s}", .{usage}); fatal("expected command argument", .{}); @@ -536,7 +536,7 @@ const Emit = union(enum) { } }; -fn optionalStringEnvVar(arena: *Allocator, name: []const u8) !?[]const u8 { +fn optionalStringEnvVar(arena: Allocator, name: []const u8) !?[]const u8 { if (std.process.getEnvVarOwned(arena, name)) |value| { return value; } else |err| switch (err) { @@ -555,8 +555,8 @@ const ArgMode = union(enum) { }; fn buildOutputType( - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, all_args: []const []const u8, arg_mode: ArgMode, ) !void { @@ -2648,7 +2648,7 @@ fn buildOutputType( } fn parseCrossTargetOrReportFatalError( - allocator: *Allocator, + allocator: Allocator, opts: std.zig.CrossTarget.ParseOptions, ) !std.zig.CrossTarget { var opts_with_diags = opts; @@ -2689,8 +2689,8 @@ fn parseCrossTargetOrReportFatalError( fn runOrTest( comp: *Compilation, - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, emit_bin_loc: ?Compilation.EmitLoc, test_exec_args: []const ?[]const u8, self_exe_path: []const u8, @@ -2821,7 +2821,7 @@ const AfterUpdateHook = union(enum) { update: []const u8, }; -fn updateModule(gpa: *Allocator, comp: *Compilation, hook: AfterUpdateHook) !void { +fn updateModule(gpa: Allocator, comp: *Compilation, hook: AfterUpdateHook) !void { try comp.update(); var errors = try comp.getAllErrorsAlloc(); @@ -2875,7 +2875,7 @@ fn updateModule(gpa: *Allocator, comp: *Compilation, hook: AfterUpdateHook) !voi } } -fn freePkgTree(gpa: *Allocator, pkg: *Package, free_parent: bool) void { +fn freePkgTree(gpa: Allocator, pkg: *Package, free_parent: bool) void { { var it = pkg.table.valueIterator(); while (it.next()) |value| { @@ -2887,7 +2887,7 @@ fn freePkgTree(gpa: *Allocator, pkg: *Package, free_parent: bool) void { } } -fn cmdTranslateC(comp: *Compilation, arena: *Allocator, enable_cache: bool) !void { +fn cmdTranslateC(comp: *Compilation, arena: Allocator, enable_cache: bool) !void { if (!build_options.have_llvm) fatal("cannot translate-c: compiler built without LLVM extensions", .{}); @@ -3034,7 +3034,7 @@ pub const usage_libc = \\ ; -pub fn cmdLibC(gpa: *Allocator, args: []const []const u8) !void { +pub fn cmdLibC(gpa: Allocator, args: []const []const u8) !void { var input_file: ?[]const u8 = null; var target_arch_os_abi: []const u8 = "native"; { @@ -3103,8 +3103,8 @@ pub const usage_init = ; pub fn cmdInit( - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, args: []const []const u8, output_mode: std.builtin.OutputMode, ) !void { @@ -3199,7 +3199,7 @@ pub const usage_build = \\ ; -pub fn cmdBuild(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !void { +pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void { var prominent_compile_errors: bool = false; // We want to release all the locks before executing the child process, so we make a nice @@ -3439,7 +3439,7 @@ pub fn cmdBuild(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !v } } -fn argvCmd(allocator: *Allocator, argv: []const []const u8) ![]u8 { +fn argvCmd(allocator: Allocator, argv: []const []const u8) ![]u8 { var cmd = std.ArrayList(u8).init(allocator); defer cmd.deinit(); for (argv[0 .. argv.len - 1]) |arg| { @@ -3451,7 +3451,7 @@ fn argvCmd(allocator: *Allocator, argv: []const []const u8) ![]u8 { } fn readSourceFileToEndAlloc( - allocator: *mem.Allocator, + allocator: mem.Allocator, input: *const fs.File, size_hint: ?usize, ) ![:0]u8 { @@ -3521,14 +3521,14 @@ const Fmt = struct { any_error: bool, check_ast: bool, color: Color, - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, out_buffer: std.ArrayList(u8), const SeenMap = std.AutoHashMap(fs.File.INode, void); }; -pub fn cmdFmt(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !void { +pub fn cmdFmt(gpa: Allocator, arena: Allocator, args: []const []const u8) !void { var color: Color = .auto; var stdin_flag: bool = false; var check_flag: bool = false; @@ -3622,7 +3622,7 @@ pub fn cmdFmt(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !voi var errors = std.ArrayList(Compilation.AllErrors.Message).init(gpa); defer errors.deinit(); - try Compilation.AllErrors.addZir(&arena_instance.allocator, &errors, &file); + try Compilation.AllErrors.addZir(arena_instance.allocator(), &errors, &file); const ttyconf: std.debug.TTY.Config = switch (color) { .auto => std.debug.detectTTYConfig(), .on => .escape_codes, @@ -3821,7 +3821,7 @@ fn fmtPathFile( var errors = std.ArrayList(Compilation.AllErrors.Message).init(fmt.gpa); defer errors.deinit(); - try Compilation.AllErrors.addZir(&arena_instance.allocator, &errors, &file); + try Compilation.AllErrors.addZir(arena_instance.allocator(), &errors, &file); const ttyconf: std.debug.TTY.Config = switch (fmt.color) { .auto => std.debug.detectTTYConfig(), .on => .escape_codes, @@ -3858,8 +3858,8 @@ fn fmtPathFile( } fn printErrMsgToStdErr( - gpa: *mem.Allocator, - arena: *mem.Allocator, + gpa: mem.Allocator, + arena: mem.Allocator, parse_error: Ast.Error, tree: Ast, path: []const u8, @@ -3941,7 +3941,7 @@ extern "c" fn ZigClang_main(argc: c_int, argv: [*:null]?[*:0]u8) c_int; extern "c" fn ZigLlvmAr_main(argc: c_int, argv: [*:null]?[*:0]u8) c_int; /// TODO https://github.com/ziglang/zig/issues/3257 -fn punt_to_clang(arena: *Allocator, args: []const []const u8) error{OutOfMemory} { +fn punt_to_clang(arena: Allocator, args: []const []const u8) error{OutOfMemory} { if (!build_options.have_llvm) fatal("`zig cc` and `zig c++` unavailable: compiler built without LLVM extensions", .{}); // Convert the args to the format Clang expects. @@ -3955,7 +3955,7 @@ fn punt_to_clang(arena: *Allocator, args: []const []const u8) error{OutOfMemory} } /// TODO https://github.com/ziglang/zig/issues/3257 -fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemory} { +fn punt_to_llvm_ar(arena: Allocator, args: []const []const u8) error{OutOfMemory} { if (!build_options.have_llvm) fatal("`zig ar`, `zig dlltool`, `zig ranlib', and `zig lib` unavailable: compiler built without LLVM extensions", .{}); @@ -3976,7 +3976,7 @@ fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemor /// * `lld-link` - COFF /// * `wasm-ld` - WebAssembly /// TODO https://github.com/ziglang/zig/issues/3257 -pub fn punt_to_lld(arena: *Allocator, args: []const []const u8) error{OutOfMemory} { +pub fn punt_to_lld(arena: Allocator, args: []const []const u8) error{OutOfMemory} { if (!build_options.have_llvm) fatal("`zig {s}` unavailable: compiler built without LLVM extensions", .{args[0]}); // Convert the args to the format LLD expects. @@ -4012,7 +4012,7 @@ pub const ClangArgIterator = struct { argv: []const []const u8, next_index: usize, root_args: ?*Args, - allocator: *Allocator, + allocator: Allocator, pub const ZigEquivalent = enum { target, @@ -4072,7 +4072,7 @@ pub const ClangArgIterator = struct { argv: []const []const u8, }; - fn init(allocator: *Allocator, argv: []const []const u8) ClangArgIterator { + fn init(allocator: Allocator, argv: []const []const u8) ClangArgIterator { return .{ .next_index = 2, // `zig cc foo` this points to `foo` .has_next = argv.len > 2, @@ -4311,7 +4311,7 @@ test "fds" { gimmeMoreOfThoseSweetSweetFileDescriptors(); } -fn detectNativeTargetInfo(gpa: *Allocator, cross_target: std.zig.CrossTarget) !std.zig.system.NativeTargetInfo { +fn detectNativeTargetInfo(gpa: Allocator, cross_target: std.zig.CrossTarget) !std.zig.system.NativeTargetInfo { return std.zig.system.NativeTargetInfo.detect(gpa, cross_target); } @@ -4346,8 +4346,8 @@ const usage_ast_check = ; pub fn cmdAstCheck( - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, args: []const []const u8, ) !void { const Module = @import("Module.zig"); @@ -4516,8 +4516,8 @@ pub fn cmdAstCheck( /// This is only enabled for debug builds. pub fn cmdChangelist( - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, args: []const []const u8, ) !void { const Module = @import("Module.zig"); diff --git a/src/mingw.zig b/src/mingw.zig index 8738bcbbcd..264740c333 100644 --- a/src/mingw.zig +++ b/src/mingw.zig @@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { } var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); switch (crt_file) { .crt2_o => { @@ -252,7 +252,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { fn add_cc_args( comp: *Compilation, - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), ) error{OutOfMemory}!void { try args.appendSlice(&[_][]const u8{ @@ -281,7 +281,7 @@ fn add_cc_args( pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { var arena_allocator = std.heap.ArenaAllocator.init(comp.gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); const def_file_path = findDef(comp, arena, lib_name) catch |err| switch (err) { error.FileNotFound => { @@ -428,7 +428,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { } /// This function body is verbose but all it does is test 3 different paths and see if a .def file exists. -fn findDef(comp: *Compilation, allocator: *Allocator, lib_name: []const u8) ![]u8 { +fn findDef(comp: *Compilation, allocator: Allocator, lib_name: []const u8) ![]u8 { const target = comp.getTarget(); const lib_path = switch (target.cpu.arch) { diff --git a/src/musl.zig b/src/musl.zig index d0f11af604..cad6246c98 100644 --- a/src/musl.zig +++ b/src/musl.zig @@ -25,7 +25,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { const gpa = comp.gpa; var arena_allocator = std.heap.ArenaAllocator.init(gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); switch (crt_file) { .crti_o => { @@ -310,7 +310,7 @@ const Ext = enum { o3, }; -fn addSrcFile(arena: *Allocator, source_table: *std.StringArrayHashMap(Ext), file_path: []const u8) !void { +fn addSrcFile(arena: Allocator, source_table: *std.StringArrayHashMap(Ext), file_path: []const u8) !void { const ext: Ext = ext: { if (mem.endsWith(u8, file_path, ".c")) { if (mem.startsWith(u8, file_path, "musl/src/malloc/") or @@ -344,7 +344,7 @@ fn addSrcFile(arena: *Allocator, source_table: *std.StringArrayHashMap(Ext), fil fn addCcArgs( comp: *Compilation, - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), want_O3: bool, ) error{OutOfMemory}!void { @@ -394,7 +394,7 @@ fn addCcArgs( }); } -fn start_asm_path(comp: *Compilation, arena: *Allocator, basename: []const u8) ![]const u8 { +fn start_asm_path(comp: *Compilation, arena: Allocator, basename: []const u8) ![]const u8 { const target = comp.getTarget(); return comp.zig_lib_directory.join(arena, &[_][]const u8{ "libc", "musl", "crt", archName(target.cpu.arch), basename, diff --git a/src/print_air.zig b/src/print_air.zig index dc6a1773e7..3e503735b9 100644 --- a/src/print_air.zig +++ b/src/print_air.zig @@ -8,7 +8,7 @@ const Zir = @import("Zir.zig"); const Air = @import("Air.zig"); const Liveness = @import("Liveness.zig"); -pub fn dump(gpa: *Allocator, air: Air, zir: Zir, liveness: Liveness) void { +pub fn dump(gpa: Allocator, air: Air, zir: Zir, liveness: Liveness) void { const instruction_bytes = air.instructions.len * // Here we don't use @sizeOf(Air.Inst.Data) because it would include // the debug safety tag but we want to measure release size. @@ -47,7 +47,7 @@ pub fn dump(gpa: *Allocator, air: Air, zir: Zir, liveness: Liveness) void { var writer: Writer = .{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena.allocator(), .air = air, .zir = zir, .liveness = liveness, @@ -60,8 +60,8 @@ pub fn dump(gpa: *Allocator, air: Air, zir: Zir, liveness: Liveness) void { } const Writer = struct { - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, air: Air, zir: Zir, liveness: Liveness, diff --git a/src/print_env.zig b/src/print_env.zig index 8c44e85e65..15f038c50e 100644 --- a/src/print_env.zig +++ b/src/print_env.zig @@ -4,7 +4,7 @@ const introspect = @import("introspect.zig"); const Allocator = std.mem.Allocator; const fatal = @import("main.zig").fatal; -pub fn cmdEnv(gpa: *Allocator, args: []const []const u8, stdout: std.fs.File.Writer) !void { +pub fn cmdEnv(gpa: Allocator, args: []const []const u8, stdout: std.fs.File.Writer) !void { _ = args; const self_exe_path = try std.fs.selfExePathAlloc(gpa); defer gpa.free(self_exe_path); diff --git a/src/print_targets.zig b/src/print_targets.zig index d0a1d5167a..07335c4668 100644 --- a/src/print_targets.zig +++ b/src/print_targets.zig @@ -11,7 +11,7 @@ const introspect = @import("introspect.zig"); const fatal = @import("main.zig").fatal; pub fn cmdTargets( - allocator: *Allocator, + allocator: Allocator, args: []const []const u8, /// Output stream stdout: anytype, diff --git a/src/print_zir.zig b/src/print_zir.zig index a3988986f0..401d41cd50 100644 --- a/src/print_zir.zig +++ b/src/print_zir.zig @@ -10,7 +10,7 @@ const LazySrcLoc = Module.LazySrcLoc; /// Write human-readable, debug formatted ZIR code to a file. pub fn renderAsTextToFile( - gpa: *Allocator, + gpa: Allocator, scope_file: *Module.File, fs_file: std.fs.File, ) !void { @@ -19,7 +19,7 @@ pub fn renderAsTextToFile( var writer: Writer = .{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena.allocator(), .file = scope_file, .code = scope_file.zir, .indent = 0, @@ -61,7 +61,7 @@ pub fn renderAsTextToFile( } pub fn renderInstructionContext( - gpa: *Allocator, + gpa: Allocator, block: []const Zir.Inst.Index, block_index: usize, scope_file: *Module.File, @@ -74,7 +74,7 @@ pub fn renderInstructionContext( var writer: Writer = .{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena.allocator(), .file = scope_file, .code = scope_file.zir, .indent = if (indent < 2) 2 else indent, @@ -94,7 +94,7 @@ pub fn renderInstructionContext( } pub fn renderSingleInstruction( - gpa: *Allocator, + gpa: Allocator, inst: Zir.Inst.Index, scope_file: *Module.File, parent_decl_node: Ast.Node.Index, @@ -106,7 +106,7 @@ pub fn renderSingleInstruction( var writer: Writer = .{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena.allocator(), .file = scope_file, .code = scope_file.zir, .indent = indent, @@ -120,8 +120,8 @@ pub fn renderSingleInstruction( } const Writer = struct { - gpa: *Allocator, - arena: *Allocator, + gpa: Allocator, + arena: Allocator, file: *Module.File, code: Zir, indent: u32, diff --git a/src/register_manager.zig b/src/register_manager.zig index 47528e53d6..43e19e2ca3 100644 --- a/src/register_manager.zig +++ b/src/register_manager.zig @@ -254,7 +254,7 @@ const MockRegister2 = enum(u2) { fn MockFunction(comptime Register: type) type { return struct { - allocator: *Allocator, + allocator: Allocator, register_manager: RegisterManager(Self, Register, &Register.callee_preserved_regs) = .{}, spilled: std.ArrayListUnmanaged(Register) = .{}, diff --git a/src/stage1.zig b/src/stage1.zig index 942be66889..8e6090af0b 100644 --- a/src/stage1.zig +++ b/src/stage1.zig @@ -38,7 +38,7 @@ pub fn main(argc: c_int, argv: [*][*:0]u8) callconv(.C) c_int { const gpa = std.heap.c_allocator; var arena_instance = std.heap.ArenaAllocator.init(gpa); defer arena_instance.deinit(); - const arena = &arena_instance.allocator; + const arena = arena_instance.allocator(); const args = arena.alloc([]const u8, @intCast(usize, argc)) catch fatal("{s}", .{"OutOfMemory"}); for (args) |*arg, i| { diff --git a/src/test.zig b/src/test.zig index 960aac7bc7..44faea0ed9 100644 --- a/src/test.zig +++ b/src/test.zig @@ -680,7 +680,7 @@ pub const TestContext = struct { } fn runOneCase( - allocator: *Allocator, + allocator: Allocator, root_node: *std.Progress.Node, case: Case, zig_lib_directory: Compilation.Directory, @@ -692,7 +692,7 @@ pub const TestContext = struct { var arena_allocator = std.heap.ArenaAllocator.init(allocator); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); var tmp = std.testing.tmpDir(.{}); defer tmp.cleanup(); diff --git a/src/tracy.zig b/src/tracy.zig index 3ef2df7ca0..9a5bcc749b 100644 --- a/src/tracy.zig +++ b/src/tracy.zig @@ -103,29 +103,27 @@ pub inline fn traceNamed(comptime src: std.builtin.SourceLocation, comptime name } } -pub fn tracyAllocator(allocator: *std.mem.Allocator) TracyAllocator(null) { +pub fn tracyAllocator(allocator: std.mem.Allocator) TracyAllocator(null) { return TracyAllocator(null).init(allocator); } pub fn TracyAllocator(comptime name: ?[:0]const u8) type { return struct { - allocator: std.mem.Allocator, - parent_allocator: *std.mem.Allocator, + parent_allocator: std.mem.Allocator, const Self = @This(); - pub fn init(allocator: *std.mem.Allocator) Self { + pub fn init(parent_allocator: std.mem.Allocator) Self { return .{ - .parent_allocator = allocator, - .allocator = .{ - .allocFn = allocFn, - .resizeFn = resizeFn, - }, + .parent_allocator = parent_allocator, }; } - fn allocFn(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) std.mem.Allocator.Error![]u8 { - const self = @fieldParentPtr(Self, "allocator", allocator); + pub fn allocator(self: *Self) std.mem.Allocator { + return std.mem.Allocator.init(self, allocFn, resizeFn, freeFn); + } + + fn allocFn(self: *Self, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) std.mem.Allocator.Error![]u8 { const result = self.parent_allocator.allocFn(self.parent_allocator, len, ptr_align, len_align, ret_addr); if (result) |data| { if (data.len != 0) { @@ -141,9 +139,7 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type { return result; } - fn resizeFn(allocator: *std.mem.Allocator, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) std.mem.Allocator.Error!usize { - const self = @fieldParentPtr(Self, "allocator", allocator); - + fn resizeFn(self: *Self, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) std.mem.Allocator.Error!usize { if (self.parent_allocator.resizeFn(self.parent_allocator, buf, buf_align, new_len, len_align, ret_addr)) |resized_len| { // this condition is to handle free being called on an empty slice that was never even allocated // example case: `std.process.getSelfExeSharedLibPaths` can return `&[_][:0]u8{}` @@ -155,21 +151,26 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type { } } - if (resized_len != 0) { - // this was a shrink or a resize - if (name) |n| { - allocNamed(buf.ptr, resized_len, n); - } else { - alloc(buf.ptr, resized_len); - } + if (name) |n| { + allocNamed(buf.ptr, resized_len, n); + } else { + alloc(buf.ptr, resized_len); } return resized_len; - } else |err| { - // this is not really an error condition, during normal operation the compiler hits this case thousands of times - // due to this emitting messages for it is both slow and causes clutter - // messageColor("allocation resize failed", 0xFF0000); - return err; + } + + // during normal operation the compiler hits this case thousands of times due to this + // emitting messages for it is both slow and causes clutter + return null; + } + + fn freeFn(self: *Self, buf: []u8, buf_align: u29, ret_addr: usize) void { + self.parent_allocator.rawFree(buf, buf_align, ret_addr); + if (name) |n| { + freeNamed(buf.ptr, n); + } else { + free(buf.ptr); } } }; diff --git a/src/translate_c.zig b/src/translate_c.zig index 627f7e5250..03bb59469a 100644 --- a/src/translate_c.zig +++ b/src/translate_c.zig @@ -305,8 +305,8 @@ const Scope = struct { }; pub const Context = struct { - gpa: *mem.Allocator, - arena: *mem.Allocator, + gpa: mem.Allocator, + arena: mem.Allocator, source_manager: *clang.SourceManager, decl_table: std.AutoArrayHashMapUnmanaged(usize, []const u8) = .{}, alias_list: AliasList, @@ -351,7 +351,7 @@ pub const Context = struct { }; pub fn translate( - gpa: *mem.Allocator, + gpa: mem.Allocator, args_begin: [*]?[*]const u8, args_end: [*]?[*]const u8, errors: *[]ClangErrMsg, @@ -373,13 +373,14 @@ pub fn translate( // from this function. var arena = std.heap.ArenaAllocator.init(gpa); errdefer arena.deinit(); + const arena_allocator = arena.allocator(); var context = Context{ .gpa = gpa, - .arena = &arena.allocator, + .arena = arena_allocator, .source_manager = ast_unit.getSourceManager(), .alias_list = AliasList.init(gpa), - .global_scope = try arena.allocator.create(Scope.Root), + .global_scope = try arena_allocator.create(Scope.Root), .clang_context = ast_unit.getASTContext(), .pattern_list = try PatternList.init(gpa), }; @@ -1448,7 +1449,7 @@ fn makeShuffleMask(c: *Context, scope: *Scope, expr: *const clang.ShuffleVectorE } /// @typeInfo(@TypeOf(vec_node)).Vector.<field> -fn vectorTypeInfo(arena: *mem.Allocator, vec_node: Node, field: []const u8) TransError!Node { +fn vectorTypeInfo(arena: mem.Allocator, vec_node: Node, field: []const u8) TransError!Node { const typeof_call = try Tag.typeof.create(arena, vec_node); const typeinfo_call = try Tag.typeinfo.create(arena, typeof_call); const vector_type_info = try Tag.field_access.create(arena, .{ .lhs = typeinfo_call, .field_name = "Vector" }); @@ -1536,7 +1537,7 @@ fn transOffsetOfExpr( /// will become very large positive numbers but that is ok since we only use this in /// pointer arithmetic expressions, where wraparound will ensure we get the correct value. /// node -> @bitCast(usize, @intCast(isize, node)) -fn usizeCastForWrappingPtrArithmetic(gpa: *mem.Allocator, node: Node) TransError!Node { +fn usizeCastForWrappingPtrArithmetic(gpa: mem.Allocator, node: Node) TransError!Node { const intcast_node = try Tag.int_cast.create(gpa, .{ .lhs = try Tag.type.create(gpa, "isize"), .rhs = node, @@ -5072,7 +5073,7 @@ const PatternList = struct { }; /// Assumes that `ms` represents a tokenized function-like macro. - fn buildArgsHash(allocator: *mem.Allocator, ms: MacroSlicer, hash: *ArgsPositionMap) MacroProcessingError!void { + fn buildArgsHash(allocator: mem.Allocator, ms: MacroSlicer, hash: *ArgsPositionMap) MacroProcessingError!void { assert(ms.tokens.len > 2); assert(ms.tokens[0].id == .Identifier); assert(ms.tokens[1].id == .LParen); @@ -5098,7 +5099,7 @@ const PatternList = struct { impl: []const u8, args_hash: ArgsPositionMap, - fn init(self: *Pattern, allocator: *mem.Allocator, template: [2][]const u8) Error!void { + fn init(self: *Pattern, allocator: mem.Allocator, template: [2][]const u8) Error!void { const source = template[0]; const impl = template[1]; @@ -5120,7 +5121,7 @@ const PatternList = struct { }; } - fn deinit(self: *Pattern, allocator: *mem.Allocator) void { + fn deinit(self: *Pattern, allocator: mem.Allocator) void { self.args_hash.deinit(allocator); allocator.free(self.tokens); } @@ -5171,7 +5172,7 @@ const PatternList = struct { } }; - fn init(allocator: *mem.Allocator) Error!PatternList { + fn init(allocator: mem.Allocator) Error!PatternList { const patterns = try allocator.alloc(Pattern, templates.len); for (templates) |template, i| { try patterns[i].init(allocator, template); @@ -5179,12 +5180,12 @@ const PatternList = struct { return PatternList{ .patterns = patterns }; } - fn deinit(self: *PatternList, allocator: *mem.Allocator) void { + fn deinit(self: *PatternList, allocator: mem.Allocator) void { for (self.patterns) |*pattern| pattern.deinit(allocator); allocator.free(self.patterns); } - fn match(self: PatternList, allocator: *mem.Allocator, ms: MacroSlicer) Error!?Pattern { + fn match(self: PatternList, allocator: mem.Allocator, ms: MacroSlicer) Error!?Pattern { var args_hash: ArgsPositionMap = .{}; defer args_hash.deinit(allocator); @@ -5211,7 +5212,7 @@ const MacroSlicer = struct { test "Macro matching" { const helper = struct { const MacroFunctions = @import("std").zig.c_translation.Macros; - fn checkMacro(allocator: *mem.Allocator, pattern_list: PatternList, source: []const u8, comptime expected_match: ?[]const u8) !void { + fn checkMacro(allocator: mem.Allocator, pattern_list: PatternList, source: []const u8, comptime expected_match: ?[]const u8) !void { var tok_list = std.ArrayList(CToken).init(allocator); defer tok_list.deinit(); try tokenizeMacro(source, &tok_list); diff --git a/src/translate_c/ast.zig b/src/translate_c/ast.zig index a4e64e1966..96de020b0c 100644 --- a/src/translate_c/ast.zig +++ b/src/translate_c/ast.zig @@ -378,7 +378,7 @@ pub const Node = extern union { return .{ .tag_if_small_enough = @enumToInt(t) }; } - pub fn create(comptime t: Tag, ally: *Allocator, data: Data(t)) error{OutOfMemory}!Node { + pub fn create(comptime t: Tag, ally: Allocator, data: Data(t)) error{OutOfMemory}!Node { const ptr = try ally.create(t.Type()); ptr.* = .{ .base = .{ .tag = t }, @@ -717,7 +717,7 @@ pub const Payload = struct { /// Converts the nodes into a Zig Ast. /// Caller must free the source slice. -pub fn render(gpa: *Allocator, nodes: []const Node) !std.zig.Ast { +pub fn render(gpa: Allocator, nodes: []const Node) !std.zig.Ast { var ctx = Context{ .gpa = gpa, .buf = std.ArrayList(u8).init(gpa), @@ -783,7 +783,7 @@ const TokenIndex = std.zig.Ast.TokenIndex; const TokenTag = std.zig.Token.Tag; const Context = struct { - gpa: *Allocator, + gpa: Allocator, buf: std.ArrayList(u8) = .{}, nodes: std.zig.Ast.NodeList = .{}, extra_data: std.ArrayListUnmanaged(std.zig.Ast.Node.Index) = .{}, diff --git a/src/type.zig b/src/type.zig index 33add3e0d1..979c5251d7 100644 --- a/src/type.zig +++ b/src/type.zig @@ -728,7 +728,7 @@ pub const Type = extern union { } }; - pub fn copy(self: Type, allocator: *Allocator) error{OutOfMemory}!Type { + pub fn copy(self: Type, allocator: Allocator) error{OutOfMemory}!Type { if (@enumToInt(self.tag_if_small_enough) < Tag.no_payload_count) { return Type{ .tag_if_small_enough = self.tag_if_small_enough }; } else switch (self.ptr_otherwise.tag) { @@ -905,7 +905,7 @@ pub const Type = extern union { } } - fn copyPayloadShallow(self: Type, allocator: *Allocator, comptime T: type) error{OutOfMemory}!Type { + fn copyPayloadShallow(self: Type, allocator: Allocator, comptime T: type) error{OutOfMemory}!Type { const payload = self.cast(T).?; const new_payload = try allocator.create(T); new_payload.* = payload.*; @@ -1198,7 +1198,7 @@ pub const Type = extern union { } /// Returns a name suitable for `@typeName`. - pub fn nameAlloc(ty: Type, arena: *Allocator) Allocator.Error![:0]const u8 { + pub fn nameAlloc(ty: Type, arena: Allocator) Allocator.Error![:0]const u8 { const t = ty.tag(); switch (t) { .inferred_alloc_const => unreachable, @@ -1421,7 +1421,7 @@ pub const Type = extern union { }; } - pub fn toValue(self: Type, allocator: *Allocator) Allocator.Error!Value { + pub fn toValue(self: Type, allocator: Allocator) Allocator.Error!Value { switch (self.tag()) { .u1 => return Value.initTag(.u1_type), .u8 => return Value.initTag(.u8_type), @@ -2676,7 +2676,7 @@ pub const Type = extern union { /// For [*]T, returns *T /// For []T, returns *T /// Handles const-ness and address spaces in particular. - pub fn elemPtrType(ptr_ty: Type, arena: *Allocator) !Type { + pub fn elemPtrType(ptr_ty: Type, arena: Allocator) !Type { return try Type.ptr(arena, .{ .pointee_type = ptr_ty.elemType2(), .mutable = ptr_ty.ptrIsMutable(), @@ -2731,7 +2731,7 @@ pub const Type = extern union { /// Asserts that the type is an optional. /// Same as `optionalChild` but allocates the buffer if needed. - pub fn optionalChildAlloc(ty: Type, allocator: *Allocator) !Type { + pub fn optionalChildAlloc(ty: Type, allocator: Allocator) !Type { switch (ty.tag()) { .optional => return ty.castTag(.optional).?.data, .optional_single_mut_pointer => { @@ -3379,7 +3379,7 @@ pub const Type = extern union { } /// Asserts that self.zigTypeTag() == .Int. - pub fn minInt(self: Type, arena: *Allocator, target: Target) !Value { + pub fn minInt(self: Type, arena: Allocator, target: Target) !Value { assert(self.zigTypeTag() == .Int); const info = self.intInfo(target); @@ -3404,7 +3404,7 @@ pub const Type = extern union { } /// Asserts that self.zigTypeTag() == .Int. - pub fn maxInt(self: Type, arena: *Allocator, target: Target) !Value { + pub fn maxInt(self: Type, arena: Allocator, target: Target) !Value { assert(self.zigTypeTag() == .Int); const info = self.intInfo(target); @@ -4008,7 +4008,7 @@ pub const Type = extern union { return .{ .tag_if_small_enough = t }; } - pub fn create(comptime t: Tag, ally: *Allocator, data: Data(t)) error{OutOfMemory}!file_struct.Type { + pub fn create(comptime t: Tag, ally: Allocator, data: Data(t)) error{OutOfMemory}!file_struct.Type { const p = try ally.create(t.Type()); p.* = .{ .base = .{ .tag = t }, @@ -4104,7 +4104,7 @@ pub const Type = extern union { functions: std.AutoHashMapUnmanaged(*Module.Fn, void), is_anyerror: bool, - pub fn addErrorSet(self: *Data, gpa: *Allocator, err_set_ty: Type) !void { + pub fn addErrorSet(self: *Data, gpa: Allocator, err_set_ty: Type) !void { switch (err_set_ty.tag()) { .error_set => { const names = err_set_ty.castTag(.error_set).?.data.names(); @@ -4225,7 +4225,7 @@ pub const Type = extern union { pub const @"type" = initTag(.type); pub const @"anyerror" = initTag(.anyerror); - pub fn ptr(arena: *Allocator, d: Payload.Pointer.Data) !Type { + pub fn ptr(arena: Allocator, d: Payload.Pointer.Data) !Type { assert(d.host_size == 0 or d.bit_offset < d.host_size * 8); if (d.sentinel != null or d.@"align" != 0 or d.@"addrspace" != .generic or @@ -4260,7 +4260,7 @@ pub const Type = extern union { } pub fn array( - arena: *Allocator, + arena: Allocator, len: u64, sent: ?Value, elem_type: Type, @@ -4289,14 +4289,14 @@ pub const Type = extern union { }); } - pub fn vector(arena: *Allocator, len: u64, elem_type: Type) Allocator.Error!Type { + pub fn vector(arena: Allocator, len: u64, elem_type: Type) Allocator.Error!Type { return Tag.vector.create(arena, .{ .len = len, .elem_type = elem_type, }); } - pub fn optional(arena: *Allocator, child_type: Type) Allocator.Error!Type { + pub fn optional(arena: Allocator, child_type: Type) Allocator.Error!Type { switch (child_type.tag()) { .single_const_pointer => return Type.Tag.optional_single_const_pointer.create( arena, @@ -4317,7 +4317,7 @@ pub const Type = extern union { return @intCast(u16, base + @boolToInt(upper < max)); } - pub fn smallestUnsignedInt(arena: *Allocator, max: u64) !Type { + pub fn smallestUnsignedInt(arena: Allocator, max: u64) !Type { const bits = smallestUnsignedBits(max); return switch (bits) { 1 => initTag(.u1), diff --git a/src/value.zig b/src/value.zig index 1f08a8e336..02e27cd498 100644 --- a/src/value.zig +++ b/src/value.zig @@ -297,7 +297,7 @@ pub const Value = extern union { }; } - pub fn create(comptime t: Tag, ally: *Allocator, data: Data(t)) error{OutOfMemory}!Value { + pub fn create(comptime t: Tag, ally: Allocator, data: Data(t)) error{OutOfMemory}!Value { const ptr = try ally.create(t.Type()); ptr.* = .{ .base = .{ .tag = t }, @@ -363,7 +363,7 @@ pub const Value = extern union { /// It's intentional that this function is not passed a corresponding Type, so that /// a Value can be copied from a Sema to a Decl prior to resolving struct/union field types. - pub fn copy(self: Value, arena: *Allocator) error{OutOfMemory}!Value { + pub fn copy(self: Value, arena: Allocator) error{OutOfMemory}!Value { if (@enumToInt(self.tag_if_small_enough) < Tag.no_payload_count) { return Value{ .tag_if_small_enough = self.tag_if_small_enough }; } else switch (self.ptr_otherwise.tag) { @@ -578,7 +578,7 @@ pub const Value = extern union { } } - fn copyPayloadShallow(self: Value, arena: *Allocator, comptime T: type) error{OutOfMemory}!Value { + fn copyPayloadShallow(self: Value, arena: Allocator, comptime T: type) error{OutOfMemory}!Value { const payload = self.cast(T).?; const new_payload = try arena.create(T); new_payload.* = payload.*; @@ -747,7 +747,7 @@ pub const Value = extern union { /// Asserts that the value is representable as an array of bytes. /// Copies the value into a freshly allocated slice of memory, which is owned by the caller. - pub fn toAllocatedBytes(val: Value, ty: Type, allocator: *Allocator) ![]u8 { + pub fn toAllocatedBytes(val: Value, ty: Type, allocator: Allocator) ![]u8 { switch (val.tag()) { .bytes => { const bytes = val.castTag(.bytes).?.data; @@ -1035,7 +1035,7 @@ pub const Value = extern union { } } - pub fn readFromMemory(ty: Type, target: Target, buffer: []const u8, arena: *Allocator) !Value { + pub fn readFromMemory(ty: Type, target: Target, buffer: []const u8, arena: Allocator) !Value { switch (ty.zigTypeTag()) { .Int => { const int_info = ty.intInfo(target); @@ -1185,7 +1185,7 @@ pub const Value = extern union { } } - pub fn popCount(val: Value, ty: Type, target: Target, arena: *Allocator) !Value { + pub fn popCount(val: Value, ty: Type, target: Target, arena: Allocator) !Value { assert(!val.isUndef()); const info = ty.intInfo(target); @@ -1273,7 +1273,7 @@ pub const Value = extern union { /// Converts an integer or a float to a float. May result in a loss of information. /// Caller can find out by equality checking the result against the operand. - pub fn floatCast(self: Value, arena: *Allocator, dest_ty: Type) !Value { + pub fn floatCast(self: Value, arena: Allocator, dest_ty: Type) !Value { switch (dest_ty.tag()) { .f16 => return Value.Tag.float_16.create(arena, self.toFloat(f16)), .f32 => return Value.Tag.float_32.create(arena, self.toFloat(f32)), @@ -1678,7 +1678,7 @@ pub const Value = extern union { /// Asserts the value is a single-item pointer to an array, or an array, /// or an unknown-length pointer, and returns the element value at the index. - pub fn elemValue(val: Value, arena: *Allocator, index: usize) !Value { + pub fn elemValue(val: Value, arena: Allocator, index: usize) !Value { return elemValueAdvanced(val, index, arena, undefined); } @@ -1691,7 +1691,7 @@ pub const Value = extern union { pub fn elemValueAdvanced( val: Value, index: usize, - arena: ?*Allocator, + arena: ?Allocator, buffer: *ElemValueBuffer, ) error{OutOfMemory}!Value { switch (val.tag()) { @@ -1732,7 +1732,7 @@ pub const Value = extern union { } } - pub fn fieldValue(val: Value, allocator: *Allocator, index: usize) error{OutOfMemory}!Value { + pub fn fieldValue(val: Value, allocator: Allocator, index: usize) error{OutOfMemory}!Value { _ = allocator; switch (val.tag()) { .@"struct" => { @@ -1760,7 +1760,7 @@ pub const Value = extern union { } /// Returns a pointer to the element value at the index. - pub fn elemPtr(self: Value, allocator: *Allocator, index: usize) !Value { + pub fn elemPtr(self: Value, allocator: Allocator, index: usize) !Value { switch (self.tag()) { .elem_ptr => { const elem_ptr = self.castTag(.elem_ptr).?.data; @@ -1874,7 +1874,7 @@ pub const Value = extern union { }; } - pub fn intToFloat(val: Value, arena: *Allocator, dest_ty: Type, target: Target) !Value { + pub fn intToFloat(val: Value, arena: Allocator, dest_ty: Type, target: Target) !Value { switch (val.tag()) { .undef, .zero, .one => return val, .the_only_possible_value => return Value.initTag(.zero), // for i0, u0 @@ -1898,7 +1898,7 @@ pub const Value = extern union { } } - fn intToFloatInner(x: anytype, arena: *Allocator, dest_ty: Type, target: Target) !Value { + fn intToFloatInner(x: anytype, arena: Allocator, dest_ty: Type, target: Target) !Value { switch (dest_ty.floatBits(target)) { 16 => return Value.Tag.float_16.create(arena, @intToFloat(f16, x)), 32 => return Value.Tag.float_32.create(arena, @intToFloat(f32, x)), @@ -1908,7 +1908,7 @@ pub const Value = extern union { } } - fn floatToValue(float: f128, arena: *Allocator, dest_ty: Type, target: Target) !Value { + fn floatToValue(float: f128, arena: Allocator, dest_ty: Type, target: Target) !Value { switch (dest_ty.floatBits(target)) { 16 => return Value.Tag.float_16.create(arena, @floatCast(f16, float)), 32 => return Value.Tag.float_32.create(arena, @floatCast(f32, float)), @@ -1918,7 +1918,7 @@ pub const Value = extern union { } } - pub fn floatToInt(val: Value, arena: *Allocator, dest_ty: Type, target: Target) error{ FloatCannotFit, OutOfMemory }!Value { + pub fn floatToInt(val: Value, arena: Allocator, dest_ty: Type, target: Target) error{ FloatCannotFit, OutOfMemory }!Value { const Limb = std.math.big.Limb; var value = val.toFloat(f64); // TODO: f128 ? @@ -1969,7 +1969,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); @@ -1993,7 +1993,7 @@ pub const Value = extern union { return fromBigInt(arena, result_bigint.toConst()); } - fn fromBigInt(arena: *Allocator, big_int: BigIntConst) !Value { + fn fromBigInt(arena: Allocator, big_int: BigIntConst) !Value { if (big_int.positive) { if (big_int.to(u64)) |x| { return Value.Tag.int_u64.create(arena, x); @@ -2014,7 +2014,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { assert(!lhs.isUndef()); @@ -2040,7 +2040,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); @@ -2069,7 +2069,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { assert(!lhs.isUndef()); @@ -2095,7 +2095,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); @@ -2129,7 +2129,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { assert(!lhs.isUndef()); @@ -2185,7 +2185,7 @@ pub const Value = extern union { } /// operands must be integers; handles undefined. - pub fn bitwiseNot(val: Value, ty: Type, arena: *Allocator, target: Target) !Value { + pub fn bitwiseNot(val: Value, ty: Type, arena: Allocator, target: Target) !Value { if (val.isUndef()) return Value.initTag(.undef); const info = ty.intInfo(target); @@ -2205,7 +2205,7 @@ pub const Value = extern union { } /// operands must be integers; handles undefined. - pub fn bitwiseAnd(lhs: Value, rhs: Value, arena: *Allocator) !Value { + pub fn bitwiseAnd(lhs: Value, rhs: Value, arena: Allocator) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); // TODO is this a performance issue? maybe we should try the operation without @@ -2225,7 +2225,7 @@ pub const Value = extern union { } /// operands must be integers; handles undefined. - pub fn bitwiseNand(lhs: Value, rhs: Value, ty: Type, arena: *Allocator, target: Target) !Value { + pub fn bitwiseNand(lhs: Value, rhs: Value, ty: Type, arena: Allocator, target: Target) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); const anded = try bitwiseAnd(lhs, rhs, arena); @@ -2239,7 +2239,7 @@ pub const Value = extern union { } /// operands must be integers; handles undefined. - pub fn bitwiseOr(lhs: Value, rhs: Value, arena: *Allocator) !Value { + pub fn bitwiseOr(lhs: Value, rhs: Value, arena: Allocator) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); // TODO is this a performance issue? maybe we should try the operation without @@ -2258,7 +2258,7 @@ pub const Value = extern union { } /// operands must be integers; handles undefined. - pub fn bitwiseXor(lhs: Value, rhs: Value, arena: *Allocator) !Value { + pub fn bitwiseXor(lhs: Value, rhs: Value, arena: Allocator) !Value { if (lhs.isUndef() or rhs.isUndef()) return Value.initTag(.undef); // TODO is this a performance issue? maybe we should try the operation without @@ -2277,7 +2277,7 @@ pub const Value = extern union { return fromBigInt(arena, result_bigint.toConst()); } - pub fn intAdd(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intAdd(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2293,7 +2293,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_bigint.toConst()); } - pub fn intSub(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intSub(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2309,7 +2309,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_bigint.toConst()); } - pub fn intDiv(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intDiv(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2334,7 +2334,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_q.toConst()); } - pub fn intDivFloor(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intDivFloor(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2359,7 +2359,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_q.toConst()); } - pub fn intRem(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intRem(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2386,7 +2386,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_r.toConst()); } - pub fn intMod(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intMod(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2422,21 +2422,21 @@ pub const Value = extern union { }; } - pub fn floatRem(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn floatRem(lhs: Value, rhs: Value, allocator: Allocator) !Value { _ = lhs; _ = rhs; _ = allocator; @panic("TODO implement Value.floatRem"); } - pub fn floatMod(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn floatMod(lhs: Value, rhs: Value, allocator: Allocator) !Value { _ = lhs; _ = rhs; _ = allocator; @panic("TODO implement Value.floatMod"); } - pub fn intMul(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn intMul(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2457,7 +2457,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_bigint.toConst()); } - pub fn intTrunc(val: Value, allocator: *Allocator, signedness: std.builtin.Signedness, bits: u16) !Value { + pub fn intTrunc(val: Value, allocator: Allocator, signedness: std.builtin.Signedness, bits: u16) !Value { var val_space: Value.BigIntSpace = undefined; const val_bigint = val.toBigInt(&val_space); @@ -2471,7 +2471,7 @@ pub const Value = extern union { return fromBigInt(allocator, result_bigint.toConst()); } - pub fn shl(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn shl(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2494,7 +2494,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, ty: Type, - arena: *Allocator, + arena: Allocator, target: Target, ) !Value { // TODO is this a performance issue? maybe we should try the operation without @@ -2517,7 +2517,7 @@ pub const Value = extern union { return fromBigInt(arena, result_bigint.toConst()); } - pub fn shr(lhs: Value, rhs: Value, allocator: *Allocator) !Value { + pub fn shr(lhs: Value, rhs: Value, allocator: Allocator) !Value { // TODO is this a performance issue? maybe we should try the operation without // resorting to BigInt first. var lhs_space: Value.BigIntSpace = undefined; @@ -2540,7 +2540,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { @@ -2571,7 +2571,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { @@ -2602,7 +2602,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { @@ -2633,7 +2633,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { @@ -2664,7 +2664,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { @@ -2695,7 +2695,7 @@ pub const Value = extern union { lhs: Value, rhs: Value, float_type: Type, - arena: *Allocator, + arena: Allocator, ) !Value { switch (float_type.tag()) { .f16 => { diff --git a/src/wasi_libc.zig b/src/wasi_libc.zig index 0ef8d4f4d4..fb60c98e56 100644 --- a/src/wasi_libc.zig +++ b/src/wasi_libc.zig @@ -67,7 +67,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { const gpa = comp.gpa; var arena_allocator = std.heap.ArenaAllocator.init(gpa); defer arena_allocator.deinit(); - const arena = &arena_allocator.allocator; + const arena = arena_allocator.allocator(); switch (crt_file) { .crt1_reactor_o => { @@ -243,7 +243,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { } } -fn sanitize(arena: *Allocator, file_path: []const u8) ![]const u8 { +fn sanitize(arena: Allocator, file_path: []const u8) ![]const u8 { // TODO do this at comptime on the comptime data rather than at runtime // probably best to wait until self-hosted is done and our comptime execution // is faster and uses less memory. @@ -261,7 +261,7 @@ fn sanitize(arena: *Allocator, file_path: []const u8) ![]const u8 { fn addCCArgs( comp: *Compilation, - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), want_O3: bool, ) error{OutOfMemory}!void { @@ -292,7 +292,7 @@ fn addCCArgs( fn addLibcBottomHalfIncludes( comp: *Compilation, - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), ) error{OutOfMemory}!void { try args.appendSlice(&[_][]const u8{ @@ -328,7 +328,7 @@ fn addLibcBottomHalfIncludes( fn addLibcTopHalfIncludes( comp: *Compilation, - arena: *Allocator, + arena: Allocator, args: *std.ArrayList([]const u8), ) error{OutOfMemory}!void { try args.appendSlice(&[_][]const u8{ |