From 12cdb36c5ba1fd9dfa5985d36a2f5955528c2de7 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Mon, 28 Feb 2022 18:19:25 +0100
Subject: codegen: fix padding calculation for error unions when lowering

* do not track `rdi` register before `call` inst, but instead freeze
  it from further use, until `call` has been realised
* pass more error union tests
---
 src/codegen.zig | 45 ++++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

(limited to 'src/codegen.zig')

diff --git a/src/codegen.zig b/src/codegen.zig
index 2484cb0e59..d72c2efb5b 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -553,31 +553,21 @@ pub fn generateSymbol(
             const target = bin_file.options.target;
             const abi_align = typed_value.ty.abiAlignment(target);
 
-            {
-                const error_val = if (!is_payload) typed_value.val else Value.initTag(.zero);
-                const begin = code.items.len;
-                switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{
-                    .ty = error_ty,
-                    .val = error_val,
-                }, code, debug_output)) {
-                    .appended => {},
-                    .externally_managed => |external_slice| {
-                        code.appendSliceAssumeCapacity(external_slice);
-                    },
-                    .fail => |em| return Result{ .fail = em },
-                }
-                const unpadded_end = code.items.len - begin;
-                const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align);
-                const padding = try math.cast(usize, padded_end - unpadded_end);
-
-                if (padding > 0) {
-                    try code.writer().writeByteNTimes(0, padding);
-                }
+            const error_val = if (!is_payload) typed_value.val else Value.initTag(.zero);
+            const begin = code.items.len;
+            switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{
+                .ty = error_ty,
+                .val = error_val,
+            }, code, debug_output)) {
+                .appended => {},
+                .externally_managed => |external_slice| {
+                    code.appendSliceAssumeCapacity(external_slice);
+                },
+                .fail => |em| return Result{ .fail = em },
             }
 
             if (payload_ty.hasRuntimeBits()) {
                 const payload_val = if (typed_value.val.castTag(.eu_payload)) |val| val.data else Value.initTag(.undef);
-                const begin = code.items.len;
                 switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{
                     .ty = payload_ty,
                     .val = payload_val,
@@ -588,13 +578,14 @@ pub fn generateSymbol(
                     },
                     .fail => |em| return Result{ .fail = em },
                 }
-                const unpadded_end = code.items.len - begin;
-                const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align);
-                const padding = try math.cast(usize, padded_end - unpadded_end);
+            }
 
-                if (padding > 0) {
-                    try code.writer().writeByteNTimes(0, padding);
-                }
+            const unpadded_end = code.items.len - begin;
+            const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align);
+            const padding = try math.cast(usize, padded_end - unpadded_end);
+
+            if (padding > 0) {
+                try code.writer().writeByteNTimes(0, padding);
             }
 
             return Result{ .appended = {} };
-- 
cgit v1.2.3