authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-05-23 22:10:50+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-05-24 15:34:52-07:00
logb42100c70fc306c6d6f69a55e9225a9a91e363ef
tree7654e6bced1d96b3d533d6c92f6ef67a097d866e
parentcd59b8277d018a3418267b9fa0c219debdff5ca3

dwarf: update abbrev info generation for new error union layout

2 files changed, 6 insertions(+), 5 deletions(-)

src/arch/x86_64/CodeGen.zig-1
......@@ -4377,7 +4377,6 @@ fn genVarDbgInfo(
43774377fn addDbgInfoTypeReloc(self: *Self, ty: Type) !void {
43784378 switch (self.debug_output) {
43794379 .dwarf => |dw| {
4380 assert(ty.hasRuntimeBits());
43814380 const dbg_info = &dw.dbg_info;
43824381 const index = dbg_info.items.len;
43834382 try dbg_info.resize(index + 4); // DW.AT.type, DW.FORM.ref4
src/link/Dwarf.zig+6-4
......@@ -498,9 +498,11 @@ pub const DeclState = struct {
498498 .ErrorUnion => {
499499 const error_ty = ty.errorUnionSet();
500500 const payload_ty = ty.errorUnionPayload();
501 const payload_align = payload_ty.abiAlignment(target);
502 const error_align = Type.anyerror.abiAlignment(target);
501503 const abi_size = ty.abiSize(target);
502 const abi_align = ty.abiAlignment(target);
503 const payload_off = mem.alignForwardGeneric(u64, error_ty.abiSize(target), abi_align);
504 const payload_off = if (error_align >= payload_align) Type.anyerror.abiSize(target) else 0;
505 const error_off = if (error_align >= payload_align) 0 else payload_ty.abiSize(target);
504506
505507 // DW.AT.structure_type
506508 try dbg_info_buffer.append(@enumToInt(AbbrevKind.struct_type));
......@@ -534,7 +536,7 @@ pub const DeclState = struct {
534536 try dbg_info_buffer.resize(index + 4);
535537 try self.addTypeReloc(atom, error_ty, @intCast(u32, index), null);
536538 // DW.AT.data_member_location, DW.FORM.sdata
537 try dbg_info_buffer.append(0);
539 try leb128.writeULEB128(dbg_info_buffer.writer(), error_off);
538540
539541 // DW.AT.structure_type delimit children
540542 try dbg_info_buffer.append(0);
......@@ -2293,7 +2295,7 @@ fn addDbgInfoErrorSet(
22932295 // DW.AT.enumeration_type
22942296 try dbg_info_buffer.append(@enumToInt(AbbrevKind.enum_type));
22952297 // DW.AT.byte_size, DW.FORM.sdata
2296 const abi_size = ty.abiSize(target);
2298 const abi_size = Type.anyerror.abiSize(target);
22972299 try leb128.writeULEB128(dbg_info_buffer.writer(), abi_size);
22982300 // DW.AT.name, DW.FORM.string
22992301 const name = try ty.nameAllocArena(arena, module);