From 1e5955aabdacca1e37dc5326aaa9cefea863ee64 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Mon, 3 Apr 2023 11:18:45 +0700 Subject: [PATCH] cmd/compile: don't set range expr key/value type if already set Unified IR already records the correct type for them. Fixes #59378 Change-Id: I275c45b48f67bde55c8e2079d60b5868d0acde7f Reviewed-on: https://go-review.googlesource.com/c/go/+/481555 Reviewed-by: Michael Knyszek Auto-Submit: Cuong Manh Le Run-TryBot: Cuong Manh Le TryBot-Result: Gopher Robot Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/typecheck/stmt.go | 2 +- test/fixedbugs/issue59378.go | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 test/fixedbugs/issue59378.go diff --git a/src/cmd/compile/internal/typecheck/stmt.go b/src/cmd/compile/internal/typecheck/stmt.go index eb13175384..3ad116144b 100644 --- a/src/cmd/compile/internal/typecheck/stmt.go +++ b/src/cmd/compile/internal/typecheck/stmt.go @@ -72,7 +72,7 @@ func typecheckrangeExpr(n *ir.RangeStmt) { do := func(nn ir.Node, t *types.Type) { if nn != nil { - if ir.DeclaredBy(nn, n) { + if ir.DeclaredBy(nn, n) && nn.Type() == nil { nn.SetType(t) } else if nn.Type() != nil { if op, why := Assignop(t, nn.Type()); op == ir.OXXX { diff --git a/test/fixedbugs/issue59378.go b/test/fixedbugs/issue59378.go new file mode 100644 index 0000000000..8ff198eaa7 --- /dev/null +++ b/test/fixedbugs/issue59378.go @@ -0,0 +1,26 @@ +// compile + +// Copyright 2023 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package p + +func f() { + F([]int{}, func(*int) bool { return true }) +} + +func F[S []E, E any](a S, fn func(*E) bool) { + for _, v := range a { + G(a, func(e E) bool { return fn(&v) }) + } +} + +func G[E any](s []E, f func(E) bool) int { + for i, v := range s { + if f(v) { + return i + } + } + return -1 +}