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

macho: re-instate writing DWARF into dSYM

Browse Source
This commit is contained in:
Jakub Konka 2024-01-28 13:59:17 +01:00
parent f2214e4371
commit 5dbac19d8c
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link/MachO.zig
View File

@ -3181,7 +3181,7 @@ pub fn updateDecl(self: *MachO, mod: *Module, decl_index: InternPool.DeclIndex)
pub fn updateDeclLineNumber(self: *MachO, module: *Module, decl_index: InternPool.DeclIndex) !void {
if (self.llvm_object) |_| return;
return self.getZigObject().?.updateDeclLineNumber(module, decl_index);
return self.getZigObject().?.updateDeclLineNumber(self, module, decl_index);
}
pub fn updateExports(

50
src/link/MachO/ZigObject.zig
View File

@ -531,7 +531,7 @@ pub fn updateFunc(
var code_buffer = std.ArrayList(u8).init(gpa);
defer code_buffer.deinit();
var decl_state: ?Dwarf.DeclState = null; // TODO: Dwarf
var decl_state: ?Dwarf.DeclState = if (macho_file.getDebugSymbols()) |d_sym| try d_sym.dwarf.initDeclState(mod, decl_index) else null;
defer if (decl_state) |*ds| ds.deinit();
const dio: codegen.DebugInfoOutput = if (decl_state) |*ds| .{ .dwarf = ds } else .none;
@ -557,16 +557,16 @@ pub fn updateFunc(
const sect_index = try self.getDeclOutputSection(macho_file, decl, code);
try self.updateDeclCode(macho_file, decl_index, sym_index, sect_index, code);
// if (decl_state) |*ds| {
// const sym = elf_file.symbol(sym_index);
// try self.dwarf.?.commitDeclState(
// mod,
// decl_index,
// sym.value,
// sym.atom(elf_file).?.size,
// ds,
// );
// }
if (decl_state) |*ds| {
const sym = macho_file.getSymbol(sym_index);
try macho_file.getDebugSymbols().?.dwarf.commitDeclState(
mod,
decl_index,
sym.getAddress(.{}, macho_file),
sym.getAtom(macho_file).?.size,
ds,
);
}
// Since we updated the vaddr and the size, each corresponding export
// symbol also needs to be updated.
@ -606,7 +606,7 @@ pub fn updateDecl(
var code_buffer = std.ArrayList(u8).init(gpa);
defer code_buffer.deinit();
var decl_state: ?Dwarf.DeclState = null; // TODO: Dwarf
var decl_state: ?Dwarf.DeclState = if (macho_file.getDebugSymbols()) |d_sym| try d_sym.dwarf.initDeclState(mod, decl_index) else null;
defer if (decl_state) |*ds| ds.deinit();
const decl_val = if (decl.val.getVariable(mod)) |variable| Value.fromInterned(variable.init) else decl.val;
@ -638,15 +638,16 @@ pub fn updateDecl(
try self.updateDeclCode(macho_file, decl_index, sym_index, sect_index, code);
}
// if (decl_state) |*ds| {
// try self.d_sym.?.dwarf.commitDeclState(
// mod,
// decl_index,
// addr,
// self.getAtom(atom_index).size,
// ds,
// );
// }
if (decl_state) |*ds| {
const sym = macho_file.getSymbol(sym_index);
try macho_file.getDebugSymbols().?.dwarf.commitDeclState(
mod,
decl_index,
sym.getAddress(.{}, macho_file),
sym.getAtom(macho_file).?.size,
ds,
);
}
// Since we updated the vaddr and the size, each corresponding export symbol also
// needs to be updated.
@ -1220,13 +1221,14 @@ fn updateLazySymbol(
/// Must be called only after a successful call to `updateDecl`.
pub fn updateDeclLineNumber(
self: *ZigObject,
macho_file: *MachO,
mod: *Module,
decl_index: InternPool.DeclIndex,
) !void {
_ = self;
_ = mod;
_ = decl_index;
// TODO: Dwarf
if (macho_file.getDebugSymbols()) |d_sym| {
try d_sym.dwarf.updateDeclLineNumber(mod, decl_index);
}
}
pub fn deleteDeclExport(