diff options
author | Robert Griesemer <gri@golang.org> | 2022-01-04 21:01:21 -0800 |
---|---|---|
committer | Robert Griesemer <gri@golang.org> | 2022-01-06 21:38:58 +0000 |
commit | 2bfa6ef63d3cfa89f46cc5f6708c1078f15fb875 (patch) | |
tree | a7f727bb26d561b2c76dd15214b3e6fb1760e94f /src/cmd/compile | |
parent | c5540e53b1f692a8c977fd1e4ee0915eea66f999 (diff) | |
download | go-2bfa6ef63d3cfa89f46cc5f6708c1078f15fb875.tar.gz go-2bfa6ef63d3cfa89f46cc5f6708c1078f15fb875.zip |
go/types, types2: remove unused code in lookupFieldOrMethod
The underlying type of a type parameter is an interface,
so we don't need a special case for type parameters anymore.
Simply share the (identical) code for interfaces.
Adjust code in types.NewMethodSet accordingly.
No functional difference.
Preparation for fix of issues below.
For #50233.
For #50417.
Change-Id: Ib2deadd12f89e6918dec224b4ce35583001c3101
Reviewed-on: https://go-review.googlesource.com/c/go/+/375514
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Diffstat (limited to 'src/cmd/compile')
-rw-r--r-- | src/cmd/compile/internal/types2/lookup.go | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/cmd/compile/internal/types2/lookup.go b/src/cmd/compile/internal/types2/lookup.go index ee764c7d14..7bdf13b4b7 100644 --- a/src/cmd/compile/internal/types2/lookup.go +++ b/src/cmd/compile/internal/types2/lookup.go @@ -82,7 +82,7 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name typ, isPtr := deref(T) - // *typ where typ is an interface has no methods. + // *typ where typ is an interface (incl. a type parameter) has no methods. if isPtr { if _, ok := under(typ).(*Interface); ok { return @@ -106,7 +106,6 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name var next []embeddedType // embedded types found at current depth // look for (pkg, name) in all types at current depth - var tpar *TypeParam // set if obj receiver is a type parameter for _, e := range current { typ := e.typ @@ -139,13 +138,9 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name indirect = e.indirect continue // we can't have a matching field or interface method } - - // continue with underlying type - typ = named.under() } - tpar = nil - switch t := typ.(type) { + switch t := under(typ).(type) { case *Struct: // look for a matching field and collect embedded types for i, f := range t.fields { @@ -178,7 +173,7 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name } case *Interface: - // look for a matching method + // look for a matching method (interface may be a type parameter) if i, m := lookupMethodFold(t.typeSet().methods, pkg, name, checkFold); m != nil { assert(m.typ != nil) index = concat(e.index, i) @@ -188,24 +183,6 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name obj = m indirect = e.indirect } - - case *TypeParam: - if i, m := lookupMethodFold(t.iface().typeSet().methods, pkg, name, checkFold); m != nil { - assert(m.typ != nil) - index = concat(e.index, i) - if obj != nil || e.multiples { - return nil, index, false // collision - } - tpar = t - obj = m - indirect = e.indirect - } - if obj == nil { - // At this point we're not (yet) looking into methods - // that any underlying type of the types in the type list - // might have. - // TODO(gri) Do we want to specify the language that way? - } } } @@ -217,8 +194,7 @@ func lookupFieldOrMethod(T Type, addressable, checkFold bool, pkg *Package, name // is shorthand for (&x).m()". if f, _ := obj.(*Func); f != nil { // determine if method has a pointer receiver - hasPtrRecv := tpar == nil && f.hasPtrRecv() - if hasPtrRecv && !indirect && !addressable { + if f.hasPtrRecv() && !indirect && !addressable { return nil, nil, true // pointer/addressable receiver required } } |