Commit c3e8da67 authored by Matthew Dempsky's avatar Matthew Dempsky

cmd/compile: fix printing of untyped types in -W output

It's always useful to distinguish "bool" and "string" from "untyped
bool" and "untyped string", so change typefmt to do this
unconditionally.

Also, while here, replace a bare 0 with its named constant FErr.

Fixes #23833.

Change-Id: I3fcb8d7204686937439caaaf8b3973fc236d0387
Reviewed-on: https://go-review.googlesource.com/94021
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
parent beeab6ac
...@@ -701,15 +701,15 @@ func typefmt(t *types.Type, flag FmtFlag, mode fmtMode, depth int) string { ...@@ -701,15 +701,15 @@ func typefmt(t *types.Type, flag FmtFlag, mode fmtMode, depth int) string {
} }
if int(t.Etype) < len(basicnames) && basicnames[t.Etype] != "" { if int(t.Etype) < len(basicnames) && basicnames[t.Etype] != "" {
prefix := "" name := basicnames[t.Etype]
if mode == FErr && (t == types.Idealbool || t == types.Idealstring) { if t == types.Idealbool || t == types.Idealstring {
prefix = "untyped " name = "untyped " + name
} }
return prefix + basicnames[t.Etype] return name
} }
if mode == FDbg { if mode == FDbg {
return t.Etype.String() + "-" + typefmt(t, flag, 0, depth) return t.Etype.String() + "-" + typefmt(t, flag, FErr, depth)
} }
switch t.Etype { switch t.Etype {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment