Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/std/zig/BuiltinFn.zig
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ pub const list = list: {
"@errorCast",
.{
.tag = .error_cast,
.eval_to_error = .always,
.eval_to_error = .maybe,
.param_count = 1,
},
},
Expand Down
37 changes: 37 additions & 0 deletions test/behavior/defer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}