From 55e7f7e12d46292e130a3b48c86bac2a6e5a1739 Mon Sep 17 00:00:00 2001 From: Dan Scales Date: Wed, 29 Sep 2021 17:47:19 -0700 Subject: [PATCH] cmd/compile: fix problem with methods of instantiated types which are nointerface In the case of a nointerface method on an instantiated type, we still have to call methodWrapper, because methodWrapper generates the actual generic method on the type as well. Currently, we don't call methodWrapper, so the method on the instantiated type never gets filled in. Adjusted the code to still call methodWrapper, but not use the result, in the case of a nointerface method on an instantiated type. Change-Id: I34bca58de2861aa772be04eb8dd7695c5b7f3a77 Reviewed-on: https://go-review.googlesource.com/c/go/+/353369 Run-TryBot: Dan Scales TryBot-Result: Go Bot Reviewed-by: Keith Randall Trust: Dan Scales --- src/cmd/compile/internal/reflectdata/reflect.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cmd/compile/internal/reflectdata/reflect.go b/src/cmd/compile/internal/reflectdata/reflect.go index 8503dee60d..a8d911f003 100644 --- a/src/cmd/compile/internal/reflectdata/reflect.go +++ b/src/cmd/compile/internal/reflectdata/reflect.go @@ -329,7 +329,11 @@ func methods(t *types.Type) []*typeSig { if f.Type.Recv() == nil { base.Fatalf("receiver with no type on %v method %v %v", mt, f.Sym, f) } - if f.Nointerface() { + if f.Nointerface() && !t.IsFullyInstantiated() { + // Skip creating method wrappers if f is nointerface. But, if + // t is an instantiated type, we still have to call + // methodWrapper, because methodWrapper generates the actual + // generic method on the type as well. continue } @@ -348,6 +352,11 @@ func methods(t *types.Type) []*typeSig { type_: typecheck.NewMethodType(f.Type, t), mtype: typecheck.NewMethodType(f.Type, nil), } + if f.Nointerface() { + // In the case of a nointerface method on an instantiated + // type, don't actually apppend the typeSig. + continue + } ms = append(ms, sig) } -- 2.48.1