Commit aaca4ff74dab5d749cd292d31957ce19ab5901c7 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2024-08-30 19:07:36+02:00
committer	GitHub <noreply@github.com> 2024-08-30 19:07:36+02:00
log	aaca4ff74dab5d749cd292d31957ce19ab5901c7
tree	a5aae705179667dc378293c321faf8230649d481
parent	d997ddaa102bb9ba5f1e8480b8c78f7d102b5512
parent	a1a9d7440ca7b33a73ef7d3b4ee450271337f96f
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #21254 from jacobly0/fix-dwarf

Dwarf: fix issues with emitted debug info

3 files changed, 35 insertions(+), 65 deletions(-)

src
- link
  - Dwarf.zig
  - Elf
    eh_frame.zig
  - MachO
    eh_frame.zig

src/link/Dwarf.zig+19-18

src/link/Elf/eh_frame.zig+10-23

 @@ -482,19 +482,24 @@ pub fn writeEhFrameHdr(elf_file: *Elf, writer: anytype) !void {
     const gpa = comp.gpa;
     try writer.writeByte(1); // version
-    try writer.writeByte(EH_PE.pcrel | EH_PE.sdata4);
+    try writer.writeByte(DW_EH_PE.pcrel | DW_EH_PE.sdata4);
-    try writer.writeByte(EH_PE.udata4);
+    try writer.writeByte(DW_EH_PE.udata4);
-    try writer.writeByte(EH_PE.datarel | EH_PE.sdata4);
+    try writer.writeByte(DW_EH_PE.datarel | DW_EH_PE.sdata4);
     const shdrs = elf_file.sections.items(.shdr);
     const eh_frame_shdr = shdrs[elf_file.eh_frame_section_index.?];
     const eh_frame_hdr_shdr = shdrs[elf_file.eh_frame_hdr_section_index.?];
     const num_fdes = @as(u32, @intCast(@divExact(eh_frame_hdr_shdr.sh_size - eh_frame_hdr_header_size, 8)));
+    const existing_size = existing_size: {
+        const zo = elf_file.zigObjectPtr() orelse break :existing_size 0;
+        const sym = zo.symbol(zo.eh_frame_index orelse break :existing_size 0);
+        break :existing_size sym.atom(elf_file).?.size;
+    };
     try writer.writeInt(
         u32,
         @as(u32, @bitCast(@as(
             i32,
-            @truncate(@as(i64, @intCast(eh_frame_shdr.sh_addr)) - @as(i64, @intCast(eh_frame_hdr_shdr.sh_addr)) - 4),
+            @truncate(@as(i64, @intCast(eh_frame_shdr.sh_addr + existing_size)) - @as(i64, @intCast(eh_frame_hdr_shdr.sh_addr)) - 4),
         ))),
         .little,
     );
 @@ -543,25 +548,6 @@ pub fn writeEhFrameHdr(elf_file: *Elf, writer: anytype) !void {
 const eh_frame_hdr_header_size: usize = 12;
-const EH_PE = struct {
-    pub const absptr = 0x00;
-    pub const uleb128 = 0x01;
-    pub const udata2 = 0x02;
-    pub const udata4 = 0x03;
-    pub const udata8 = 0x04;
-    pub const sleb128 = 0x09;
-    pub const sdata2 = 0x0A;
-    pub const sdata4 = 0x0B;
-    pub const sdata8 = 0x0C;
-    pub const pcrel = 0x10;
-    pub const textrel = 0x20;
-    pub const datarel = 0x30;
-    pub const funcrel = 0x40;
-    pub const aligned = 0x50;
-    pub const indirect = 0x80;
-    pub const omit = 0xFF;
-};
 const x86_64 = struct {
     fn resolveReloc(rec: anytype, elf_file: *Elf, rel: elf.Elf64_Rela, source: i64, target: i64, data: []u8) !void {
         const r_type: elf.R_X86_64 = @enumFromInt(rel.r_type());
 @@ -619,6 +605,7 @@ const relocation = @import("relocation.zig");
 const Allocator = std.mem.Allocator;
 const Atom = @import("Atom.zig");
+const DW_EH_PE = std.dwarf.EH.PE;
 const Elf = @import("../Elf.zig");
 const Object = @import("Object.zig");
 const Symbol = @import("Symbol.zig");

src/link/MachO/eh_frame.zig+6-24

 @@ -29,22 +29,22 @@ pub const Cie = struct {
         for (aug[1..]) |ch| switch (ch) {
             'R' => {
                 const enc = try reader.readByte();
-                if (enc & 0xf != EH_PE.absptr or enc & EH_PE.pcrel == 0) {
+                if (enc != DW_EH_PE.pcrel | DW_EH_PE.absptr) {
                     @panic("unexpected pointer encoding"); // TODO error
                 }
             },
             'P' => {
                 const enc = try reader.readByte();
-                if (enc != EH_PE.pcrel | EH_PE.indirect | EH_PE.sdata4) {
+                if (enc != DW_EH_PE.pcrel | DW_EH_PE.indirect | DW_EH_PE.sdata4) {
                     @panic("unexpected personality pointer encoding"); // TODO error
                 }
                 _ = try reader.readInt(u32, .little); // personality pointer
             },
             'L' => {
                 const enc = try reader.readByte();
-                switch (enc & 0xf) {
+                switch (enc & DW_EH_PE.type_mask) {
-                    EH_PE.sdata4 => cie.lsda_size = .p32,
+                    DW_EH_PE.sdata4 => cie.lsda_size = .p32,
-                    EH_PE.absptr => cie.lsda_size = .p64,
+                    DW_EH_PE.absptr => cie.lsda_size = .p64,
                     else => unreachable, // TODO error
                 }
             },
 @@ -538,25 +538,6 @@ pub fn writeRelocs(macho_file: *MachO, code: []u8, relocs: []macho.relocation_in
     assert(relocs.len == i);
 }
-pub const EH_PE = struct {
-    pub const absptr = 0x00;
-    pub const uleb128 = 0x01;
-    pub const udata2 = 0x02;
-    pub const udata4 = 0x03;
-    pub const udata8 = 0x04;
-    pub const sleb128 = 0x09;
-    pub const sdata2 = 0x0A;
-    pub const sdata4 = 0x0B;
-    pub const sdata8 = 0x0C;
-    pub const pcrel = 0x10;
-    pub const textrel = 0x20;
-    pub const datarel = 0x30;
-    pub const funcrel = 0x40;
-    pub const aligned = 0x50;
-    pub const indirect = 0x80;
-    pub const omit = 0xFF;
-};
 const assert = std.debug.assert;
 const leb = std.leb;
 const macho = std.macho;
 @@ -567,6 +548,7 @@ const trace = @import("../../tracy.zig").trace;
 const Allocator = std.mem.Allocator;
 const Atom = @import("Atom.zig");
+const DW_EH_PE = std.dwarf.EH.PE;
 const File = @import("file.zig").File;
 const MachO = @import("../MachO.zig");
 const Object = @import("Object.zig");

...	@@ -2593,6 +2593,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2593,6 +2593,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2593	decl_struct: {	2593	decl_struct: {
2594	if (loaded_struct.zir_index == .none) break :decl_struct;	2594	if (loaded_struct.zir_index == .none) break :decl_struct;
2595		2595
		2596	const type_inst_info = loaded_struct.zir_index.unwrap().?.resolveFull(ip).?;
		2597	if (type_inst_info.file != inst_info.file) break :decl_struct;
		2598
2596	const value_inst = value_inst: {	2599	const value_inst = value_inst: {
2597	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;	2600	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
2598	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));	2601	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
...	@@ -2608,7 +2611,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2608,7 +2611,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2608	};	2611	};
2609	break :value_inst value_inst;	2612	break :value_inst value_inst;
2610	};	2613	};
2611	const type_inst_info = loaded_struct.zir_index.unwrap().?.resolveFull(ip).?;
2612	if (type_inst_info.inst != value_inst) break :decl_struct;	2614	if (type_inst_info.inst != value_inst) break :decl_struct;
2613		2615
2614	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());	2616	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
...	@@ -2623,6 +2625,7 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2623,6 +2625,7 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2623	type_gop.value_ptr.* = nav_gop.value_ptr.*;	2625	type_gop.value_ptr.* = nav_gop.value_ptr.*;
2624	}	2626	}
2625	wip_nav.entry = nav_gop.value_ptr.*;	2627	wip_nav.entry = nav_gop.value_ptr.*;
		2628
2626	const diw = wip_nav.debug_info.writer(dwarf.gpa);	2629	const diw = wip_nav.debug_info.writer(dwarf.gpa);
2627		2630
2628	switch (loaded_struct.layout) {	2631	switch (loaded_struct.layout) {
...	@@ -2714,6 +2717,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2714,6 +2717,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2714	decl_enum: {	2717	decl_enum: {
2715	if (loaded_enum.zir_index == .none) break :decl_enum;	2718	if (loaded_enum.zir_index == .none) break :decl_enum;
2716		2719
		2720	const type_inst_info = loaded_enum.zir_index.unwrap().?.resolveFull(ip).?;
		2721	if (type_inst_info.file != inst_info.file) break :decl_enum;
		2722
2717	const value_inst = value_inst: {	2723	const value_inst = value_inst: {
2718	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;	2724	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
2719	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));	2725	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
...	@@ -2729,7 +2735,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2729,7 +2735,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2729	};	2735	};
2730	break :value_inst value_inst;	2736	break :value_inst value_inst;
2731	};	2737	};
2732	const type_inst_info = loaded_enum.zir_index.unwrap().?.resolveFull(ip).?;
2733	if (type_inst_info.inst != value_inst) break :decl_enum;	2738	if (type_inst_info.inst != value_inst) break :decl_enum;
2734		2739
2735	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());	2740	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
...	@@ -2797,6 +2802,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2797,6 +2802,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2797	} else .{ zcu.fileRootType(inst_info.file), DW.ACCESS.private };	2802	} else .{ zcu.fileRootType(inst_info.file), DW.ACCESS.private };
2798		2803
2799	decl_union: {	2804	decl_union: {
		2805	const type_inst_info = loaded_union.zir_index.resolveFull(ip).?;
		2806	if (type_inst_info.file != inst_info.file) break :decl_union;
		2807
2800	const value_inst = value_inst: {	2808	const value_inst = value_inst: {
2801	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;	2809	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
2802	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));	2810	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
...	@@ -2812,7 +2820,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2812,7 +2820,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2812	};	2820	};
2813	break :value_inst value_inst;	2821	break :value_inst value_inst;
2814	};	2822	};
2815	const type_inst_info = loaded_union.zir_index.resolveFull(ip).?;
2816	if (type_inst_info.inst != value_inst) break :decl_union;	2823	if (type_inst_info.inst != value_inst) break :decl_union;
2817		2824
2818	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());	2825	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
...	@@ -2872,9 +2879,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2872,9 +2879,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2872	}	2879	}
2873	}	2880	}
2874	try uleb128(diw, @intFromEnum(AbbrevCode.null));	2881	try uleb128(diw, @intFromEnum(AbbrevCode.null));
2875
2876	if (ip.indexToKey(loaded_union.enum_tag_ty).enum_type == .generated_tag)
2877	try wip_nav.pending_types.append(dwarf.gpa, loaded_union.enum_tag_ty);
2878	} else for (0..loaded_union.field_types.len) \|field_index\| {	2882	} else for (0..loaded_union.field_types.len) \|field_index\| {
2879	try wip_nav.abbrevCode(.untagged_union_field);	2883	try wip_nav.abbrevCode(.untagged_union_field);
2880	try wip_nav.strp(loaded_tag.names.get(ip)[field_index].toSlice(ip));	2884	try wip_nav.strp(loaded_tag.names.get(ip)[field_index].toSlice(ip));
...	@@ -2919,6 +2923,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2919,6 +2923,9 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2919	} else .{ zcu.fileRootType(inst_info.file), DW.ACCESS.private };	2923	} else .{ zcu.fileRootType(inst_info.file), DW.ACCESS.private };
2920		2924
2921	decl_opaque: {	2925	decl_opaque: {
		2926	const type_inst_info = loaded_opaque.zir_index.resolveFull(ip).?;
		2927	if (type_inst_info.file != inst_info.file) break :decl_opaque;
		2928
2922	const value_inst = value_inst: {	2929	const value_inst = value_inst: {
2923	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;	2930	const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
2924	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));	2931	const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
...	@@ -2934,7 +2941,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool	...	@@ -2934,7 +2941,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
2934	};	2941	};
2935	break :value_inst value_inst;	2942	break :value_inst value_inst;
2936	};	2943	};
2937	const type_inst_info = loaded_opaque.zir_index.resolveFull(ip).?;
2938	if (type_inst_info.inst != value_inst) break :decl_opaque;	2944	if (type_inst_info.inst != value_inst) break :decl_opaque;
2939		2945
2940	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());	2946	const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
...	@@ -3381,14 +3387,12 @@ fn updateType(	...	@@ -3381,14 +3387,12 @@ fn updateType(
3381	.Kernel, .Fragment, .Vertex => .nocall,	3387	.Kernel, .Fragment, .Vertex => .nocall,
3382	})));	3388	})));
3383	try wip_nav.refType(Type.fromInterned(func_type.return_type));	3389	try wip_nav.refType(Type.fromInterned(func_type.return_type));
3384	if (!is_nullary) {	3390	for (0..func_type.param_types.len) \|param_index\| {
3385	for (0..func_type.param_types.len) \|param_index\| {	3391	try wip_nav.abbrevCode(.func_type_param);
3386	try wip_nav.abbrevCode(.func_type_param);	3392	try wip_nav.refType(Type.fromInterned(func_type.param_types.get(ip)[param_index]));
3387	try wip_nav.refType(Type.fromInterned(func_type.param_types.get(ip)[param_index]));
3388	}
3389	if (func_type.is_var_args) try wip_nav.abbrevCode(.is_var_args);
3390	try uleb128(diw, @intFromEnum(AbbrevCode.null));
3391	}	3393	}
		3394	if (func_type.is_var_args) try wip_nav.abbrevCode(.is_var_args);
		3395	if (!is_nullary) try uleb128(diw, @intFromEnum(AbbrevCode.null));
