archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix aarch64-macos DWARF unwinding

Browse source 
turns out this isn't technically specific to that target at all; other
targets just don't emit mid-function 'ret' instructions as much so
certain CFI instruction patterns were only seen on aarch64.

thanks to jacob for finding the bug <3
This commit is contained in:
mlugg 2025-09-03 13:11:25 +01:00
parent 4b47a37717
commit 5e6a1919c7
No known key found for this signature in database
GPG key ID: 3F5B7DCCBF4AF02E
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/std/debug/Dwarf/Unwind/VirtualMachine.zig
View file

@ -48,7 +48,10 @@ const ColumnRange = struct {
};
columns: std.ArrayList(Column) = .empty,
stack: std.ArrayList(ColumnRange) = .empty,
stack: std.ArrayList(struct {
cfa: Column,
columns: ColumnRange,
}) = .empty,
current_row: Row = .{},
/// The result of executing the CIE's initial_instructions
@ -205,17 +208,21 @@ pub fn step(
column.rule = .{ .register = i.target_register };
},
.remember_state => {
try self.stack.append(gpa, self.current_row.columns);
try self.stack.append(gpa, .{
.cfa = self.current_row.cfa,
.columns = self.current_row.columns,
});
self.current_row.copy_on_write = true;
},
.restore_state => {
const restored_columns = self.stack.pop() orelse return error.InvalidOperation;
const restored = self.stack.pop() orelse return error.InvalidOperation;
self.columns.shrinkRetainingCapacity(self.columns.items.len - self.current_row.columns.len);
try self.columns.ensureUnusedCapacity(gpa, restored_columns.len);
try self.columns.ensureUnusedCapacity(gpa, restored.columns.len);
self.current_row.cfa = restored.cfa;
self.current_row.columns.start = self.columns.items.len;
self.current_row.columns.len = restored_columns.len;
self.columns.appendSliceAssumeCapacity(self.columns.items[restored_columns.start..][0..restored_columns.len]);
self.current_row.columns.len = restored.columns.len;
self.columns.appendSliceAssumeCapacity(self.columns.items[restored.columns.start..][0..restored.columns.len]);
},
.def_cfa => |i| {
try self.resolveCopyOnWrite(gpa);