Commit 7a4d69983a6ac7ab91f71910cec5886ed5bec745 | zig

author	Michael Dusan <michael.dusan@gmail.com> 2024-09-03 14:37:15-04:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2024-09-03 22:56:23+01:00
log	7a4d69983a6ac7ab91f71910cec5886ed5bec745
tree	085a161cf0a257ff15b9b86e89865f300286247d
parent	242d268a06261d31161ad3a30ac0c2827ca49d99

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

closes #20371

2 files changed, 38 insertions(+), 1 deletions(-)

lib/std/zig/BuiltinFn.zig+1-1

test/behavior/defer.zig+37

...	...	@@ -197,3 +197,40 @@ const defer_assign = switch (block: {
197	197	comptime {
198	198	if (defer_assign != 0) @compileError("defer_assign failed!");
199	199	}
	200
	201	test "errdefer capture" {
	202	const S = struct {
	203	fail: bool = undefined,
	204	fn bar0(self: *@This()) error{a}!void {
	205	self.fail = false;
	206	errdefer \|err\| if (@TypeOf(err) != error{a}) {
	207	self.fail = true;
	208	};
	209	return error.a;
	210	}
	211	fn bar1(self: *@This()) error{a}!void {
	212	self.fail = false;
	213	errdefer \|err\| if (@TypeOf(err) != error{a}) {
	214	self.fail = true;
	215	};
	216	const rv: error{a}!void = @errorCast(@as(error{a}!void, error.a));
	217	return rv;
	218	}
	219	// https://github.com/ziglang/zig/issues/20371
	220	fn bar2(self: *@This()) error{a}!void {
	221	self.fail = false;
	222	errdefer \|err\| if (@TypeOf(err) != error{a}) {
	223	self.fail = true;
	224	};
	225	return @errorCast(@as(error{a}!void, error.a));
	226	}
	227	};
	228
	229	var s: S = .{};
	230	s.bar0() catch {};
	231	if (s.fail) return error.TestExpectedError;
	232	s.bar1() catch {};
	233	if (s.fail) return error.TestExpectedError;
	234	s.bar2() catch {};
	235	if (s.fail) return error.TestExpectedError;
	236	}