mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.debug: handle static library paths correctly when reading SelfInfo

Browse source 
On macOS ofile entries will not be clean file paths when the entry points
at a static archive, like `libfoo.a(libfoo.a.o)` for example.

Previously the code for loading debug info would fail resulting in
missing frames in stack traces.

TODO: fix memory leak, add test case
This commit is contained in:
Loris Cro 2025-05-03 18:37:52 +02:00
parent bf9b15ee67
commit 0b9d6ad042
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/std/debug/SelfInfo.zig
View file

@ -686,7 +686,21 @@ pub const Module = switch (native_os) {
}; };
// Check if its debug infos are already in the cache // Check if its debug infos are already in the cache
const o_file_path = mem.sliceTo(self.strings[symbol.ofile..], 0); const o_file_path = path: {
const raw_path = mem.sliceTo(self.strings[symbol.ofile..], 0);
if (!std.mem.endsWith(u8, raw_path, ")")) break :path raw_path;
const last_paren_index = std.mem.lastIndexOfScalar(u8, raw_path, '(') orelse break :path raw_path;
const basename = raw_path[last_paren_index + 1 .. raw_path.len - 1];
const path = raw_path[0..last_paren_index];
const dirname = std.fs.path.dirname(path) orelse break :path basename;
break :path try std.fs.path.resolve(allocator, &.{ dirname, basename });
};
const o_file_info = self.ofiles.getPtr(o_file_path) orelse const o_file_info = self.ofiles.getPtr(o_file_path) orelse
(self.loadOFile(allocator, o_file_path) catch |err| switch (err) { (self.loadOFile(allocator, o_file_path) catch |err| switch (err) {
error.FileNotFound, error.FileNotFound,