From 5e2e7675d53c4258a21d014a09f2a6fdae64b433 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 28 Feb 2022 17:40:56 -0800 Subject: stage2: pass generic poison up the chain in peer type resolution --- src/Sema.zig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Sema.zig') diff --git a/src/Sema.zig b/src/Sema.zig index b395f85d00..6595f977b2 100644 --- 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. -- cgit v1.2.3