Commit f8f4abab9450704615a67a3f577345459ea6b718 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2026-10-18 22:49:08+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-10-18 22:51:08+02:00
log	f8f4abab9450704615a67a3f577345459ea6b718
tree	43d212a44e2295257d3381baec8b2253727a27c6
parent	17cf964c25d708c5b28c4811538cd5af4a56b42e
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

Merge pull request '`std.debug.SelfInfo.MachO`: fix a few bugs' (#37318) from alexrp/zig:macos-unwind-stuff into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/37318

2 files changed, 9 insertions(+), 7 deletions(-)

lib
- std
  - debug
    SelfInfo
    MachO.zig
  - macho.zig

lib/std/debug/SelfInfo/MachO.zig+6-6

lib/std/macho.zig+3-1

 @@ -2137,6 +2137,7 @@ pub const UNWIND_ARM64_MODE = enum(u4) {
     FRAMELESS = 2,
     DWARF = 3,
     FRAME = 4,
+    FRAME_PAUTH_LR = 5,
 };
 pub const UNWIND_ARM64_FRAME_X19_X20_PAIR: u32 = 0x00000001;
 @@ -2189,13 +2190,14 @@ pub const CompactUnwindEncoding = packed struct(u32) {
                     x25_x26: u1,
                     x27_x28: u1,
                 },
+                unused: u3 = 0,
                 d_reg_pairs: packed struct(u4) {
                     d8_d9: u1,
                     d10_d11: u1,
                     d12_d13: u1,
                     d14_d15: u1,
                 },
-                _: u15,
+                _: u12,
             },
             frameless: packed struct(u24) {
                 _: u12 = 0,

...	@@ -417,7 +417,7 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {	...	@@ -417,7 +417,7 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {
417	const rules = try context.computeRules(gpa, dwarf, unwind.vmaddr_slide, encoding.value.arm64.dwarf);	417	const rules = try context.computeRules(gpa, dwarf, unwind.vmaddr_slide, encoding.value.arm64.dwarf);
418	return context.next(gpa, &rules);	418	return context.next(gpa, &rules);
419	},	419	},
420	.FRAME => ip: {	420	.FRAME, .FRAME_PAUTH_LR => ip: {
421	const frame = encoding.value.arm64.frame;	421	const frame = encoding.value.arm64.frame;
422		422
423	const fp = (try dwarfRegNative(&context.cpu_state, fp_reg_num)).*;	423	const fp = (try dwarfRegNative(&context.cpu_state, fp_reg_num)).*;
...	@@ -426,10 +426,10 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {	...	@@ -426,10 +426,10 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {
426	var reg_addr = fp - @sizeOf(usize);	426	var reg_addr = fp - @sizeOf(usize);
427	inline for (@typeInfo(@TypeOf(frame.x_reg_pairs)).@"struct".field_names, 0..) \|field_name, i\| {	427	inline for (@typeInfo(@TypeOf(frame.x_reg_pairs)).@"struct".field_names, 0..) \|field_name, i\| {
428	if (@field(frame.x_reg_pairs, field_name) != 0) {	428	if (@field(frame.x_reg_pairs, field_name) != 0) {
429	(try dwarfRegNative(&context.cpu_state, 19 + i)).* = @as(const usize, @ptrFromInt(reg_addr)).;	429	(try dwarfRegNative(&context.cpu_state, 19 + i * 2)).* = @as(const usize, @ptrFromInt(reg_addr)).;
430	reg_addr += @sizeOf(usize);	430	reg_addr -= @sizeOf(usize);
431	(try dwarfRegNative(&context.cpu_state, 20 + i)).* = @as(const usize, @ptrFromInt(reg_addr)).;	431	(try dwarfRegNative(&context.cpu_state, 20 + i * 2)).* = @as(const usize, @ptrFromInt(reg_addr)).;
432	reg_addr += @sizeOf(usize);	432	reg_addr -= @sizeOf(usize);
433	}	433	}
434	}	434	}
435		435
...	@@ -437,7 +437,7 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {	...	@@ -437,7 +437,7 @@ fn unwindFrameInner(si: SelfInfo, io: Io, context: UnwindContext) !usize {
437	// vector registers in the AArch64 `cpu_context` anyway, so there's no reason to	437	// vector registers in the AArch64 `cpu_context` anyway, so there's no reason to
438	// fail a legitimate unwind just because we're asked to restore the registers here.	438	// fail a legitimate unwind just because we're asked to restore the registers here.
439	// If some weird/broken unwind info tells us to read them later, we will fail then.	439	// If some weird/broken unwind info tells us to read them later, we will fail then.
440	reg_addr += 16 * @as(usize, @popCount(@as(u4, @bitCast(frame.d_reg_pairs))));	440	reg_addr -= 16 * @as(usize, @popCount(@as(u4, @bitCast(frame.d_reg_pairs))));
441		441
442	const new_ip = @as(const usize, @ptrFromInt(ip_ptr)).;	442	const new_ip = @as(const usize, @ptrFromInt(ip_ptr)).;
443	const new_fp = @as(const usize, @ptrFromInt(fp)).;	443	const new_fp = @as(const usize, @ptrFromInt(fp)).;