go/internal/gcimporter: always call SetTParams, even if empty

This resolves an outstanding TODO to be consistent about calling
SetTParams.

Done in both go/internal/gcimporter and cmd/compile/internal/importer.

Change-Id: Ief642efe016f02bab1bab960f6731a0ac0a8ad28
Reviewed-on: https://go-review.googlesource.com/c/go/+/347389
Trust: Robert Findley <rfindley@google.com>
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/importer/iimport.go b/src/cmd/compile/internal/importer/iimport.go
index c303126ea635c9e16a369ac0ebffbb1aae81df07..38cb8db23557b170d140df4da081475716774b92 100644 (file)
--- a/src/cmd/compile/internal/importer/iimport.go
+++ b/src/cmd/compile/internal/importer/iimport.go
@@ -327,9 +327,7 @@ func (r *importReader) obj(name string) {
                // declaration before recursing.
                obj := types2.NewTypeName(pos, r.currPkg, name, nil)
                named := types2.NewNamed(obj, nil, nil)
-               if tag == 'U' {
-                       named.SetTParams(tparams)
-               }
+               named.SetTParams(tparams)
                r.declare(obj)
 
                underlying := r.p.typAt(r.uint64(), named).Underlying()

diff --git a/src/go/internal/gcimporter/iimport.go b/src/go/internal/gcimporter/iimport.go
index 444cf3b0d409d15fd5565feff3decae0c0ad04ad..3571941d04f8d68d80528ca832d194ec37e86bbc 100644 (file)
--- a/src/go/internal/gcimporter/iimport.go
+++ b/src/go/internal/gcimporter/iimport.go
@@ -317,10 +317,7 @@ func (r *importReader) obj(name string) {
                // declaration before recursing.
                obj := types.NewTypeName(pos, r.currPkg, name, nil)
                named := types.NewNamed(obj, nil, nil)
-               // TODO(rfindley): guarding on tag == 'U' should not be necessary here.
-               if tag == 'U' {
-                       named.SetTParams(tparams)
-               }
+               named.SetTParams(tparams)
                r.declare(obj)
 
                underlying := r.p.typAt(r.uint64(), named).Underlying()