Commit 8c5c2b71 authored by Yury Smolsky's avatar Yury Smolsky Committed by David Chase

cmd/compile: fix TestFormats by using valid formats

CL 142517 has used some formats incorrectly. This change fixes it
by using %v for errors and invoking Block.Kind.String().
Format map stays intact.

Updates #28177

Change-Id: If53b6cc54ba3c1ffc17b005225787e3b546de404
Reviewed-on: https://go-review.googlesource.com/c/150798
Run-TryBot: Yury Smolsky <yury@smolsky.by>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarDavid Chase <drchase@google.com>
parent 9098d1d8
...@@ -893,7 +893,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) { ...@@ -893,7 +893,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
if f.laidout { if f.laidout {
layout = fmt.Sprintf(" #%d", i) layout = fmt.Sprintf(" #%d", i)
} }
fmt.Fprintf(pipe, `%v [label="%v%s\n%v",id="graph_node_%v_%v",tooltip="%v"];`, b, b, layout, b.Kind, id, b, b.LongString()) fmt.Fprintf(pipe, `%v [label="%v%s\n%v",id="graph_node_%v_%v",tooltip="%v"];`, b, b, layout, b.Kind.String(), id, b, b.LongString())
} }
indexOf := make([]int, f.NumBlocks()) indexOf := make([]int, f.NumBlocks())
for i, b := range f.Blocks { for i, b := range f.Blocks {
...@@ -942,7 +942,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) { ...@@ -942,7 +942,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
err = cmd.Wait() err = cmd.Wait()
if err != nil { if err != nil {
d.broken = true d.broken = true
fmt.Printf("dot: %s\n%v\n", err, bufErr.String()) fmt.Printf("dot: %v\n%v\n", err, bufErr.String())
return return
} }
...@@ -952,7 +952,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) { ...@@ -952,7 +952,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
// our fingers, finding '<svg ' and injecting needed attributes after it. // our fingers, finding '<svg ' and injecting needed attributes after it.
err = d.copyUntil(w, buf, `<svg `) err = d.copyUntil(w, buf, `<svg `)
if err != nil { if err != nil {
fmt.Printf("injecting attributes: %s\n", err) fmt.Printf("injecting attributes: %v\n", err)
return return
} }
fmt.Fprintf(w, ` id="%s" onload="makeDraggable(evt)" `, svgID) fmt.Fprintf(w, ` id="%s" onload="makeDraggable(evt)" `, svgID)
......
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