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

Sema: fix comparison between error set and comptime-known error union

Browse Source 
Resolves: #20613
This commit is contained in:
mlugg 2025-02-05 20:13:56 +00:00
parent 9ba9f457be
commit cac814cf58
No known key found for this signature in database
GPG Key ID: 3F5B7DCCBF4AF02E
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Sema.zig
View File

@ -9145,6 +9145,7 @@ fn zirErrUnionCode(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErro
return sema.analyzeErrUnionCode(block, src, operand);
}
/// If `operand` is comptime-known, asserts that it is an error value rather than a payload value.
fn analyzeErrUnionCode(sema: *Sema, block: *Block, src: LazySrcLoc, operand: Air.Inst.Ref) CompileError!Air.Inst.Ref {
const pt = sema.pt;
const zcu = pt.zcu;
@ -17599,10 +17600,16 @@ fn analyzeCmp(
return sema.cmpNumeric(block, src, lhs, rhs, op, lhs_src, rhs_src);
}
if (is_equality_cmp and lhs_ty.zigTypeTag(zcu) == .error_union and rhs_ty.zigTypeTag(zcu) == .error_set) {
if (try sema.resolveDefinedValue(block, lhs_src, lhs)) |lhs_val| {
if (lhs_val.errorUnionIsPayload(zcu)) return .bool_false;
}
const casted_lhs = try sema.analyzeErrUnionCode(block, lhs_src, lhs);
return sema.cmpSelf(block, src, casted_lhs, rhs, op, lhs_src, rhs_src);
}
if (is_equality_cmp and lhs_ty.zigTypeTag(zcu) == .error_set and rhs_ty.zigTypeTag(zcu) == .error_union) {
if (try sema.resolveDefinedValue(block, rhs_src, rhs)) |rhs_val| {
if (rhs_val.errorUnionIsPayload(zcu)) return .bool_false;
}
const casted_rhs = try sema.analyzeErrUnionCode(block, rhs_src, rhs);
return sema.cmpSelf(block, src, lhs, casted_rhs, op, lhs_src, rhs_src);
}
@ -23254,7 +23261,7 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
zcu.backendSupportsFeature(.error_set_has_value))
{
if (dest_tag == .error_union) {
const err_code = try sema.analyzeErrUnionCode(block, operand_src, operand);
const err_code = try block.addTyOp(.unwrap_errunion_err, operand_ty, operand);
const err_int = try block.addBitCast(err_int_ty, err_code);
const zero_err = try pt.intRef(try pt.errorIntType(), 0);

11
test/behavior/error.zig
View File

@ -1100,3 +1100,14 @@ test "return error union with i65" {
fn add(x: i65, y: i65) anyerror!i65 {
return x + y;
}
test "compare error union to error set" {
const S = struct {
fn doTheTest(val: error{Foo}!i32) !void {
if (error.Foo == val) return error.Unexpected;
if (val == error.Foo) return error.Unexpected;
}
};
try S.doTheTest(0);
try comptime S.doTheTest(0);
}