zig

commit 5e2e7675d53c4258a21d014a09f2a6fdae64b433 (tree)
parent 0ce2d46ff9b520ebd09f499cd2caf6e5667f5fa7
Author: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date:   Mon, 28 Feb 2022 17:40:56 -0800

stage2: pass generic poison  up the chain in peer type resolution

Diffstat:
M
src/Sema.zig
 | 
5
++---

1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -17612,9 +17612,8 @@ fn resolvePeerTypes(
     var chosen = instructions[0];
     var err_set_ty: ?Type = blk: {
         const chosen_ty = sema.typeOf(chosen);
-
-        // TODO: is this the right handling of generic poison?
-        if (chosen_ty.tag() == .generic_poison or chosen_ty.zigTypeTag() != .ErrorSet)
+        const chosen_ty_tag = try chosen_ty.zigTypeTagOrPoison();
+        if (chosen_ty_tag != .ErrorSet)
             break :blk null;
 
         // If our chosen type is inferred, we have to resolve it now.