authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-05-19 03:12:34-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-06-25 19:14:03-04:00
log3f13987a761ed805656bec3b8e4db591a1cbc8ed
treedd29f1ff5aea5c55ef53e579e72441217da1a1db
parente13aa915b20db3f5521f5f280ba0bd9b1a79f1c0

x86_64: add missing padding to global unions

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

src/codegen.zig+5-5
......@@ -558,7 +558,7 @@ pub fn generateSymbol(
558558 }
559559
560560 // Check if we should store the tag first.
561 if (layout.tag_align >= layout.payload_align) {
561 if (layout.tag_size > 0 and layout.tag_align >= layout.payload_align) {
562562 switch (try generateSymbol(bin_file, src_loc, .{
563563 .ty = typed_value.ty.unionTagType(mod).?,
564564 .val = un.tag.toValue(),
......@@ -589,7 +589,7 @@ pub fn generateSymbol(
589589 }
590590 }
591591
592 if (layout.tag_size > 0) {
592 if (layout.tag_size > 0 and layout.tag_align < layout.payload_align) {
593593 switch (try generateSymbol(bin_file, src_loc, .{
594594 .ty = union_ty.tag_ty,
595595 .val = un.tag.toValue(),
......@@ -597,10 +597,10 @@ pub fn generateSymbol(
597597 .ok => {},
598598 .fail => |em| return Result{ .fail = em },
599599 }
600 }
601600
602 if (layout.padding > 0) {
603 try code.writer().writeByteNTimes(0, layout.padding);
601 if (layout.padding > 0) {
602 try code.writer().writeByteNTimes(0, layout.padding);
603 }
604604 }
605605 },
606606 .memoized_call => unreachable,
test/behavior/bugs/1381.zig-1
......@@ -12,7 +12,6 @@ const A = union(enum) {
1212};
1313
1414test "union that needs padding bytes inside an array" {
15 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
1615 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1716 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1817 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO