test: put type declaration back inside the function

Because issue #47631 has been fixed, remove TODO.

Change-Id: Ic476616729f47485a18a5145bd28c87dd18b4492
Reviewed-on: https://go-review.googlesource.com/c/go/+/573775
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: Ian Lance Taylor <iant@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/test/typeparam/builtins.go b/test/typeparam/builtins.go
index 763d7202d01a393023aa927ec914c9174230bc4d..51cdb31e5642c2d1d61882a59e21b0fbad838626 100644 (file)
--- a/test/typeparam/builtins.go
+++ b/test/typeparam/builtins.go
@@ -69,6 +69,10 @@ func m1[
        C1 interface{ chan int },
        C2 interface{ chan int | chan string },
 ]() {
+       type m1S0 []int
+       type m1M0 map[string]int
+       type m1C0 chan int
+
        _ = make([]int, 10)
        _ = make(m1S0, 10)
        _ = make(S1, 10)
@@ -84,10 +88,6 @@ func m1[
        _ = make(C1)
        _ = make(C1, 10)
 }
-// TODO: put these type declarations back inside m1 when issue 47631 is fixed.
-type m1S0 []int
-type m1M0 map[string]int
-type m1C0 chan int
 
 // len/cap
 

diff --git a/test/typeparam/typelist.go b/test/typeparam/typelist.go
index 7c713212b061be99a94fc8f5577f7ece148bfd49..cd8ef7d6e721068597a8f989e55749fca7e491ee 100644 (file)
--- a/test/typeparam/typelist.go
+++ b/test/typeparam/typelist.go
@@ -26,14 +26,12 @@ func at[T interface{ ~[]E }, E any](x T, i int) E {
 // type is itself, its "operational type" is defined by the type list in
 // the tybe bound, if any.
 func _[T interface{ ~int }](x T) {
+       type myint int
        var _ int = int(x)
        var _ T = 42
        var _ T = T(myint(42))
 }
 
-// TODO: put this type declaration back inside the above function when issue 47631 is fixed.
-type myint int
-
 // Indexing a generic type which has a an array as core type.
 func _[T interface{ ~[10]int }](x T) {
        _ = x[9] // ok