[release-branch.go1.17] cmd/compile: fix method expression lookup during import

CL 309831 fixed importing of method expressions, by re-using the same
code already have for ODOTMETH. But that code does not work with
embedded field.

To fix this, we need to calculate all methods of the receiver base type
of method expression, before looking up the selection.

Fixes #48102

Change-Id: Ia244d36a3ed0f989735eb57becdfa70a81912f57
Reviewed-on: https://go-review.googlesource.com/c/go/+/346489
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/346670
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/compile/internal/typecheck/iimport.go b/src/cmd/compile/internal/typecheck/iimport.go
index 37f5a7bba0ac9a351c2373c969e8dce025b57185..623916034ee85d1d7bde7196ee2a7e46222541fd 100644 (file)
--- a/src/cmd/compile/internal/typecheck/iimport.go
+++ b/src/cmd/compile/internal/typecheck/iimport.go
@@ -1222,12 +1222,14 @@ func (r *importReader) node() ir.Node {
                switch op {
                case ir.ODOT, ir.ODOTPTR, ir.ODOTINTER:
                        n.Selection = r.exoticField()
-               case ir.ODOTMETH, ir.OCALLPART, ir.OMETHEXPR:
+               case ir.OMETHEXPR:
+                       n = typecheckMethodExpr(n).(*ir.SelectorExpr)
+               case ir.ODOTMETH, ir.OCALLPART:
                        // These require a Lookup to link to the correct declaration.
                        rcvrType := expr.Type()
                        typ := n.Type()
                        n.Selection = Lookdot(n, rcvrType, 1)
-                       if op == ir.OCALLPART || op == ir.OMETHEXPR {
+                       if op == ir.OCALLPART {
                                // Lookdot clobbers the opcode and type, undo that.
                                n.SetOp(op)
                                n.SetType(typ)

diff --git a/test/fixedbugs/issue48088.dir/a.go b/test/fixedbugs/issue48088.dir/a.go
new file mode 100644 (file)
index 0000000..2bb879d
--- /dev/null
+++ b/test/fixedbugs/issue48088.dir/a.go
@@ -0,0 +1,22 @@
+// Copyright 2021 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 a
+
+type T1 struct {
+       *T2
+}
+
+type T2 struct {
+}
+
+func (t2 *T2) M() {
+}
+
+func F() {
+       f(T1.M)
+}
+
+func f(f func(T1)) {
+}

diff --git a/test/fixedbugs/issue48088.dir/b.go b/test/fixedbugs/issue48088.dir/b.go
new file mode 100644 (file)
index 0000000..221f2dd
--- /dev/null
+++ b/test/fixedbugs/issue48088.dir/b.go
@@ -0,0 +1,11 @@
+// Copyright 2021 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 b
+
+import "a"
+
+func F() {
+       a.F()
+}

diff --git a/test/fixedbugs/issue48088.go b/test/fixedbugs/issue48088.go
new file mode 100644 (file)
index 0000000..b83fbd7
--- /dev/null
+++ b/test/fixedbugs/issue48088.go
@@ -0,0 +1,7 @@
+// compiledir
+
+// Copyright 2021 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 ignored