internal/typeparams: eliminate remainining compatibility shims

The nil checks in wrappers that had them were all redundant. Change-Id: Ide7296f2253610638b59dc4980b0487b9de72f0c Reviewed-on: https://go-review.googlesource.com/c/tools/+/549236 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Alan Donovan <adonovan@google.com> Reviewed-by: Robert Findley <rfindley@google.com>

Author: adonovan

go/analysis/passes/ifaceassert/parameterized.go

@@ -95,7 +95,7 @@ func (w *tpWalker) isParameterized(typ types.Type) (res bool) {
 return w.isParameterized(t.Elem())
 
 case *types.Named:
-list := typeparams.NamedTypeArgs(t)
+list := t.TypeArgs()
 for i, n := 0, list.Len(); i < n; i++ {
 if w.isParameterized(list.At(i)) {
 return true

go/analysis/passes/tests/tests.go

@@ -17,7 +17,6 @@ import (
 
 "golang.org/x/tools/go/analysis"
 "golang.org/x/tools/go/analysis/passes/internal/analysisutil"
-"golang.org/x/tools/internal/typeparams"
 )
 
 //go:embed doc.go
@@ -391,7 +390,7 @@ func checkExampleName(pass *analysis.Pass, fn *ast.FuncDecl) {
 if results := fn.Type.Results; results != nil && len(results.List) != 0 {
 pass.Reportf(fn.Pos(), "%s should return nothing", fnName)
 }
-if tparams := typeparams.ForFuncType(fn.Type); tparams != nil && len(tparams.List) > 0 {
+if tparams := fn.Type.TypeParams; tparams != nil && len(tparams.List) > 0 {
 pass.Reportf(fn.Pos(), "%s should not have type params", fnName)
 }
 
@@ -460,7 +459,7 @@ func checkTest(pass *analysis.Pass, fn *ast.FuncDecl, prefix string) {
 return
 }
 
-if tparams := typeparams.ForFuncType(fn.Type); tparams != nil && len(tparams.List) > 0 {
+if tparams := fn.Type.TypeParams; tparams != nil && len(tparams.List) > 0 {
 // Note: cmd/go/internal/load also errors about TestXXX and BenchmarkXXX functions with type parameters.
 // We have currently decided to also warn before compilation/package loading. This can help users in IDEs.
 // TODO(adonovan): use ReportRangef(tparams).

go/analysis/unitchecker/unitchecker.go

@@ -50,7 +50,6 @@ import (
 "golang.org/x/tools/go/analysis"
 "golang.org/x/tools/go/analysis/internal/analysisflags"
 "golang.org/x/tools/internal/facts"
-"golang.org/x/tools/internal/typeparams"
 "golang.org/x/tools/internal/versions"
 )
 
@@ -259,10 +258,10 @@ func run(fset *token.FileSet, cfg *Config, analyzers []*analysis.Analyzer) ([]re
 Defs: make(map[*ast.Ident]types.Object),
 Uses: make(map[*ast.Ident]types.Object),
 Implicits: make(map[ast.Node]types.Object),
+Instances: make(map[*ast.Ident]types.Instance),
 Scopes: make(map[ast.Node]*types.Scope),
 Selections: make(map[*ast.SelectorExpr]*types.Selection),
 }
-typeparams.InitInstanceInfo(info)
 versions.InitFileVersions(info)
 
 pkg, err := tc.Check(cfg.ImportPath, fset, files, info)

go/ast/astutil/enclosing.go

@@ -11,8 +11,6 @@ import (
 "go/ast"
 "go/token"
 "sort"
-
-"golang.org/x/tools/internal/typeparams"
 )
 
 // PathEnclosingInterval returns the node that encloses the source
@@ -322,7 +320,7 @@ func childrenOf(n ast.Node) []ast.Node {
 children = append(children, n.Recv)
 }
 children = append(children, n.Name)
-if tparams := typeparams.ForFuncType(n.Type); tparams != nil {
+if tparams := n.Type.TypeParams; tparams != nil {
 children = append(children, tparams)
 }
 if n.Type.Params != nil {

go/ast/astutil/rewrite.go

@@ -9,8 +9,6 @@ import (
 "go/ast"
 "reflect"
 "sort"
-
-"golang.org/x/tools/internal/typeparams"
 )
 
 // An ApplyFunc is invoked by Apply for each node n, even if n is nil,
@@ -293,7 +291,7 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 a.apply(n, "Fields", nil, n.Fields)
 
 case *ast.FuncType:
-if tparams := typeparams.ForFuncType(n); tparams != nil {
+if tparams := n.TypeParams; tparams != nil {
 a.apply(n, "TypeParams", nil, tparams)
 }
 a.apply(n, "Params", nil, n.Params)
@@ -408,7 +406,7 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 case *ast.TypeSpec:
 a.apply(n, "Doc", nil, n.Doc)
 a.apply(n, "Name", nil, n.Name)
-if tparams := typeparams.ForTypeSpec(n); tparams != nil {
+if tparams := n.TypeParams; tparams != nil {
 a.apply(n, "TypeParams", nil, tparams)
 }
 a.apply(n, "Type", nil, n.Type)

go/callgraph/vta/graph.go

@@ -676,7 +676,7 @@ func (b *builder) multiconvert(c *ssa.MultiConvert) {
 // Common case.
 // Specializing the len=1 case to avoid a slice
 // had no measurable space/time benefit.
-terms = []*types.Term{typeparams.NewTerm(false, typ)}
+terms = []*types.Term{types.NewTerm(false, typ)}
 }
 
 if err != nil {

go/loader/loader.go

@@ -23,7 +23,6 @@ import (
 
 "golang.org/x/tools/go/ast/astutil"
 "golang.org/x/tools/go/internal/cgo"
-"golang.org/x/tools/internal/typeparams"
 "golang.org/x/tools/internal/versions"
 )
 
@@ -1034,13 +1033,13 @@ func (imp *importer) newPackageInfo(path, dir string) *PackageInfo {
 Defs: make(map[*ast.Ident]types.Object),
 Uses: make(map[*ast.Ident]types.Object),
 Implicits: make(map[ast.Node]types.Object),
+Instances: make(map[*ast.Ident]types.Instance),
 Scopes: make(map[ast.Node]*types.Scope),
 Selections: make(map[*ast.SelectorExpr]*types.Selection),
 },
 errorFunc: imp.conf.TypeChecker.Error,
 dir: dir,
 }
-typeparams.InitInstanceInfo(&info.Info)
 versions.InitFileVersions(&info.Info)
 
 // Copy the types.Config so we can vary it across PackageInfos.

go/packages/packages.go

@@ -27,7 +27,6 @@ import (
 "golang.org/x/tools/go/gcexportdata"
 "golang.org/x/tools/internal/gocommand"
 "golang.org/x/tools/internal/packagesinternal"
-"golang.org/x/tools/internal/typeparams"
 "golang.org/x/tools/internal/typesinternal"
 "golang.org/x/tools/internal/versions"
 )
@@ -1015,10 +1014,10 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 Defs: make(map[*ast.Ident]types.Object),
 Uses: make(map[*ast.Ident]types.Object),
 Implicits: make(map[ast.Node]types.Object),
+Instances: make(map[*ast.Ident]types.Instance),
 Scopes: make(map[ast.Node]*types.Scope),
 Selections: make(map[*ast.SelectorExpr]*types.Selection),
 }
-typeparams.InitInstanceInfo(lpkg.TypesInfo)
 versions.InitFileVersions(lpkg.TypesInfo)
 lpkg.TypesSizes = ld.sizes
 

go/ssa/builder_test.go

@@ -26,7 +26,6 @@ import (
 "golang.org/x/tools/go/ssa"
 "golang.org/x/tools/go/ssa/ssautil"
 "golang.org/x/tools/internal/testenv"
-"golang.org/x/tools/internal/typeparams"
 "golang.org/x/tools/txtar"
 )
 
@@ -689,10 +688,10 @@ func LoadPointer(addr *unsafe.Pointer) (val unsafe.Pointer)
 p := prog.Package(lprog.Package("p").Pkg)
 p.Build()
 
-if load := p.Func("Load"); typeparams.ForSignature(load.Signature).Len() != 1 {
+if load := p.Func("Load"); load.Signature.TypeParams().Len() != 1 {
 t.Errorf("expected a single type param T for Load got %q", load.Signature)
 }
-if ptr := p.Type("Pointer"); typeparams.ForNamed(ptr.Type().(*types.Named)).Len() != 1 {
+if ptr := p.Type("Pointer"); ptr.Type().(*types.Named).TypeParams().Len() != 1 {
 t.Errorf("expected a single type param T for Pointer got %q", ptr.Type())
 }
 }

go/ssa/const_test.go

@@ -15,7 +15,6 @@ import (
 "testing"
 
 "golang.org/x/tools/go/ssa"
-"golang.org/x/tools/internal/typeparams"
 )
 
 func TestConstString(t *testing.T) {
@@ -93,7 +92,7 @@ func TestConstString(t *testing.T) {
 
 // Test type-param
 gen := pkg.Scope().Lookup("gen")
-tp := typeparams.ForSignature(gen.Type().(*types.Signature)).At(0)
+tp := gen.Type().(*types.Signature).TypeParams().At(0)
 if got, want := ssa.NewConst(nil, tp).String(), "0:T"; got != want {
 t.Errorf("ssa.NewConst(%v, %s).String() = %v, want %v", nil, tup, got, want)
 }