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

allow @errorcast to cast error sets to error unions

Browse Source
This commit is contained in:
HydroH 2024-03-28 18:23:32 +08:00 committed by GitHub
parent 17053887d0
commit 7aa42f47b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Sema.zig
View File

@ -22626,20 +22626,18 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
const base_operand_ty = sema.typeOf(operand); const base_operand_ty = sema.typeOf(operand);
const dest_tag = base_dest_ty.zigTypeTag(mod); const dest_tag = base_dest_ty.zigTypeTag(mod);
const operand_tag = base_operand_ty.zigTypeTag(mod); const operand_tag = base_operand_ty.zigTypeTag(mod);
if (dest_tag != operand_tag) {
return sema.fail(block, src, "expected source and destination types to match, found '{s}' and '{s}'", .{ if (dest_tag != .ErrorSet and dest_tag != .ErrorUnion) {
@tagName(operand_tag), @tagName(dest_tag),
});
} else if (dest_tag != .ErrorSet and dest_tag != .ErrorUnion) {
return sema.fail(block, src, "expected error set or error union type, found '{s}'", .{@tagName(dest_tag)}); return sema.fail(block, src, "expected error set or error union type, found '{s}'", .{@tagName(dest_tag)});
} }
const dest_ty, const operand_ty = if (dest_tag == .ErrorUnion) .{ if (operand_tag != .ErrorSet and operand_tag != .ErrorUnion) {
base_dest_ty.errorUnionSet(mod), return sema.fail(block, src, "expected error set or error union type, found '{s}'", .{@tagName(operand_tag)});
base_operand_ty.errorUnionSet(mod), }
} else .{ if (dest_tag == .ErrorSet and operand_tag == .ErrorUnion) {
base_dest_ty, return sema.fail(block, src, "cannot cast an error union type to error set", .{});
base_operand_ty, }
}; const dest_ty = if (dest_tag == .ErrorUnion) base_dest_ty.errorUnionSet(mod) else base_dest_ty;
const operand_ty = if (operand_tag == .ErrorUnion) base_operand_ty.errorUnionSet(mod) else base_operand_ty;
// operand must be defined since it can be an invalid error value // operand must be defined since it can be an invalid error value
const maybe_operand_val = try sema.resolveDefinedValue(block, operand_src, operand); const maybe_operand_val = try sema.resolveDefinedValue(block, operand_src, operand);
@ -22681,7 +22679,7 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
if (!dest_ty.isAnyError(mod)) check: { if (!dest_ty.isAnyError(mod)) check: {
const operand_val = mod.intern_pool.indexToKey(val.toIntern()); const operand_val = mod.intern_pool.indexToKey(val.toIntern());
var error_name: InternPool.NullTerminatedString = undefined; var error_name: InternPool.NullTerminatedString = undefined;
if (dest_tag == .ErrorUnion) { if (operand_tag == .ErrorUnion) {
if (operand_val.error_union.val != .err_name) break :check; if (operand_val.error_union.val != .err_name) break :check;
error_name = operand_val.error_union.val.err_name; error_name = operand_val.error_union.val.err_name;
} else { } else {

5
test/behavior/error.zig
View File

@ -1039,3 +1039,8 @@ test "errorCast to adhoc inferred error set" {
}; };
try std.testing.expect((try S.baz()) == 1234); try std.testing.expect((try S.baz()) == 1234);
} }
test "errorCast from error sets to error unions" {
const err_union: Set1!void = @errorCast(error.A);
try expectError(error.A, err_union);
}

23
test/cases/compile_errors/@errorCast_with_bad_type.zig Normal file
View File

@ -0,0 +1,23 @@
const err = error.Foo;
export fn entry1() void {
const a: anyerror = @errorCast(1);
_ = a;
}
export fn entry2() void {
const a: i32 = @errorCast(err);
_ = a;
}
export fn entry3() void {
const e: anyerror!void = err;
const a: anyerror = @errorCast(e);
_ = a;
}
// error
// backend=stage2
// target=x86_64-linux
//
// :4:25: error: expected error set or error union type, found 'ComptimeInt'
// :8:20: error: expected error set or error union type, found 'Int'
// :13:25: error: cannot cast an error union type to error set