authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-02-25 14:19:36-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-02-25 14:19:36-05:00
loge902c231c85890fdba486db3469e1aaf0de83da5
tree1e5d1f809b843749d22b9e1c83a82773d998858d
parentad5515bed8789cb7688b3bd6c098be3a16b16d47
parent466ce48e4c315bdd59bd0f5700fe4d32c15d3d8c
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #23011 from alexrp/macho-cu-intcast

`link.MachO.UnwindInfo`: Handle `u24` overflow for CU records pointing to DWARF.

1 files changed, 12 insertions(+), 1 deletions(-)

src/link/MachO/UnwindInfo.zig+12-1
......@@ -68,7 +68,18 @@ pub fn generate(info: *UnwindInfo, macho_file: *MachO) !void {
6868 for (info.records.items) |ref| {
6969 const rec = ref.getUnwindRecord(macho_file);
7070 if (rec.getFde(macho_file)) |fde| {
71 rec.enc.setDwarfSectionOffset(@intCast(fde.out_offset));
71 // The unwinder will look for the DWARF entry starting at the hint,
72 // assuming the hint points to a valid CFI record start. If it
73 // fails to find the record, it proceeds in a linear search through
74 // the contiguous CFI records from the hint until the end of the
75 // section. Ideally, in the case where the offset is too large to
76 // be encoded, we would instead encode the largest possible offset
77 // to a valid CFI record, but since we don't keep track of that,
78 // just encode zero -- the start of the section is always the start
79 // of a CFI record.
80 const hint = std.math.cast(u24, fde.out_offset) orelse 0;
81 rec.enc.setDwarfSectionOffset(hint);
82
7283 if (fde.getLsdaAtom(macho_file)) |lsda| {
7384 rec.lsda = lsda.atom_index;
7485 rec.lsda_offset = fde.lsda_offset;