authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-10-19 01:02:29-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-10-23 16:27:38-07:00
log2d8ea78249c85552225db8f50b45e2e71ba85a41
treef042ef9da464e39dfb645e4bb42c176c46065011
parentab33d2e7a90346be43693a7dd0e2276e894a67ba

link.Elf: remove ZigObject from files

By making it a field of link.Elf, it is now accessible without a data dependency on `files`, fixing a race condition with the codegen thread and linker thread.

2 files changed, 21 insertions(+), 15 deletions(-)

src/link/Elf.zig+19-13
......@@ -1,6 +1,7 @@
11pub const Atom = @import("Elf/Atom.zig");
22
33base: link.File,
4zig_object: ?*ZigObject,
45rpath_table: std.StringArrayHashMapUnmanaged(void),
56image_base: u64,
67emit_relocs: bool,
......@@ -299,6 +300,7 @@ pub fn createEmpty(
299300 .disable_lld_caching = options.disable_lld_caching,
300301 .build_id = options.build_id,
301302 },
303 .zig_object = null,
302304 .rpath_table = rpath_table,
303305 .ptr_width = ptr_width,
304306 .page_size = page_size,
......@@ -423,14 +425,17 @@ pub fn createEmpty(
423425 if (opt_zcu) |zcu| {
424426 if (!use_llvm) {
425427 const index: File.Index = @intCast(try self.files.addOne(gpa));
426 self.files.set(index, .{ .zig_object = .{
428 self.files.set(index, .zig_object);
429 self.zig_object_index = index;
430 const zig_object = try arena.create(ZigObject);
431 self.zig_object = zig_object;
432 zig_object.* = .{
427433 .index = index,
428434 .basename = try std.fmt.allocPrint(arena, "{s}.o", .{
429435 fs.path.stem(zcu.main_mod.root_src_path),
430436 }),
431 } });
432 self.zig_object_index = index;
433 try self.zigObjectPtr().?.init(self, .{
437 };
438 try zig_object.init(self, .{
434439 .symbol_count_hint = options.symbol_count_hint,
435440 .program_code_size_hint = options.program_code_size_hint,
436441 });
......@@ -462,12 +467,14 @@ pub fn deinit(self: *Elf) void {
462467 self.file_handles.deinit(gpa);
463468
464469 for (self.files.items(.tags), self.files.items(.data)) |tag, *data| switch (tag) {
465 .null => {},
466 .zig_object => data.zig_object.deinit(gpa),
470 .null, .zig_object => {},
467471 .linker_defined => data.linker_defined.deinit(gpa),
468472 .object => data.object.deinit(gpa),
469473 .shared_object => data.shared_object.deinit(gpa),
470474 };
475 if (self.zig_object) |zig_object| {
476 zig_object.deinit(gpa);
477 }
471478 self.files.deinit(gpa);
472479 self.objects.deinit(gpa);
473480 self.shared_objects.deinit(gpa);
......@@ -1242,7 +1249,7 @@ fn parseDso(
12421249 .output_symtab_ctx = .{},
12431250 },
12441251 });
1245 const so = fileLookup(files.*, index).?.shared_object;
1252 const so = fileLookup(files.*, index, null).?.shared_object;
12461253
12471254 // TODO: save this work for later
12481255 const nsyms = parsed.symbols.len;
......@@ -3118,7 +3125,7 @@ pub fn sortShdrs(
31183125 for (slice.items(.shdr), slice.items(.atom_list_2)) |*shdr, *atom_list| {
31193126 atom_list.output_section_index = backlinks[atom_list.output_section_index];
31203127 for (atom_list.atoms.keys()) |ref| {
3121 fileLookup(files, ref.file).?.atom(ref.index).?.output_section_index = atom_list.output_section_index;
3128 fileLookup(files, ref.file, zig_object_ptr).?.atom(ref.index).?.output_section_index = atom_list.output_section_index;
31223129 }
31233130 if (shdr.sh_type == elf.SHT_RELA) {
31243131 // FIXME:JK we should spin up .symtab potentially earlier, or set all non-dynamic RELA sections
......@@ -4348,15 +4355,15 @@ pub fn thunk(self: *Elf, index: Thunk.Index) *Thunk {
43484355}
43494356
43504357pub fn file(self: *Elf, index: File.Index) ?File {
4351 return fileLookup(self.files, index);
4358 return fileLookup(self.files, index, self.zig_object);
43524359}
43534360
4354fn fileLookup(files: std.MultiArrayList(File.Entry), index: File.Index) ?File {
4361fn fileLookup(files: std.MultiArrayList(File.Entry), index: File.Index, zig_object: ?*ZigObject) ?File {
43554362 const tag = files.items(.tags)[index];
43564363 return switch (tag) {
43574364 .null => null,
43584365 .linker_defined => .{ .linker_defined = &files.items(.data)[index].linker_defined },
4359 .zig_object => .{ .zig_object = &files.items(.data)[index].zig_object },
4366 .zig_object => .{ .zig_object = zig_object.? },
43604367 .object => .{ .object = &files.items(.data)[index].object },
43614368 .shared_object => .{ .shared_object = &files.items(.data)[index].shared_object },
43624369 };
......@@ -4394,8 +4401,7 @@ pub fn getGlobalSymbol(self: *Elf, name: []const u8, lib_name: ?[]const u8) !u32
43944401}
43954402
43964403pub fn zigObjectPtr(self: *Elf) ?*ZigObject {
4397 const index = self.zig_object_index orelse return null;
4398 return self.file(index).?.zig_object;
4404 return self.zig_object;
43994405}
44004406
44014407pub fn linkerDefinedPtr(self: *Elf) ?*LinkerDefined {
src/link/Elf/file.zig+2-2
......@@ -279,8 +279,8 @@ pub const File = union(enum) {
279279 pub const Index = u32;
280280
281281 pub const Entry = union(enum) {
282 null: void,
283 zig_object: ZigObject,
282 null,
283 zig_object,
284284 linker_defined: LinkerDefined,
285285 object: Object,
286286 shared_object: SharedObject,