Commit 0bdbd3e235daee64caf1f99e5b9d7b62f4c5c484 | zig

author	Veikka Tuominen <git@vexu.eu> 2023-10-02 15:44:50+03:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-10-03 00:45:48-07:00
log	0bdbd3e235daee64caf1f99e5b9d7b62f4c5c484
tree	374a407a0db101d2d17fc358e4b0d30dbc8b1c9d
parent	c9c3ee704c45efe0e19bd02c08f51c7513268e76

Sema: fix issues in `@errorCast` with error unions

3 files changed, 46 insertions(+), 9 deletions(-)

src
- Sema.zig
test
- behavior
  - error.zig
- cases
  - safety
    @errorCast error union casted to disjoint set.zig

src/Sema.zig+14-7

 @@ -21771,10 +21771,10 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
     // operand must be defined since it can be an invalid error value
     const maybe_operand_val = try sema.resolveDefinedValue(block, operand_src, operand);
-    if (disjoint: {
+    const disjoint = disjoint: {
         // Try avoiding resolving inferred error sets if we can
-        if (!dest_ty.isAnyError(mod) and dest_ty.errorSetNames(mod).len == 0) break :disjoint true;
+        if (!dest_ty.isAnyError(mod) and dest_ty.errorSetIsEmpty(mod)) break :disjoint true;
-        if (!operand_ty.isAnyError(mod) and operand_ty.errorSetNames(mod).len == 0) break :disjoint true;
+        if (!operand_ty.isAnyError(mod) and operand_ty.errorSetIsEmpty(mod)) break :disjoint true;
         if (dest_ty.isAnyError(mod)) break :disjoint false;
         if (operand_ty.isAnyError(mod)) break :disjoint false;
         for (dest_ty.errorSetNames(mod)) |dest_err_name| {
 @@ -21796,7 +21796,8 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
         }
         break :disjoint true;
-    }) {
+    };
+    if (disjoint and dest_tag != .ErrorUnion) {
         const msg = msg: {
             const msg = try sema.errMsg(
                 block,
 @@ -21850,10 +21851,16 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
                 .int = .{ .ty = .u16_type, .storage = .{ .u64 = 0 } },
             }));
-            const has_value = try block.addTyOp(.error_set_has_value, dest_ty, err_code);
             const is_zero = try block.addBinOp(.cmp_eq, err_int, zero_u16);
-            const ok = try block.addBinOp(.bit_or, has_value, is_zero);
+            if (disjoint) {
-            try sema.addSafetyCheck(block, src, ok, .invalid_error_code);
+                // Error must be zero.
+                try sema.addSafetyCheck(block, src, is_zero, .invalid_error_code);
+            } else {
+                // Error must be in destination set or zero.
+                const has_value = try block.addTyOp(.error_set_has_value, dest_ty, err_code);
+                const ok = try block.addBinOp(.bit_or, has_value, is_zero);
+                try sema.addSafetyCheck(block, src, ok, .invalid_error_code);
+            }
         } else {
             const err_int_inst = try block.addBitCast(Type.err_int, operand);
             const ok = try block.addTyOp(.error_set_has_value, dest_ty, err_int_inst);

test/behavior/error.zig+12-2

 @@ -238,13 +238,23 @@ fn testExplicitErrorSetCast(set1: Set1) !void {
 test "@errorCast on error unions" {
     const S = struct {
         fn doTheTest() !void {
-            const casted: error{Bad}!i32 = @errorCast(retErrUnion());
+            {
-            try expect((try casted) == 1234);
+                const casted: error{Bad}!i32 = @errorCast(retErrUnion());
+                try expect((try casted) == 1234);
+            }
+            {
+                const casted: error{Bad}!i32 = @errorCast(retInferredErrUnion());
+                try expect((try casted) == 5678);
+            }
         }
         fn retErrUnion() anyerror!i32 {
             return 1234;
         }
+        fn retInferredErrUnion() !i32 {
+            return 5678;
+        }
     };
     try S.doTheTest();

test/cases/safety/@errorCast error union casted to disjoint set.zig created+20

...	@@ -0,0 +1,20 @@
1	const std = @import("std");
2
3	pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace, _: ?usize) noreturn {
4	_ = stack_trace;
5	if (std.mem.eql(u8, message, "invalid error code")) {
6	std.process.exit(0);
7	}
8	std.process.exit(1);
9	}
10	pub fn main() !void {
11	const bar: error{Foo}!i32 = @errorCast(foo());
12	_ = &bar;
13	return error.TestFailed;
14	}
15	fn foo() anyerror!i32 {
16	return error.Bar;
17	}
18	// run
19	// backend=llvm
20	// target=native