Commit d15dd78abd058b13c82156e5e19ec716e860889e | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-07-20 19:42:59-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-07-20 19:42:59-07:00
log	d15dd78abd058b13c82156e5e19ec716e860889e
tree	d231afca0a7e1e366ac224033db3e27590f5fc38
parent	bf09dd87b6bde0c7af6b9415661be07b250afa27

Sema: fix regression in merging error sets

When updating the code, I accidentally made it look at the fact that the
error set operands were a `type` rather than looking at exactly which error
set types they were.

1 files changed, 5 insertions(+), 5 deletions(-)

src
- Sema.zig

src/Sema.zig+5-5

 @@ -2625,9 +2625,7 @@ fn zirMergeErrorSets(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) Com
     const rhs_src: LazySrcLoc = .{ .node_offset_bin_rhs = inst_data.src_node };
     const lhs = sema.resolveInst(extra.lhs);
     const rhs = sema.resolveInst(extra.rhs);
-    const lhs_ty = sema.typeOf(lhs);
+    if (sema.typeOf(lhs).zigTypeTag() == .Bool and sema.typeOf(rhs).zigTypeTag() == .Bool) {
-    const rhs_ty = sema.typeOf(rhs);
-    if (rhs_ty.zigTypeTag() == .Bool and lhs_ty.zigTypeTag() == .Bool) {
         const msg = msg: {
             const msg = try sema.mod.errMsg(&block.base, lhs_src, "expected error set type, found 'bool'", .{});
             errdefer msg.destroy(sema.gpa);
 @@ -2636,10 +2634,12 @@ fn zirMergeErrorSets(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) Com
         };
         return sema.mod.failWithOwnedErrorMsg(&block.base, msg);
     }
-    if (rhs_ty.zigTypeTag() != .ErrorSet)
+    const lhs_ty = try sema.analyzeAsType(block, lhs_src, lhs);
-        return sema.mod.fail(&block.base, rhs_src, "expected error set type, found {}", .{rhs_ty});
+    const rhs_ty = try sema.analyzeAsType(block, rhs_src, rhs);
     if (lhs_ty.zigTypeTag() != .ErrorSet)
         return sema.mod.fail(&block.base, lhs_src, "expected error set type, found {}", .{lhs_ty});
+    if (rhs_ty.zigTypeTag() != .ErrorSet)
+        return sema.mod.fail(&block.base, rhs_src, "expected error set type, found {}", .{rhs_ty});
     // Anything merged with anyerror is anyerror.
     if (lhs_ty.tag() == .anyerror or rhs_ty.tag() == .anyerror) {