Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-13 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: add missing rvalue call to labeledBlockExpr

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

Resolves: #21974
This commit is contained in:
mlugg 2024-11-12 10:09:52 +00:00 committed by Matthew Lugg
parent 9fa9c7abd0
commit bbbc95afd0
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/zig/AstGen.zig
View File

@ -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) {

2
src/arch/x86_64/Lower.zig
View File

@ -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)});
}
},
},

10
test/cases/compile_errors/labeled_block_implicit_value.zig Normal file
View File

@ -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'