cmd/compile: fix TestFormats

This fixes the linux-amd64-longtest builder, which was broken by CL
147160.

Updates #27539.

Change-Id: If6e69581ef503bba2449ec9bacaa31f34f59beb1
Reviewed-on: https://go-review.googlesource.com/c/149157
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/fmt_test.go b/src/cmd/compile/fmt_test.go
index 05d13b58a565c413a4f85efc6b406b5a0cd01693..c5c050fa17c4707d50d05b0257d589c18f43adaa 100644 (file)
--- a/src/cmd/compile/fmt_test.go
+++ b/src/cmd/compile/fmt_test.go
@@ -672,6 +672,7 @@ var knownFormats = map[string]string{
        "cmd/compile/internal/types.EType %d":             "",
        "cmd/compile/internal/types.EType %s":             "",
        "cmd/compile/internal/types.EType %v":             "",
+       "cmd/internal/obj.ABI %v":                         "",
        "error %v":                                        "",
        "float64 %.2f":                                    "",
        "float64 %.3f":                                    "",

diff --git a/src/cmd/compile/internal/gc/gsubr.go b/src/cmd/compile/internal/gc/gsubr.go
index 01ac4cb929be74860ef90837fc7819ab20b849a5..5ad7b9a1b6fc5ec82911f76330ad5a7515ccb69f 100644 (file)
--- a/src/cmd/compile/internal/gc/gsubr.go
+++ b/src/cmd/compile/internal/gc/gsubr.go
@@ -216,7 +216,7 @@ func (f *Func) initLSym(hasBody bool) {
                        // using the expected ABI.
                        want := obj.ABIInternal
                        if f.lsym.ABI() != want {
-                               Fatalf("function symbol %s has the wrong ABI %v, expected %v", f.lsym, f.lsym.ABI(), want)
+                               Fatalf("function symbol %s has the wrong ABI %v, expected %v", f.lsym.Name, f.lsym.ABI(), want)
                        }
                }