Commit 6c06944b5958e2b624004e986deee8e52c765e6e | zig

author	Luuk de Gram <luuk@degram.dev> 2023-05-10 17:04:55+02:00
committer	Luuk de Gram <luuk@degram.dev> 2023-05-19 20:19:00+02:00
log	6c06944b5958e2b624004e986deee8e52c765e6e
tree	e5fe5776ad1cacb85125f82c7d07973688a58fb4
parent	43e89026ac90ee6e8c2cb066068eb8ff10352ac1
signature	Commit is signed but in an unrecognized format.

wasm: fix return `ret_load` with zero-size type

When we have a `ret_load` instruction with a zero-sized type which was
not an error, we would not emit any instruction. This resulted in
no `return` instruction and also not correctly resetting the global
stack_pointer.

This commit also enables the regular test runner for the WebAssembly
backend.

2 files changed, 4 insertions(+), 9 deletions(-)

lib
- test_runner.zig
src
- arch
  - wasm
    CodeGen.zig

lib/test_runner.zig+1-3

 @@ -12,9 +12,7 @@ var cmdline_buffer: [4096]u8 = undefined;
 var fba = std.heap.FixedBufferAllocator.init(&cmdline_buffer);
 pub fn main() void {
-    if (builtin.zig_backend == .stage2_wasm or
+    if (builtin.zig_backend == .stage2_aarch64) {
-        builtin.zig_backend == .stage2_aarch64)
-    {
         return mainSimple() catch @panic("test failure");
     }

src/arch/wasm/CodeGen.zig+3-6

 @@ -2122,16 +2122,13 @@ fn airRetLoad(func: *CodeGen, inst: Air.Inst.Index) InnerError!void {
     const un_op = func.air.instructions.items(.data)[inst].un_op;
     const operand = try func.resolveInst(un_op);
     const ret_ty = func.air.typeOf(un_op).childType();
+    const fn_info = func.decl.ty.fnInfo();
     if (!ret_ty.hasRuntimeBitsIgnoreComptime()) {
         if (ret_ty.isError()) {
             try func.addImm32(0);
-        } else {
-            return func.finishAir(inst, .none, &.{});
         }
-    }
+    } else if (!firstParamSRet(fn_info.cc, fn_info.return_type, func.target)) {
-    const fn_info = func.decl.ty.fnInfo();
-    if (!firstParamSRet(fn_info.cc, fn_info.return_type, func.target)) {
         // leave on the stack
         _ = try func.load(operand, ret_ty, 0);
     }