motiejus/zig
1
Fork 0
Code Releases Activity

macho: don't scan all eh_frame entries, instead follow the offset from the __unwind_info directly

Browse Source
This commit is contained in:
kcbanner
2023-07-17 10:22:01 -04:00
parent 774dc2fdb7
commit 97bda56306
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/debug.zig
View File

@@ -642,7 +642,7 @@ pub const StackIterator = struct {
// __unwind_info is a requirement for unwinding on Darwin. It may fall back to DWARF, but unwinding
// via DWARF before attempting to use the compact unwind info will produce incorrect results.
if (module.unwind_info) |unwind_info| {
if (macho.unwindFrame(&unwind_state.dwarf_context, unwind_info, module.base_address)) |return_address| {
if (macho.unwindFrame(&unwind_state.dwarf_context, unwind_info, module.eh_frame, module.base_address)) |return_address| {
return return_address;
} else |err| {
if (err != error.RequiresDWARFUnwind) return err;
@@ -2026,10 +2026,6 @@ pub const ModuleDebugInfo = switch (native_os) {
};
try DW.openDwarfDebugInfo(&di, allocator);
// TODO: Don't actually scan everything, search on demand
di.scanAllUnwindInfo(allocator, self.base_address) catch {};
var info = OFileInfo{
.di = di,
.addr_table = addr_table,