authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-15 23:07:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-18 19:02:06-07:00
log7c66bd39be82c09cf004843da058a48769066c3f
treea677f98d777eda36ef2326fa48ad75c3aab214aa
parent45a8c6c1f4efae49effdcecd541572872fa69582

Sema: fix analyzeIsNonErrComptimeOnly false positive

The logic here was not properly ported from master branch which broke errdefers.

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

src/Sema.zig+9-1
......@@ -30613,12 +30613,20 @@ fn analyzeIsNonErrComptimeOnly(
3061330613 ies.func == func_index)
3061430614 {
3061530615 // Try to avoid resolving inferred error set if possible.
30616 if (ies.errors.count() != 0) break :blk;
30617 switch (ies.resolved) {
30618 .anyerror_type => break :blk,
30619 .none => {},
30620 else => if (ip.indexToKey(ies.resolved).error_set_type.names.len != 0) {
30621 break :blk;
30622 },
30623 }
3061630624 for (ies.inferred_error_sets.keys()) |other_ies_index| {
3061730625 if (set_ty == other_ies_index) continue;
3061830626 const other_resolved =
3061930627 try sema.resolveInferredErrorSet(block, src, other_ies_index);
3062030628 if (other_resolved == .anyerror_type) {
30621 ip.funcIesResolved(func_index).* = .anyerror_type;
30629 ies.resolved = .anyerror_type;
3062230630 break :blk;
3062330631 }
3062430632 if (ip.indexToKey(other_resolved).error_set_type.names.len != 0)