authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-14 17:19:18+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-24 12:34:40+01:00
logb1cf6d310323f2908ed401d1a6926d096ade530d
treed8432c86fd8389a90283394ac13b81ef4ee6a1f1
parent181e476915133091c6a51862861079151a4f19f1

macho: print all definitions of symbols when printing duplicates

1 files changed, 3 insertions(+), 2 deletions(-)

src/link/MachO.zig+3-2
...@@ -3547,7 +3547,7 @@ fn reportDuplicates(self: *MachO, dupes: anytype) error{ HasDuplicates, OutOfMem...@@ -3547,7 +3547,7 @@ fn reportDuplicates(self: *MachO, dupes: anytype) error{ HasDuplicates, OutOfMem
3547 const tracy = trace(@src());3547 const tracy = trace(@src());
3548 defer tracy.end();3548 defer tracy.end();
35493549
3550 const max_notes = 4;3550 const max_notes = 3;
35513551
3552 var has_dupes = false;3552 var has_dupes = false;
3553 var it = dupes.iterator();3553 var it = dupes.iterator();
...@@ -3556,8 +3556,9 @@ fn reportDuplicates(self: *MachO, dupes: anytype) error{ HasDuplicates, OutOfMem...@@ -3556,8 +3556,9 @@ fn reportDuplicates(self: *MachO, dupes: anytype) error{ HasDuplicates, OutOfMem
3556 const notes = entry.value_ptr.*;3556 const notes = entry.value_ptr.*;
3557 const nnotes = @min(notes.items.len, max_notes) + @intFromBool(notes.items.len > max_notes);3557 const nnotes = @min(notes.items.len, max_notes) + @intFromBool(notes.items.len > max_notes);
35583558
3559 var err = try self.addErrorWithNotes(nnotes);3559 var err = try self.addErrorWithNotes(nnotes + 1);
3560 try err.addMsg(self, "duplicate symbol definition: {s}", .{sym.getName(self)});3560 try err.addMsg(self, "duplicate symbol definition: {s}", .{sym.getName(self)});
3561 try err.addNote(self, "defined by {}", .{sym.getFile(self).?.fmtPath()});
35613562
3562 var inote: usize = 0;3563 var inote: usize = 0;
3563 while (inote < @min(notes.items.len, max_notes)) : (inote += 1) {3564 while (inote < @min(notes.items.len, max_notes)) : (inote += 1) {