From 3f13987a761ed805656bec3b8e4db591a1cbc8ed Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Fri, 19 May 2023 03:12:34 -0400 Subject: x86_64: add missing padding to global unions --- src/codegen.zig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/codegen.zig') diff --git a/src/codegen.zig b/src/codegen.zig index 1718201e6c..69499fb1ad 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -558,7 +558,7 @@ pub fn generateSymbol( } // Check if we should store the tag first. - if (layout.tag_align >= layout.payload_align) { + if (layout.tag_size > 0 and layout.tag_align >= layout.payload_align) { switch (try generateSymbol(bin_file, src_loc, .{ .ty = typed_value.ty.unionTagType(mod).?, .val = un.tag.toValue(), @@ -589,7 +589,7 @@ pub fn generateSymbol( } } - if (layout.tag_size > 0) { + if (layout.tag_size > 0 and layout.tag_align < layout.payload_align) { switch (try generateSymbol(bin_file, src_loc, .{ .ty = union_ty.tag_ty, .val = un.tag.toValue(), @@ -597,10 +597,10 @@ pub fn generateSymbol( .ok => {}, .fail => |em| return Result{ .fail = em }, } - } - if (layout.padding > 0) { - try code.writer().writeByteNTimes(0, layout.padding); + if (layout.padding > 0) { + try code.writer().writeByteNTimes(0, layout.padding); + } } }, .memoized_call => unreachable, -- cgit v1.2.3