diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-03-06 18:40:21 +0100 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-04-04 06:08:10 +0200 |
| commit | 7415739e36cf16574b754dda5ce03c0026b6907c (patch) | |
| tree | e5a46f37de3cff3df28c4f4c441e1763ee9e7dea /src/Sema.zig | |
| parent | 82b9d9c0f6adf471543b160e15eaeb2a14c722cb (diff) | |
| download | zig-7415739e36cf16574b754dda5ce03c0026b6907c.tar.gz zig-7415739e36cf16574b754dda5ce03c0026b6907c.zip | |
Sema: Prevent tail calls of std.builtin.returnError().
LLVM 20 started tail-calling it in some of our test cases, resulting in:
error: AndMyCarIsOutOfGas
/home/alexrp/Source/ziglang/zig-llvm20/repro.zig:2:5: 0x103ef9d in main (repro)
return error.TheSkyIsFalling;
^
/home/alexrp/Source/ziglang/zig-llvm20/repro.zig:6:5: 0x103efa5 in main (repro)
return error.AndMyCarIsOutOfGas;
^
/home/alexrp/Source/ziglang/zig-llvm20/lib/std/start.zig:656:37: 0x103ee83 in posixCallMainAndExit (repro)
const result = root.main() catch |err| {
^
instead of the expected:
error: AndMyCarIsOutOfGas
/home/alexrp/Source/ziglang/zig-llvm20/repro.zig:2:5: 0x103f00d in main (repro)
return error.TheSkyIsFalling;
^
/home/alexrp/Source/ziglang/zig-llvm20/repro.zig:6:5: 0x103f015 in main (repro)
return error.AndMyCarIsOutOfGas;
^
/home/alexrp/Source/ziglang/zig-llvm20/repro.zig:11:9: 0x103f01d in main (repro)
try bar();
^
Diffstat (limited to 'src/Sema.zig')
| -rw-r--r-- | src/Sema.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index 40c170cbe7..ad800c29a6 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -19226,7 +19226,7 @@ fn retWithErrTracing( const return_err_fn = Air.internedToRef(try sema.getBuiltin(src, .returnError)); if (!need_check) { - try sema.callBuiltin(block, src, return_err_fn, .never_inline, &.{}, .@"error return"); + try sema.callBuiltin(block, src, return_err_fn, .never_tail, &.{}, .@"error return"); _ = try block.addUnOp(ret_tag, operand); return; } @@ -19237,7 +19237,7 @@ fn retWithErrTracing( var else_block = block.makeSubBlock(); defer else_block.instructions.deinit(gpa); - try sema.callBuiltin(&else_block, src, return_err_fn, .never_inline, &.{}, .@"error return"); + try sema.callBuiltin(&else_block, src, return_err_fn, .never_tail, &.{}, .@"error return"); _ = try else_block.addUnOp(ret_tag, operand); try sema.air_extra.ensureUnusedCapacity(gpa, @typeInfo(Air.CondBr).@"struct".fields.len + |