3392	},	3396	},
3393	.error_set_type => \|error_set_type\| {	3397	.error_set_type => \|error_set_type\| {
3394	try wip_nav.abbrevCode(if (error_set_type.names.len > 0) .enum_type else .empty_enum_type);	3398	try wip_nav.abbrevCode(if (error_set_type.names.len > 0) .enum_type else .empty_enum_type);
...	@@ -3643,9 +3647,6 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP	...	@@ -3643,9 +3647,6 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
3643	}	3647	}
3644	}	3648	}
3645	try uleb128(diw, @intFromEnum(AbbrevCode.null));	3649	try uleb128(diw, @intFromEnum(AbbrevCode.null));
3646
3647	if (ip.indexToKey(loaded_union.enum_tag_ty).enum_type == .generated_tag)
3648	try wip_nav.pending_types.append(dwarf.gpa, loaded_union.enum_tag_ty);
3649	} else for (0..loaded_union.field_types.len) \|field_index\| {	3650	} else for (0..loaded_union.field_types.len) \|field_index\| {
3650	try wip_nav.abbrevCode(.untagged_union_field);	3651	try wip_nav.abbrevCode(.untagged_union_field);
3651	try wip_nav.strp(loaded_tag.names.get(ip)[field_index].toSlice(ip));	3652	try wip_nav.strp(loaded_tag.names.get(ip)[field_index].toSlice(ip));
...	@@ -3824,7 +3825,7 @@ pub fn flushModule(dwarf: *Dwarf, pt: Zcu.PerThread) FlushError!void {	...	@@ -3824,7 +3825,7 @@ pub fn flushModule(dwarf: *Dwarf, pt: Zcu.PerThread) FlushError!void {
3824	sleb128(header.fixedWriter(), dwarf.debug_frame.header.data_alignment_factor) catch unreachable;	3825	sleb128(header.fixedWriter(), dwarf.debug_frame.header.data_alignment_factor) catch unreachable;
3825	uleb128(header.fixedWriter(), dwarf.debug_frame.header.return_address_register) catch unreachable;	3826	uleb128(header.fixedWriter(), dwarf.debug_frame.header.return_address_register) catch unreachable;
3826	uleb128(header.fixedWriter(), 1) catch unreachable;	3827	uleb128(header.fixedWriter(), 1) catch unreachable;
3827	header.appendAssumeCapacity(0x10 \| 0x08 \| 0x03);	3828	header.appendAssumeCapacity(DW.EH.PE.pcrel \| DW.EH.PE.sdata4);
3828	header.appendAssumeCapacity(DW.CFA.def_cfa_sf);	3829	header.appendAssumeCapacity(DW.CFA.def_cfa_sf);
3829	uleb128(header.fixedWriter(), Register.rsp.dwarfNum()) catch unreachable;	3830	uleb128(header.fixedWriter(), Register.rsp.dwarfNum()) catch unreachable;
3830	sleb128(header.fixedWriter(), -1) catch unreachable;	3831	sleb128(header.fixedWriter(), -1) catch unreachable;