mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: update @errorCast to maybe eval to err

Browse Source 
Consequently, `AstGen.ret()` now passes the error code to
`.defer_error_code`. Previously, the error union value was passed.

closes #20371
This commit is contained in:
Michael Dusan 2024-09-03 14:37:15 -04:00 committed by Matthew Lugg
parent 242d268a06
commit 7a4d69983a
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/zig/BuiltinFn.zig
View File

@ -482,7 +482,7 @@ pub const list = list: {
"@errorCast",
.{
.tag = .error_cast,
.eval_to_error = .always,
.eval_to_error = .maybe,
.param_count = 1,
},
},

37
test/behavior/defer.zig
View File

@ -197,3 +197,40 @@ const defer_assign = switch (block: {
comptime {
if (defer_assign != 0) @compileError("defer_assign failed!");
}
test "errdefer capture" {
const S = struct {
fail: bool = undefined,
fn bar0(self: *@This()) error{a}!void {
self.fail = false;
errdefer |err| if (@TypeOf(err) != error{a}) {
self.fail = true;
};
return error.a;
}
fn bar1(self: *@This()) error{a}!void {
self.fail = false;
errdefer |err| if (@TypeOf(err) != error{a}) {
self.fail = true;
};
const rv: error{a}!void = @errorCast(@as(error{a}!void, error.a));
return rv;
}
// https://github.com/ziglang/zig/issues/20371
fn bar2(self: *@This()) error{a}!void {
self.fail = false;
errdefer |err| if (@TypeOf(err) != error{a}) {
self.fail = true;
};
return @errorCast(@as(error{a}!void, error.a));
}
};
var s: S = .{};
s.bar0() catch {};
if (s.fail) return error.TestExpectedError;
s.bar1() catch {};
if (s.fail) return error.TestExpectedError;
s.bar2() catch {};
if (s.fail) return error.TestExpectedError;
}