From fb192df4f2d12dda5019e14bf6cab2693432cb36 Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Fri, 29 Mar 2024 20:18:09 -0400
Subject: cbe: fix uncovered bugs

---
 src/Sema.zig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/Sema.zig')

diff --git a/src/Sema.zig b/src/Sema.zig
index 6061dbfea4..3c999e507e 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -36125,7 +36125,7 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {
         // alignment is greater.
         var size: u64 = 0;
         var padding: u32 = 0;
-        if (tag_align.compare(.gte, max_align)) {
+        if (tag_align.order(max_align).compare(.gte)) {
             // {Tag, Payload}
             size += tag_size;
             size = max_align.forward(size);
@@ -36136,7 +36136,10 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {
         } else {
             // {Payload, Tag}
             size += max_size;
-            size = tag_align.forward(size);
+            size = switch (mod.getTarget().ofmt) {
+                .c => max_align,
+                else => tag_align,
+            }.forward(size);
             size += tag_size;
             const prev_size = size;
             size = max_align.forward(size);
-- 
cgit v1.2.3