authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-05-01 13:41:42+02:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-05-01 19:22:52-04:00
log565f8979cc38d46b8b905f3a8b7db03238779ffc
tree2edf8690b21953f2c9c90854ffea0b2a1f38b821
parent7064d7dbf0157aed9b497e1158243e472082633f

link: fix accessing source atom's symbol index in codegen

Since the owner can either be a `Decl` or a `LazySymbol` we need to preserve this information at the codegen generate function level so that we can then correctly work out the corresponding `Atom` in the linker.

2 files changed, 62 insertions(+), 39 deletions(-)

src/arch/x86_64/CodeGen.zig+60-34
......@@ -56,10 +56,7 @@ liveness: Liveness,
5656bin_file: *link.File,
5757debug_output: DebugInfoOutput,
5858target: *const std.Target,
59owner: union(enum) {
60 mod_fn: *const Module.Fn,
61 decl: Module.Decl.Index,
62},
59owner: Owner,
6360err_msg: ?*ErrorMsg,
6461args: []MCValue,
6562ret_mcv: InstTracking,
......@@ -111,6 +108,44 @@ const mir_to_air_map_init = if (builtin.mode == .Debug) std.AutoHashMapUnmanaged
111108const FrameAddr = struct { index: FrameIndex, off: i32 = 0 };
112109const RegisterOffset = struct { reg: Register, off: i32 = 0 };
113110
111const Owner = union(enum) {
112 mod_fn: *const Module.Fn,
113 lazy_sym: link.File.LazySymbol,
114
115 fn getOwnerDecl(owner: Owner) Module.Decl.Index {
116 return switch (owner) {
117 .mod_fn => |mod_fn| mod_fn.owner_decl,
118 .lazy_sym => |lazy_sym| lazy_sym.ty.getOwnerDecl(),
119 };
120 }
121
122 fn getSymbolIndex(owner: Owner, ctx: *Self) !u32 {
123 switch (owner) {
124 .mod_fn => |mod_fn| {
125 const decl_index = mod_fn.owner_decl;
126 if (ctx.bin_file.cast(link.File.MachO)) |macho_file| {
127 const atom = try macho_file.getOrCreateAtomForDecl(decl_index);
128 return macho_file.getAtom(atom).getSymbolIndex().?;
129 } else if (ctx.bin_file.cast(link.File.Coff)) |coff_file| {
130 const atom = try coff_file.getOrCreateAtomForDecl(decl_index);
131 return coff_file.getAtom(atom).getSymbolIndex().?;
132 } else unreachable;
133 },
134 .lazy_sym => |lazy_sym| {
135 if (ctx.bin_file.cast(link.File.MachO)) |macho_file| {
136 const atom = macho_file.getOrCreateAtomForLazySymbol(lazy_sym) catch |err|
137 return ctx.fail("{s} creating lazy symbol", .{@errorName(err)});
138 return macho_file.getAtom(atom).getSymbolIndex().?;
139 } else if (ctx.bin_file.cast(link.File.Coff)) |coff_file| {
140 const atom = coff_file.getOrCreateAtomForLazySymbol(lazy_sym) catch |err|
141 return ctx.fail("{s} creating lazy symbol", .{@errorName(err)});
142 return coff_file.getAtom(atom).getSymbolIndex().?;
143 } else unreachable;
144 },
145 }
146 }
147};
148
114149pub const MCValue = union(enum) {
115150 /// No runtime bits. `void` types, empty structs, u0, enums with 1 tag, etc.
116151 /// TODO Look into deleting this tag and using `dead` instead, since every use
......@@ -763,7 +798,7 @@ pub fn generateLazy(
763798 .target = &bin_file.options.target,
764799 .bin_file = bin_file,
765800 .debug_output = debug_output,
766 .owner = .{ .decl = lazy_sym.ty.getOwnerDecl() },
801 .owner = .{ .lazy_sym = lazy_sym },
767802 .err_msg = null,
768803 .args = undefined,
769804 .ret_mcv = undefined,
......@@ -1724,13 +1759,6 @@ fn genLazy(self: *Self, lazy_sym: link.File.LazySymbol) InnerError!void {
17241759 }
17251760}
17261761
1727fn getOwnerDecl(self: *const Self) Module.Decl.Index {
1728 return switch (self.owner) {
1729 .mod_fn => |mod_fn| mod_fn.owner_decl,
1730 .decl => |index| index,
1731 };
1732}
1733
17341762fn getValue(self: *Self, value: MCValue, inst: ?Air.Inst.Index) void {
17351763 const reg = value.getReg() orelse return;
17361764 if (self.register_manager.isRegFree(reg)) {
......@@ -6230,7 +6258,10 @@ fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void {
62306258 //},
62316259 else => unreachable, // not a valid function parameter
62326260 };
6233 try dw.genArgDbgInfo(name, ty, self.getOwnerDecl(), loc);
6261 // TODO: this might need adjusting like the linkers do.
6262 // Instead of flattening the owner and passing Decl.Index here we may
6263 // want to special case LazySymbol in DWARF linker too.
6264 try dw.genArgDbgInfo(name, ty, self.owner.getOwnerDecl(), loc);
62346265 },
62356266 .plan9 => {},
62366267 .none => {},
......@@ -6271,7 +6302,10 @@ fn genVarDbgInfo(
62716302 break :blk .nop;
62726303 },
62736304 };
6274 try dw.genVarDbgInfo(name, ty, self.getOwnerDecl(), is_ptr, loc);
6305 // TODO: this might need adjusting like the linkers do.
6306 // Instead of flattening the owner and passing Decl.Index here we may
6307 // want to special case LazySymbol in DWARF linker too.
6308 try dw.genVarDbgInfo(name, ty, self.owner.getOwnerDecl(), is_ptr, loc);
62756309 },
62766310 .plan9 => {},
62776311 .none => {},
......@@ -6403,12 +6437,14 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier
64036437 .base = .{ .reg = .ds },
64046438 .disp = @intCast(i32, got_addr),
64056439 }));
6406 } else if (self.bin_file.cast(link.File.Coff)) |_| {
6407 const sym_index = try self.getSymbolIndexForDecl(func.owner_decl);
6440 } else if (self.bin_file.cast(link.File.Coff)) |coff_file| {
6441 const atom = try coff_file.getOrCreateAtomForDecl(func.owner_decl);
6442 const sym_index = coff_file.getAtom(atom).getSymbolIndex().?;
64086443 try self.genSetReg(.rax, Type.usize, .{ .lea_got = sym_index });
64096444 try self.asmRegister(.call, .rax);
6410 } else if (self.bin_file.cast(link.File.MachO)) |_| {
6411 const sym_index = try self.getSymbolIndexForDecl(func.owner_decl);
6445 } else if (self.bin_file.cast(link.File.MachO)) |macho_file| {
6446 const atom = try macho_file.getOrCreateAtomForDecl(func.owner_decl);
6447 const sym_index = macho_file.getAtom(atom).getSymbolIndex().?;
64126448 try self.genSetReg(.rax, Type.usize, .{ .lea_got = sym_index });
64136449 try self.asmRegister(.call, .rax);
64146450 } else if (self.bin_file.cast(link.File.Plan9)) |p9| {
......@@ -6429,7 +6465,7 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier
64296465 const decl_name = mem.sliceTo(mod.declPtr(extern_fn.owner_decl).name, 0);
64306466 const lib_name = mem.sliceTo(extern_fn.lib_name, 0);
64316467 if (self.bin_file.cast(link.File.Coff)) |coff_file| {
6432 const atom_index = try self.getSymbolIndexForDecl(self.getOwnerDecl());
6468 const atom_index = try self.owner.getSymbolIndex(self);
64336469 const sym_index = try coff_file.getGlobalSymbol(decl_name, lib_name);
64346470 _ = try self.addInst(.{
64356471 .tag = .mov_linker,
......@@ -6442,8 +6478,8 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier
64426478 });
64436479 try self.asmRegister(.call, .rax);
64446480 } else if (self.bin_file.cast(link.File.MachO)) |macho_file| {
6481 const atom_index = try self.owner.getSymbolIndex(self);
64456482 const sym_index = try macho_file.getGlobalSymbol(decl_name, lib_name);
6446 const atom_index = try self.getSymbolIndexForDecl(self.getOwnerDecl());
64476483 _ = try self.addInst(.{
64486484 .tag = .call_extern,
64496485 .ops = undefined,
......@@ -7719,7 +7755,7 @@ fn genSetReg(self: *Self, dst_reg: Register, ty: Type, src_mcv: MCValue) InnerEr
77197755 }),
77207756 ),
77217757 .load_direct => |sym_index| if (try self.movMirTag(ty) == .mov) {
7722 const atom_index = try self.getSymbolIndexForDecl(self.getOwnerDecl());
7758 const atom_index = try self.owner.getSymbolIndex(self);
77237759 _ = try self.addInst(.{
77247760 .tag = .mov_linker,
77257761 .ops = .direct_reloc,
......@@ -7746,7 +7782,7 @@ fn genSetReg(self: *Self, dst_reg: Register, ty: Type, src_mcv: MCValue) InnerEr
77467782 );
77477783 },
77487784 .lea_direct, .lea_got => |sym_index| {
7749 const atom_index = try self.getSymbolIndexForDecl(self.getOwnerDecl());
7785 const atom_index = try self.owner.getSymbolIndex(self);
77507786 _ = try self.addInst(.{
77517787 .tag = switch (src_mcv) {
77527788 .lea_direct => .lea_linker,
......@@ -7766,7 +7802,7 @@ fn genSetReg(self: *Self, dst_reg: Register, ty: Type, src_mcv: MCValue) InnerEr
77667802 });
77677803 },
77687804 .lea_tlv => |sym_index| {
7769 const atom_index = try self.getSymbolIndexForDecl(self.getOwnerDecl());
7805 const atom_index = try self.owner.getSymbolIndex(self);
77707806 if (self.bin_file.cast(link.File.MachO)) |_| {
77717807 _ = try self.addInst(.{
77727808 .tag = .lea_linker,
......@@ -9079,7 +9115,7 @@ fn limitImmediateType(self: *Self, operand: Air.Inst.Ref, comptime T: type) !MCV
90799115}
90809116
90819117fn genTypedValue(self: *Self, arg_tv: TypedValue) InnerError!MCValue {
9082 return switch (try codegen.genTypedValue(self.bin_file, self.src_loc, arg_tv, self.getOwnerDecl())) {
9118 return switch (try codegen.genTypedValue(self.bin_file, self.src_loc, arg_tv, self.owner.getOwnerDecl())) {
90839119 .mcv => |mcv| switch (mcv) {
90849120 .none => .none,
90859121 .undef => .undef,
......@@ -9390,13 +9426,3 @@ fn regBitSize(self: *Self, ty: Type) u64 {
93909426fn regExtraBits(self: *Self, ty: Type) u64 {
93919427 return self.regBitSize(ty) - ty.bitSize(self.target.*);
93929428}
9393
9394fn getSymbolIndexForDecl(self: *Self, decl_index: Module.Decl.Index) !u32 {
9395 if (self.bin_file.cast(link.File.MachO)) |macho_file| {
9396 const atom = try macho_file.getOrCreateAtomForDecl(decl_index);
9397 return macho_file.getAtom(atom).getSymbolIndex().?;
9398 } else if (self.bin_file.cast(link.File.Coff)) |coff_file| {
9399 const atom = try coff_file.getOrCreateAtomForDecl(decl_index);
9400 return coff_file.getAtom(atom).getSymbolIndex().?;
9401 } else unreachable;
9402}
src/link/MachO.zig+2-5
......@@ -2112,7 +2112,7 @@ fn updateLazySymbolAtom(
21122112 errdefer self.freeAtom(atom_index);
21132113
21142114 log.debug("allocated atom for {s} at 0x{x}", .{ name, vaddr });
2115 log.debug(" (required alignment 0x{x}", .{required_alignment});
2115 log.debug(" (required alignment 0x{x})", .{required_alignment});
21162116
21172117 atom.size = code.len;
21182118 symbol.n_value = vaddr;
......@@ -4157,9 +4157,6 @@ pub fn logSymtab(self: *MachO) void {
41574157
41584158 log.debug("stubs entries:", .{});
41594159 log.debug("{}", .{self.stub_table});
4160
4161 // log.debug("threadlocal entries:", .{});
4162 // log.debug("{}", .{self.tlv_table});
41634160}
41644161
41654162pub fn logAtoms(self: *MachO) void {
......@@ -4199,6 +4196,6 @@ pub fn logAtom(self: *MachO, atom_index: Atom.Index) void {
41994196 sym.n_value,
42004197 atom.size,
42014198 atom.file,
4202 sym.n_sect,
4199 sym.n_sect + 1,
42034200 });
42044201}