Skip to content

Commit

Permalink
cmd/compile: fix TestFormats by using valid formats
Browse files Browse the repository at this point in the history
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: David Chase <drchase@google.com>
  • Loading branch information
ysmolski authored and dr2chase committed Nov 21, 2018
1 parent 9098d1d commit 8c5c2b7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/cmd/compile/internal/ssa/html.go
Expand Up @@ -893,7 +893,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
if f.laidout {
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())
for i, b := range f.Blocks {
Expand Down Expand Up @@ -942,7 +942,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
err = cmd.Wait()
if err != nil {
d.broken = true
fmt.Printf("dot: %s\n%v\n", err, bufErr.String())
fmt.Printf("dot: %v\n%v\n", err, bufErr.String())
return
}

Expand All @@ -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.
err = d.copyUntil(w, buf, `<svg `)
if err != nil {
fmt.Printf("injecting attributes: %s\n", err)
fmt.Printf("injecting attributes: %v\n", err)
return
}
fmt.Fprintf(w, ` id="%s" onload="makeDraggable(evt)" `, svgID)
Expand Down

0 comments on commit 8c5c2b7

Please sign in to comment.