cmd/compile/internal/types2: reduce output when describing type parameters

There's no need to say "type parameter" for a type parameter. The
name is sufficient (they are always named), and the prose is followed
by "constrained by".

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

diff --git a/src/cmd/compile/internal/types2/operand.go b/src/cmd/compile/internal/types2/operand.go
index 19326b83428e90ddc6b2df98ffc04634108a12a7..a5b27294513f5698eadf47dd19e64eaab547a132 100644 (file)
--- a/src/cmd/compile/internal/types2/operand.go
+++ b/src/cmd/compile/internal/types2/operand.go
@@ -176,17 +176,14 @@ func operandString(x *operand, qf Qualifier) string {
        if hasType {
                if x.typ != Typ[Invalid] {
                        var intro string
-                       var tpar *TypeParam
                        if isGeneric(x.typ) {
                                intro = " of parameterized type "
-                       } else if tpar = asTypeParam(x.typ); tpar != nil {
-                               intro = " of type parameter "
                        } else {
                                intro = " of type "
                        }
                        buf.WriteString(intro)
                        WriteType(&buf, x.typ, qf)
-                       if tpar != nil {
+                       if tpar := asTypeParam(x.typ); tpar != nil {
                                buf.WriteString(" constrained by ")
                                WriteType(&buf, tpar.bound, qf) // do not compute interface type sets here
                        }