mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-30 18:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: add error for disjoint error sets in zirErrSetCast

Browse Source
This commit is contained in:
William Sengir 2022-05-11 03:36:58 -07:00
parent bd32a0f3db
commit 363cdb7d5f
No known key found for this signature in database
GPG Key ID: 83492BF162833F2A
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Sema.zig
View File

@ -14209,9 +14209,46 @@ fn zirErrSetCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstDat
try sema.checkErrorSetType(block, dest_ty_src, dest_ty);
try sema.checkErrorSetType(block, operand_src, operand_ty);
if (try sema.resolveDefinedValue(block, operand_src, operand)) |val| {
try sema.resolveInferredErrorSetTy(block, src, dest_ty);
// 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: {
// Try avoiding resolving inferred error sets if we can
if (!dest_ty.isAnyError() and dest_ty.errorSetNames().len == 0) break :disjoint true;
if (!operand_ty.isAnyError() and operand_ty.errorSetNames().len == 0) break :disjoint true;
if (dest_ty.isAnyError()) break :disjoint false;
if (operand_ty.isAnyError()) break :disjoint false;
for (dest_ty.errorSetNames()) |dest_err_name|
if (operand_ty.errorSetHasField(dest_err_name))
break :disjoint false;
if (dest_ty.tag() != .error_set_inferred and operand_ty.tag() != .error_set_inferred)
break :disjoint true;
try sema.resolveInferredErrorSetTy(block, dest_ty_src, dest_ty);
try sema.resolveInferredErrorSetTy(block, operand_src, operand_ty);
for (dest_ty.errorSetNames()) |dest_err_name|
if (operand_ty.errorSetHasField(dest_err_name))
break :disjoint false;
break :disjoint true;
}) {
const msg = msg: {
const msg = try sema.errMsg(
block,
src,
"error sets '{}' and '{}' have no common errors",
.{ operand_ty.fmt(sema.mod), dest_ty.fmt(sema.mod) },
);
errdefer msg.destroy(sema.gpa);
try sema.addDeclaredHereNote(msg, operand_ty);
try sema.addDeclaredHereNote(msg, dest_ty);
break :msg msg;
};
return sema.failWithOwnedErrorMsg(block, msg);
}
if (maybe_operand_val) |val| {
if (!dest_ty.isAnyError()) {
const error_name = val.castTag(.@"error").?.data.name;
if (!dest_ty.errorSetHasField(error_name)) {