From 2e6b7c8c7f6d2bf4dd128ced7dc18d4375162ae7 Mon Sep 17 00:00:00 2001 From: goto1134 <1134togo@gmail.com> Date: Wed, 10 Dec 2025 18:15:08 +0100 Subject: [PATCH 1/2] cmd/compile: fix typos in TestGenericMethodInfo --- src/cmd/compile/internal/types2/api_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/compile/internal/types2/api_test.go b/src/cmd/compile/internal/types2/api_test.go index e824f56fae76dc..28a24f8e068ef8 100644 --- a/src/cmd/compile/internal/types2/api_test.go +++ b/src/cmd/compile/internal/types2/api_test.go @@ -809,13 +809,13 @@ func (r *N[C]) n() { } t.Errorf(`N.Method(...) returns %v for "m", but Info.Defs has %v`, gm, dm) } if gn != dn { - t.Errorf(`N.Method(...) returns %v for "m", but Info.Defs has %v`, gm, dm) + t.Errorf(`N.Method(...) returns %v for "n", but Info.Defs has %v`, gn, dn) } if dmm != dm { t.Errorf(`Inside "m", r.m uses %v, want the defined func %v`, dmm, dm) } if dmn == dn { - t.Errorf(`Inside "m", r.n uses %v, want a func distinct from %v`, dmm, dm) + t.Errorf(`Inside "m", r.n uses %v, want a func distinct from %v`, dmn, dn) } } From 175ae95847b0108949459b881c2cd2144e74353e Mon Sep 17 00:00:00 2001 From: goto1134 <1134togo@gmail.com> Date: Wed, 10 Dec 2025 18:27:14 +0100 Subject: [PATCH 2/2] cmd/compile: update package names in tests --- src/cmd/compile/internal/types2/api_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/compile/internal/types2/api_test.go b/src/cmd/compile/internal/types2/api_test.go index 28a24f8e068ef8..d75c15d80458cc 100644 --- a/src/cmd/compile/internal/types2/api_test.go +++ b/src/cmd/compile/internal/types2/api_test.go @@ -692,7 +692,7 @@ func TestUsesInfo(t *testing.T) { // Uses of fields are instantiated. {`package s1; type N[A any] struct{ a A }; var f = N[int]{}.a`, `a`, `field a int`}, - {`package s1; type N[A any] struct{ a A }; func (r N[B]) m(b B) { r.a = b }`, `a`, `field a B`}, + {`package s2; type N[A any] struct{ a A }; func (r N[B]) m(b B) { r.a = b }`, `a`, `field a B`}, // Uses of methods are uses of the instantiated method. {`package m0; type N[A any] int; func (r N[B]) m() { r.n() }; func (N[C]) n() {}`, `n`, `func (m0.N[B]).n()`}, @@ -945,9 +945,9 @@ func TestPredicatesInfo(t *testing.T) { {`package v0; var (a, b int; _ = a + b)`, `a + b`, `value`}, {`package v1; var _ = &[]int{1}`, `[]int{…}`, `value`}, {`package v2; var _ = func(){}`, `func() {}`, `value`}, - {`package v4; func f() { _ = f }`, `f`, `value`}, - {`package v3; var _ *int = nil`, `nil`, `value, nil`}, - {`package v3; var _ *int = (nil)`, `(nil)`, `value, nil`}, + {`package v3; func f() { _ = f }`, `f`, `value`}, + {`package v4; var _ *int = nil`, `nil`, `value, nil`}, + {`package v5; var _ *int = (nil)`, `(nil)`, `value, nil`}, // addressable (and thus assignable) operands {`package a0; var (x int; _ = x)`, `x`, `value, addressable, assignable`}, @@ -978,8 +978,8 @@ func TestPredicatesInfo(t *testing.T) { {`package m4; var v int`, `v`, ``}, {`package m5; func f() {}`, `f`, ``}, {`package m6; func _(x int) {}`, `x`, ``}, - {`package m6; func _()(x int) { return }`, `x`, ``}, - {`package m6; type T int; func (x T) _() {}`, `x`, ``}, + {`package m7; func _()(x int) { return }`, `x`, ``}, + {`package m8; type T int; func (x T) _() {}`, `x`, ``}, } for _, test := range tests {