From: Rob Findley <rfindley@google.com>
Date: Wed, 4 Aug 2021 00:36:02 +0000 (-0400)
Subject: [dev.typeparams] cmd/compile/internal/types2: fix a panic in missingMethod
X-Git-Tag: go1.18beta1~1818^2^2~49
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=880ab6209e;p=gostls13.git

[dev.typeparams] cmd/compile/internal/types2: fix a panic in missingMethod

When static == false, missingMethod incorrectly continues with a nil
Func.

Also remove some unnecessary type names from typeterm_test.go, which was
done in the go/types port.

Change-Id: I21fa637ac82b115563d3601314a470a5a43f9ae0
Reviewed-on: https://go-review.googlesource.com/c/go/+/339672
Trust: Robert Findley <rfindley@google.com>
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
---

diff --git a/src/cmd/compile/internal/types2/lookup.go b/src/cmd/compile/internal/types2/lookup.go
index 41e5bc7811..f62c3771d2 100644
--- a/src/cmd/compile/internal/types2/lookup.go
+++ b/src/cmd/compile/internal/types2/lookup.go
@@ -308,7 +308,10 @@ func (check *Checker) missingMethod(V Type, T *Interface, static bool) (method,
 		for _, m := range T.typeSet().methods {
 			_, f := ityp.typeSet().LookupMethod(m.pkg, m.name)
 
-			if f == nil && static {
+			if f == nil {
+				if !static {
+					continue
+				}
 				return m, f
 			}
 
diff --git a/src/cmd/compile/internal/types2/typeterm_test.go b/src/cmd/compile/internal/types2/typeterm_test.go
index 4676fb0437..cc4e30d989 100644
--- a/src/cmd/compile/internal/types2/typeterm_test.go
+++ b/src/cmd/compile/internal/types2/typeterm_test.go
@@ -11,11 +11,11 @@ import (
 
 var testTerms = map[string]*term{
 	"∅":       nil,
-	"⊤":       &term{},
-	"int":     &term{false, Typ[Int]},
-	"~int":    &term{true, Typ[Int]},
-	"string":  &term{false, Typ[String]},
-	"~string": &term{true, Typ[String]},
+	"⊤":       {},
+	"int":     {false, Typ[Int]},
+	"~int":    {true, Typ[Int]},
+	"string":  {false, Typ[String]},
+	"~string": {true, Typ[String]},
 	// TODO(gri) add a defined type
 }