From 0e3feebb042a538405153e4bc75a3bb73ee2e63c Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sun, 18 Dec 2022 22:09:13 -0500 Subject: codegen: fix taking the address of a zero-bit field in a zero-bit struct Normally when we want a pointer to the end of a struct we just add 1 to the struct pointer. However, when it is a zero-bit struct, the pointer type being used during lowering is often a dummy pointer type that actually points to a non-zero-bit type, so we actually want to add 0 instead, since a zero-bit struct begins and ends at the same address. --- src/codegen/c.zig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/codegen/c.zig') diff --git a/src/codegen/c.zig b/src/codegen/c.zig index a7a2b2cf2a..9488fa420b 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -5131,7 +5131,9 @@ fn structFieldPtr(f: *Function, inst: Air.Inst.Index, struct_ptr_ty: Type, struc .begin, .end => { try writer.writeByte('('); try f.writeCValue(writer, struct_ptr, .Other); - try writer.print(")[{}]", .{@boolToInt(field_loc == .end)}); + try writer.print(")[{}]", .{ + @boolToInt(field_loc == .end and struct_ty.hasRuntimeBitsIgnoreComptime()), + }); }, .field => |field| if (extra_name != .none) { try f.writeCValueDerefMember(writer, struct_ptr, extra_name); -- cgit v1.2.3 From 202e8a0589b4e02dac0694e3eb30ac0b51ec3f6c Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sun, 18 Dec 2022 23:38:37 -0500 Subject: cbe: fix type passed to renderParentPtr --- src/codegen/c.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/codegen/c.zig') diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 9488fa420b..2cd24f69b3 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -653,7 +653,7 @@ pub const DeclGen = struct { } try writer.print("{ }", .{fmtIdent(field_info.name)}); } else { - try dg.renderParentPtr(writer, field_ptr.container_ptr, field_info.ty); + try dg.renderParentPtr(writer, field_ptr.container_ptr, container_ptr_ty); } }, .elem_ptr => { -- cgit v1.2.3