Commit 0e08cd63e236314750f18d28f8ede98a2188c6d2 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-06-10 19:28:11+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-06-10 19:28:11+02:00
log	0e08cd63e236314750f18d28f8ede98a2188c6d2
tree	0cf05b79c2820425fedb46414ba4ada48f1dea15
parent	c2086efb412f17bb52514e931016e79c65bed442

zld: fix debug info for regulars synthed from tentative

2 files changed, 22 insertions(+), 2 deletions(-)

src
- link
  - MachO
    Symbol.zig
    Zld.zig

src/link/MachO/Symbol.zig+4

 @@ -61,6 +61,10 @@ pub const Regular = struct {
         size: u64,
     } = null,
+    /// True if symbol was already committed into the final
+    /// symbol table.
+    visited: bool = false,
     pub const base_type: Symbol.Type = .regular;
     pub const Linkage = enum {

src/link/MachO/Zld.zig+18-2

 @@ -1194,6 +1194,10 @@ fn allocateTentativeSymbols(self: *Zld) !void {
             .section = section,
             .weak_ref = false,
             .file = tent.file,
+            .stab = .{
+                .kind = .global,
+                .size = 0,
+            },
         };
         try self.globals.putNoClobber(self.allocator, reg.base.name, &reg.base);
 @@ -2772,8 +2776,17 @@ fn writeDebugInfo(self: *Zld) !void {
         });
         for (object.symbols.items) |sym| {
-            if (sym.@"type" != .regular) continue;
+            const reg = reg: {
-            const reg = sym.cast(Symbol.Regular) orelse unreachable;
+                switch (sym.@"type") {
+                    .regular => break :reg sym.cast(Symbol.Regular) orelse unreachable,
+                    .tentative => {
+                        const final = sym.getTopmostAlias().cast(Symbol.Regular) orelse unreachable;
+                        if (object != final.file) continue;
+                        break :reg final;
+                    },
+                    else => continue,
+                }
+            };
             if (reg.isTemp() or reg.stab == null) continue;
             const stab = reg.stab orelse unreachable;
 @@ -2877,6 +2890,7 @@ fn writeSymbolTable(self: *Zld) !void {
             const reg = final.cast(Symbol.Regular) orelse unreachable;
             if (reg.isTemp()) continue;
+            if (reg.visited) continue;
             switch (reg.linkage) {
                 .translation_unit => {
 @@ -2898,6 +2912,8 @@ fn writeSymbolTable(self: *Zld) !void {
                     });
                 },
             }
+            reg.visited = true;
         }
     }