cmd/compile/internal/gc: remove oconv(op, 0) calls
Updates #15462
Automatic refactor with sed -e.
Replace all oconv(op, 0) to string conversion with the raw op value
which fmt's %v verb can print directly.
The remaining oconv(op, FmtSharp) will be replaced with op.GoString and
%#v in the next CL.
Change-Id: I5e2f7ee0bd35caa65c6dd6cb1a866b5e4519e641
Reviewed-on: https://go-review.googlesource.com/22499
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/src/cmd/compile/internal/gc/walk.go b/src/cmd/compile/internal/gc/walk.go
index cc9a50e..6ec0645 100644
--- a/src/cmd/compile/internal/gc/walk.go
+++ b/src/cmd/compile/internal/gc/walk.go
@@ -159,7 +159,7 @@
if n.Op == ONAME {
Yyerror("%v is not a top level statement", n.Sym)
} else {
- Yyerror("%v is not a top level statement", oconv(n.Op, 0))
+ Yyerror("%v is not a top level statement", n.Op)
}
Dump("nottop", n)
@@ -1505,7 +1505,7 @@
// ifaceeq(i1 any-1, i2 any-2) (ret bool);
case OCMPIFACE:
if !Eqtype(n.Left.Type, n.Right.Type) {
- Fatalf("ifaceeq %v %v %v", oconv(n.Op, 0), n.Left.Type, n.Right.Type)
+ Fatalf("ifaceeq %v %v %v", n.Op, n.Left.Type, n.Right.Type)
}
var fn *Node
if n.Left.Type.IsEmptyInterface() {
@@ -1651,7 +1651,7 @@
var nln, nrn Nodes
nln.Set(nl)
nrn.Set(nr)
- Yyerror("error in shape across %v %v %v / %d %d [%s]", Hconv(nln, FmtSign), oconv(op, 0), Hconv(nrn, FmtSign), len(nl), len(nr), Curfn.Func.Nname.Sym.Name)
+ Yyerror("error in shape across %v %v %v / %d %d [%s]", Hconv(nln, FmtSign), op, Hconv(nrn, FmtSign), len(nl), len(nr), Curfn.Func.Nname.Sym.Name)
}
return nn
}
@@ -1866,9 +1866,9 @@
l1 := dumptypes(nl, "expected")
l2 := dumpnodetypes(lr0, "given")
if l != nil {
- Yyerror("not enough arguments to %v\n\t%s\n\t%s", oconv(op, 0), l1, l2)
+ Yyerror("not enough arguments to %v\n\t%s\n\t%s", op, l1, l2)
} else {
- Yyerror("too many arguments to %v\n\t%s\n\t%s", oconv(op, 0), l1, l2)
+ Yyerror("too many arguments to %v\n\t%s\n\t%s", op, l1, l2)
}
}
@@ -2142,7 +2142,7 @@
func convas(n *Node, init *Nodes) *Node {
if n.Op != OAS {
- Fatalf("convas: not OAS %v", oconv(n.Op, 0))
+ Fatalf("convas: not OAS %v", n.Op)
}
n.Typecheck = 1
@@ -3798,7 +3798,7 @@
switch n.Op {
default:
- Fatalf("usefield %v", oconv(n.Op, 0))
+ Fatalf("usefield %v", n.Op)
case ODOT, ODOTPTR:
break
