mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 05:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: report undefined symbols as errors

Browse Source
This commit is contained in:
Jakub Konka 2023-09-11 13:17:31 +02:00
parent 7a9eba2f85
commit 65b9597c07
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/link.zig
View File

@ -849,6 +849,7 @@ pub const File = struct {
pub fn miscErrors(base: *File) []const ErrorMsg {
switch (base.tag) {
.elf => return @fieldParentPtr(Elf, "base", base).misc_errors.items,
.macho => return @fieldParentPtr(MachO, "base", base).misc_errors.items,
else => return &.{},
}

58
src/link/Elf.zig
View File

@ -87,7 +87,7 @@ start_stop_indexes: std.ArrayListUnmanaged(u32) = .{},
symbols: std.ArrayListUnmanaged(Symbol) = .{},
symbols_extra: std.ArrayListUnmanaged(u32) = .{},
resolver: std.AutoArrayHashMapUnmanaged(u32, Symbol.Index) = .{},
unresolved: std.AutoArrayHashMapUnmanaged(u32, void) = .{},
unresolved: std.AutoArrayHashMapUnmanaged(Symbol.Index, void) = .{},
symbols_free_list: std.ArrayListUnmanaged(Symbol.Index) = .{},
phdr_table_dirty: bool = false,
@ -102,6 +102,7 @@ debug_info_header_dirty: bool = false,
debug_line_header_dirty: bool = false,
error_flags: link.File.ErrorFlags = link.File.ErrorFlags{},
misc_errors: std.ArrayListUnmanaged(link.File.ErrorMsg) = .{},
/// Table of tracked LazySymbols.
lazy_syms: LazySymbolTable = .{},
@ -292,6 +293,8 @@ pub fn deinit(self: *Elf) void {
if (self.dwarf) |*dw| {
dw.deinit();
}
self.misc_errors.deinit(gpa);
}
pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 {
@ -1015,6 +1018,8 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
try self.addLinkerDefinedSymbols();
if (self.unresolved.keys().len > 0) try self.reportUndefined();
self.allocateLinkerDefinedSymbols();
// Beyond this point, everything has been allocated a virtual address and we can resolve
@ -3392,11 +3397,60 @@ pub fn getGlobalSymbol(self: *Elf, name: []const u8, lib_name: ?[]const u8) !u32
const name_off = try self.strtab.insert(gpa, name);
const gop = try self.getOrPutGlobal(name_off);
if (!gop.found_existing) {
try self.unresolved.putNoClobber(gpa, name_off, {});
try self.unresolved.putNoClobber(gpa, gop.index, {});
}
return gop.index;
}
fn reportUndefined(self: *Elf) !void {
const gpa = self.base.allocator;
const max_notes = 4;
try self.misc_errors.ensureUnusedCapacity(gpa, self.unresolved.keys().len);
for (self.unresolved.keys()) |sym_index| {
const undef_sym = self.symbol(sym_index);
var all_notes: usize = 0;
var notes = try std.ArrayList(link.File.ErrorMsg).initCapacity(gpa, max_notes + 1);
defer notes.deinit();
// Collect all references across all input files
if (self.zig_module_index) |index| {
const zig_module = self.file(index).?.zig_module;
for (zig_module.atoms.keys()) |atom_index| {
const atom_ptr = self.atom(atom_index).?;
if (!atom_ptr.alive) continue;
for (atom_ptr.relocs(self)) |rel| {
if (sym_index == rel.r_sym()) {
const note = try std.fmt.allocPrint(gpa, "referenced by {s}:{s}", .{
zig_module.path,
atom_ptr.name(self),
});
notes.appendAssumeCapacity(.{ .msg = note });
all_notes += 1;
break;
}
}
}
}
if (all_notes > max_notes) {
const remaining = all_notes - max_notes;
const note = try std.fmt.allocPrint(gpa, "referenced {d} more times", .{remaining});
notes.appendAssumeCapacity(.{ .msg = note });
}
var err_msg = link.File.ErrorMsg{
.msg = try std.fmt.allocPrint(gpa, "undefined symbol: {s}", .{undef_sym.name(self)}),
};
err_msg.notes = try notes.toOwnedSlice();
self.misc_errors.appendAssumeCapacity(err_msg);
}
}
fn dumpState(self: *Elf) std.fmt.Formatter(fmtDumpState) {
return .{ .data = self };
}