zig

commit bbbc95afd0d035224047443d56ed2252d8f47cb9 (tree)
parent 9fa9c7abd097a8a09e11e049ffcd7d0bbb439683
Author: mlugg <mlugg@mlugg.co.uk>
Date:   Tue, 12 Nov 2024 10:09:52 +0000

AstGen: add missing `rvalue` call to `labeledBlockExpr`

...and fix a minor x86_64 backend bug exposed by this fix.

Resolves: #21974

Diffstat:
M
lib/std/zig/AstGen.zig
 | 
4
+++-
M
src/arch/x86_64/Lower.zig
 | 
2
++
A
test/cases/compile_errors/labeled_block_implicit_value.zig
 | 
10
++++++++++

3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/std/zig/AstGen.zig b/lib/std/zig/AstGen.zig
@@ -2435,6 +2435,7 @@ fn blockExpr(
         if (!block_scope.endsWithNoReturn()) {
             // As our last action before the break, "pop" the error trace if needed
             _ = try gz.addRestoreErrRetIndex(.{ .block = block_inst }, .always, block_node);
+            // No `rvalue` call here, as the block result is always `void`, so we do that below.
             _ = try block_scope.addBreak(.@"break", block_inst, .void_value);
         }
 
@@ -2531,7 +2532,8 @@ fn labeledBlockExpr(
     if (!block_scope.endsWithNoReturn()) {
         // As our last action before the return, "pop" the error trace if needed
         _ = try gz.addRestoreErrRetIndex(.{ .block = block_inst }, .always, block_node);
-        _ = try block_scope.addBreak(.@"break", block_inst, .void_value);
+        const result = try rvalue(gz, block_scope.break_result_info, .void_value, block_node);
+        _ = try block_scope.addBreak(.@"break", block_inst, result);
     }
 
     if (!block_scope.label.?.used) {
diff --git a/src/arch/x86_64/Lower.zig b/src/arch/x86_64/Lower.zig
@@ -532,6 +532,8 @@ fn emit(lower: *Lower, prefix: Prefix, mnemonic: Mnemonic, ops: []const Operand)
                             },
                             else => unreachable,
                         };
+                    } else {
+                        return lower.fail("TODO: bin format '{s}'", .{@tagName(lower.bin_file.tag)});
                     }
                 },
             },
diff --git a/test/cases/compile_errors/labeled_block_implicit_value.zig b/test/cases/compile_errors/labeled_block_implicit_value.zig
@@ -0,0 +1,10 @@
+export fn foo() void {
+    const result: u32 = b: {
+        if (false) break :b 1;
+    };
+    _ = result;
+}
+
+// error
+//
+// :2:28: error: expected type 'u32', found 'void'