authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-08-10 22:15:14+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-08-10 22:23:24+02:00
log5d6e49d0655b4523c249f1d62da9dc477f1c82af
treebe928aaf6669b7bee4b0ff64e417620db7e5a7eb
parent421b105d85507e6e3a98cfcf932ca6a8d14e2791

Elf/ZigObject: handle ref to an extern in getDeclVAddr

Prior to this change, we would unconditionally create a symbol and atom pair for a Decl that could point to an extern, in which case no atom can be created.

2 files changed, 25 insertions(+), 12 deletions(-)

src/link/Elf.zig+2-2
......@@ -478,9 +478,9 @@ pub fn deinit(self: *Elf) void {
478478 self.comdat_group_sections.deinit(gpa);
479479}
480480
481pub fn getDeclVAddr(self: *Elf, _: Zcu.PerThread, decl_index: InternPool.DeclIndex, reloc_info: link.File.RelocInfo) !u64 {
481pub fn getDeclVAddr(self: *Elf, pt: Zcu.PerThread, decl_index: InternPool.DeclIndex, reloc_info: link.File.RelocInfo) !u64 {
482482 assert(self.llvm_object == null);
483 return self.zigObjectPtr().?.getDeclVAddr(self, decl_index, reloc_info);
483 return self.zigObjectPtr().?.getDeclVAddr(self, pt, decl_index, reloc_info);
484484}
485485
486486pub fn lowerAnonDecl(
src/link/Elf/ZigObject.zig+23-10
......@@ -664,10 +664,22 @@ pub fn codeAlloc(self: *ZigObject, elf_file: *Elf, atom_index: Atom.Index) ![]u8
664664pub fn getDeclVAddr(
665665 self: *ZigObject,
666666 elf_file: *Elf,
667 pt: Zcu.PerThread,
667668 decl_index: InternPool.DeclIndex,
668669 reloc_info: link.File.RelocInfo,
669670) !u64 {
670 const this_sym_index = try self.getOrCreateMetadataForDecl(elf_file, decl_index);
671 const zcu = pt.zcu;
672 const ip = &zcu.intern_pool;
673 const decl = zcu.declPtr(decl_index);
674 log.debug("getDeclVAddr {}({d})", .{ decl.fqn.fmt(ip), decl_index });
675 const this_sym_index = if (decl.isExtern(zcu)) blk: {
676 const name = decl.name.toSlice(ip);
677 const lib_name = if (decl.getOwnedExternFunc(zcu)) |ext_fn|
678 ext_fn.lib_name.toSlice(ip)
679 else
680 decl.getOwnedVariable(zcu).?.lib_name.toSlice(ip);
681 break :blk try self.getGlobalSymbol(elf_file, name, lib_name);
682 } else try self.getOrCreateMetadataForDecl(elf_file, decl_index);
671683 const this_sym = self.symbol(this_sym_index);
672684 const vaddr = this_sym.address(.{}, elf_file);
673685 const parent_atom = self.symbol(reloc_info.parent_atom_index).atom(elf_file).?;
......@@ -810,10 +822,8 @@ fn freeDeclMetadata(self: *ZigObject, elf_file: *Elf, sym_index: Symbol.Index) v
810822
811823pub fn freeDecl(self: *ZigObject, elf_file: *Elf, decl_index: InternPool.DeclIndex) void {
812824 const gpa = elf_file.base.comp.gpa;
813 const mod = elf_file.base.comp.module.?;
814 const decl = mod.declPtr(decl_index);
815825
816 log.debug("freeDecl {*}", .{decl});
826 log.debug("freeDecl ({d})", .{decl_index});
817827
818828 if (self.decls.fetchRemove(decl_index)) |const_kv| {
819829 var kv = const_kv;
......@@ -923,7 +933,7 @@ fn updateDeclCode(
923933 const ip = &mod.intern_pool;
924934 const decl = mod.declPtr(decl_index);
925935
926 log.debug("updateDeclCode {}{*}", .{ decl.fqn.fmt(ip), decl });
936 log.debug("updateDeclCode {}({d})", .{ decl.fqn.fmt(ip), decl_index });
927937
928938 const required_alignment = decl.getAlignment(pt).max(
929939 target_util.minFunctionAlignment(mod.getTarget()),
......@@ -1023,7 +1033,7 @@ fn updateTlv(
10231033 const gpa = mod.gpa;
10241034 const decl = mod.declPtr(decl_index);
10251035
1026 log.debug("updateTlv {} ({*})", .{ decl.fqn.fmt(ip), decl });
1036 log.debug("updateTlv {}({d})", .{ decl.fqn.fmt(ip), decl_index });
10271037
10281038 const required_alignment = decl.getAlignment(pt);
10291039
......@@ -1077,11 +1087,14 @@ pub fn updateFunc(
10771087 defer tracy.end();
10781088
10791089 const mod = pt.zcu;
1090 const ip = &mod.intern_pool;
10801091 const gpa = elf_file.base.comp.gpa;
10811092 const func = mod.funcInfo(func_index);
10821093 const decl_index = func.owner_decl;
10831094 const decl = mod.declPtr(decl_index);
10841095
1096 log.debug("updateFunc {}({d})", .{ decl.fqn.fmt(ip), decl_index });
1097
10851098 const sym_index = try self.getOrCreateMetadataForDecl(elf_file, decl_index);
10861099 self.freeUnnamedConsts(elf_file, decl_index);
10871100 self.symbol(sym_index).atom(elf_file).?.freeRelocs(elf_file);
......@@ -1139,12 +1152,12 @@ pub fn updateDecl(
11391152 defer tracy.end();
11401153
11411154 const mod = pt.zcu;
1155 const ip = &mod.intern_pool;
11421156 const decl = mod.declPtr(decl_index);
11431157
1144 if (decl.val.getExternFunc(mod)) |_| {
1145 return;
1146 }
1158 log.debug("updateDecl {}({d})", .{ decl.fqn.fmt(ip), decl_index });
11471159
1160 if (decl.val.getExternFunc(mod)) |_| return;
11481161 if (decl.isExtern(mod)) {
11491162 // Extern variable gets a .got entry only.
11501163 const variable = decl.getOwnedVariable(mod).?;
......@@ -1485,7 +1498,7 @@ pub fn updateDeclLineNumber(
14851498
14861499 const decl = pt.zcu.declPtr(decl_index);
14871500
1488 log.debug("updateDeclLineNumber {}{*}", .{ decl.fqn.fmt(&pt.zcu.intern_pool), decl });
1501 log.debug("updateDeclLineNumber {}({d})", .{ decl.fqn.fmt(&pt.zcu.intern_pool), decl_index });
14891502
14901503 if (self.dwarf) |*dw| {
14911504 try dw.updateDeclLineNumber(pt.zcu, decl_index);