mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

make @trap return unreachable/noreturn (#15749)

Browse Source 
`@trap` is a special function that we know never returns so it should
behave just like `@panic` and `@compileError` do currently and cause the
"unreachable code" + "control flow is diverted here" compile error.
Currently, `@trap(); @trap();` does not cause this error. Now it does.
This commit is contained in:
zooster 2023-05-18 23:00:35 +02:00 committed by GitHub
parent 7cf2cbb33e
commit 3d64ed0353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AstGen.zig
View File

@ -8324,7 +8324,7 @@ fn builtinCall(
.trap => {
try emitDbgNode(gz, node);
_ = try gz.addNode(.trap, node);
return rvalue(gz, ri, .void_value, node);
return rvalue(gz, ri, .unreachable_value, node);
},
.error_to_int => {
const operand = try expr(gz, scope, .{ .rl = .none }, params[0]);

1
test/behavior/builtin_functions_returning_void_or_noreturn.zig
View File

@ -26,5 +26,4 @@ test {
try testing.expectEqual({}, @setEvalBranchQuota(0));
try testing.expectEqual({}, @setFloatMode(.Optimized));
try testing.expectEqual({}, @setRuntimeSafety(true));
try testing.expectEqual(noreturn, @TypeOf(if (true) @trap() else {}));
}

23
test/cases/compile_errors/noreturn_builtins_divert_control_flow.zig Normal file
View File

@ -0,0 +1,23 @@
export fn entry1() void {
@trap();
@trap();
}
export fn entry2() void {
@panic("");
@panic("");
}
export fn entry3() void {
@compileError("");
@compileError("");
}
// error
// backend=stage2
// target=native
//
// :3:5: error: unreachable code
// :2:5: note: control flow is diverted here
// :7:5: error: unreachable code
// :6:5: note: control flow is diverted here
// :11:5: error: unreachable code
// :10:5: note: control flow is diverted here