cmd/compile: remove syslook's copy parameter
Instead make substArgTypes responsible for cloning the function
definition Node and the function signature Type tree.
Passes toolstash -cmp.
Change-Id: I9ec84c90a7ae83d164d3f578e84a91cf1490d8ab
Reviewed-on: https://go-review.googlesource.com/20239
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/cmd/compile/internal/gc/alg.go b/src/cmd/compile/internal/gc/alg.go
index 4510404..5c709b1 100644
--- a/src/cmd/compile/internal/gc/alg.go
+++ b/src/cmd/compile/internal/gc/alg.go
@@ -570,16 +570,16 @@
switch size {
default:
- fn = syslook("memequal", 1)
+ fn = syslook("memequal")
*needsize = 1
case 1, 2, 4, 8, 16:
buf := fmt.Sprintf("memequal%d", int(size)*8)
- fn = syslook(buf, 1)
+ fn = syslook(buf)
*needsize = 0
}
- substArgTypes(fn, type_, type_)
+ substArgTypes(&fn, type_, type_)
return fn
}
diff --git a/src/cmd/compile/internal/gc/cgen.go b/src/cmd/compile/internal/gc/cgen.go
index 07996d0..43bb4c1 100644
--- a/src/cmd/compile/internal/gc/cgen.go
+++ b/src/cmd/compile/internal/gc/cgen.go
@@ -801,7 +801,7 @@
Cgenr(n, &src, nil)
}
- wbVar := syslook("writeBarrier", 0)
+ wbVar := syslook("writeBarrier")
wbEnabled := Nod(ODOT, wbVar, newname(wbVar.Type.Type.Sym))
wbEnabled = typecheck(&wbEnabled, Erv)
pbr := Thearch.Ginscmp(ONE, Types[TUINT8], wbEnabled, Nodintconst(0), -1)
@@ -2874,8 +2874,8 @@
arg.Xoffset += int64(Widthptr)
Regfree(&rlen)
- fn := syslook("growslice", 1)
- substArgTypes(fn, res.Type.Type, res.Type.Type)
+ fn := syslook("growslice")
+ substArgTypes(&fn, res.Type.Type, res.Type.Type)
Ginscall(fn, 0)
if Widthptr == 4 && Widthreg == 8 {
diff --git a/src/cmd/compile/internal/gc/gen.go b/src/cmd/compile/internal/gc/gen.go
index a978e1af..d021749 100644
--- a/src/cmd/compile/internal/gc/gen.go
+++ b/src/cmd/compile/internal/gc/gen.go
@@ -434,7 +434,7 @@
q := Gbranch(obj.AJMP, nil, 0)
Patch(p, Pc)
Regrealloc(&r2) // reclaim from above, for this failure path
- fn := syslook("panicdottype", 0)
+ fn := syslook("panicdottype")
dowidth(fn.Type)
call := Nod(OCALLFUNC, fn, nil)
r1.Type = byteptr
@@ -522,7 +522,7 @@
q := Gbranch(obj.AJMP, nil, 0)
Patch(p, Pc)
- fn := syslook("panicdottype", 0)
+ fn := syslook("panicdottype")
dowidth(fn.Type)
call := Nod(OCALLFUNC, fn, nil)
setNodeSeq(&call.List, list(list(list1(&r1), &r2), typename(n.Left.Type)))
diff --git a/src/cmd/compile/internal/gc/init.go b/src/cmd/compile/internal/gc/init.go
index acfa19b..434616f 100644
--- a/src/cmd/compile/internal/gc/init.go
+++ b/src/cmd/compile/internal/gc/init.go
@@ -132,7 +132,7 @@
b.Likely = 1
r = append(r, b)
// (4a)
- b.Nbody.Set([]*Node{Nod(OCALL, syslook("throwinit", 0), nil)})
+ b.Nbody.Set([]*Node{Nod(OCALL, syslook("throwinit"), nil)})
// (6)
a = Nod(OAS, gatevar, Nodintconst(1))
diff --git a/src/cmd/compile/internal/gc/range.go b/src/cmd/compile/internal/gc/range.go
index beacec7..50a04ef 100644
--- a/src/cmd/compile/internal/gc/range.go
+++ b/src/cmd/compile/internal/gc/range.go
@@ -230,14 +230,14 @@
keyname := newname(th.Type.Sym) // depends on layout of iterator struct. See reflect.go:hiter
valname := newname(th.Type.Down.Sym) // ditto
- fn := syslook("mapiterinit", 1)
+ fn := syslook("mapiterinit")
- substArgTypes(fn, t.Down, t.Type, th)
+ substArgTypes(&fn, t.Down, t.Type, th)
init = list(init, mkcall1(fn, nil, nil, typename(t), ha, Nod(OADDR, hit, nil)))
n.Left = Nod(ONE, Nod(ODOT, hit, keyname), nodnil())
- fn = syslook("mapiternext", 1)
- substArgTypes(fn, th)
+ fn = syslook("mapiternext")
+ substArgTypes(&fn, th)
n.Right = mkcall1(fn, nil, nil, Nod(OADDR, hit, nil))
key := Nod(ODOT, hit, keyname)
@@ -297,7 +297,7 @@
hv2 = temp(runetype)
a = Nod(OAS2, nil, nil)
a.List = list(list1(hv1), hv2)
- fn := syslook("stringiter2", 0)
+ fn := syslook("stringiter2")
a.Rlist = list1(mkcall1(fn, getoutargx(fn.Type), nil, ha, hv1))
}
diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 0a00846..d4f06f2 100644
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -2778,7 +2778,7 @@
bElse := s.f.NewBlock(ssa.BlockPlain)
bEnd := s.f.NewBlock(ssa.BlockPlain)
- aux := &ssa.ExternSymbol{Types[TBOOL], syslook("writeBarrier", 0).Sym}
+ aux := &ssa.ExternSymbol{Types[TBOOL], syslook("writeBarrier").Sym}
flagaddr := s.newValue1A(ssa.OpAddr, Ptrto(Types[TUINT32]), aux, s.sb)
// TODO: select the .enabled field. It is currently first, so not needed for now.
// Load word, test byte, avoiding partial register write from load byte.
@@ -2823,7 +2823,7 @@
bElse := s.f.NewBlock(ssa.BlockPlain)
bEnd := s.f.NewBlock(ssa.BlockPlain)
- aux := &ssa.ExternSymbol{Types[TBOOL], syslook("writeBarrier", 0).Sym}
+ aux := &ssa.ExternSymbol{Types[TBOOL], syslook("writeBarrier").Sym}
flagaddr := s.newValue1A(ssa.OpAddr, Ptrto(Types[TUINT32]), aux, s.sb)
// TODO: select the .enabled field. It is currently first, so not needed for now.
// Load word, test byte, avoiding partial register write from load byte.
diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go
index 0dbea98..f828bd2 100644
--- a/src/cmd/compile/internal/gc/subr.go
+++ b/src/cmd/compile/internal/gc/subr.go
@@ -1112,10 +1112,15 @@
// substArgTypes substitutes the given list of types for
// successive occurrences of the "any" placeholder in the
// type syntax expression n.Type.
-func substArgTypes(n *Node, types ...*Type) {
+func substArgTypes(np **Node, types ...*Type) {
+ n := Nod(0, nil, nil)
+ *n = **np
+ *np = n
+
for _, t := range types {
dowidth(t)
}
+ n.Type = deep(n.Type)
substAny(&n.Type, &types)
if len(types) > 0 {
Fatalf("substArgTypes: too many argument types")
@@ -1259,21 +1264,12 @@
return nt
}
-func syslook(name string, copy int) *Node {
+func syslook(name string) *Node {
s := Pkglookup(name, Runtimepkg)
if s == nil || s.Def == nil {
Fatalf("syslook: can't find runtime.%s", name)
}
-
- if copy == 0 {
- return s.Def
- }
-
- n := Nod(0, nil, nil)
- *n = *s.Def
- n.Type = deep(s.Def.Type)
-
- return n
+ return s.Def
}
// compute a hash value for type t.
@@ -2149,7 +2145,7 @@
l = list(l, nodlit(v))
v.U = method.Sym.Name
l = list(l, nodlit(v)) // method name
- call := Nod(OCALL, syslook("panicwrap", 0), nil)
+ call := Nod(OCALL, syslook("panicwrap"), nil)
call.List = l
n.Nbody.Set([]*Node{call})
fn.Nbody.Append(n)
diff --git a/src/cmd/compile/internal/gc/walk.go b/src/cmd/compile/internal/gc/walk.go
index ca77fc9..a63387a 100644
--- a/src/cmd/compile/internal/gc/walk.go
+++ b/src/cmd/compile/internal/gc/walk.go
@@ -746,8 +746,8 @@
Warn("type assertion not inlined")
}
- fn := syslook(assertFuncName(r.Left.Type, r.Type, false), 1)
- substArgTypes(fn, r.Left.Type, r.Type)
+ fn := syslook(assertFuncName(r.Left.Type, r.Type, false))
+ substArgTypes(&fn, r.Left.Type, r.Type)
n = mkcall1(fn, nil, init, typename(r.Type), r.Left, n1)
walkexpr(&n, init)
@@ -988,8 +988,8 @@
if Debug_typeassert > 0 {
Warn("type assertion not inlined")
}
- fn := syslook(assertFuncName(from.Type, t, true), 1)
- substArgTypes(fn, from.Type, t)
+ fn := syslook(assertFuncName(from.Type, t, true))
+ substArgTypes(&fn, from.Type, t)
call := mkcall1(fn, oktype, init, typename(t), from, resptr)
n = Nod(OAS, ok, call)
typecheck(&n, Etop)
@@ -1052,7 +1052,7 @@
typecheck(&n1, Etop)
appendNodeSeqNode(init, n1)
- fn := syslook("typ2Itab", 0)
+ fn := syslook("typ2Itab")
n1 = Nod(OCALL, fn, nil)
setNodeSeq(&n1.List, ll)
typecheck(&n1, Erv)
@@ -1101,11 +1101,11 @@
ll = list(ll, r)
}
- fn := syslook(convFuncName(n.Left.Type, n.Type), 1)
+ fn := syslook(convFuncName(n.Left.Type, n.Type))
if !Isinter(n.Left.Type) {
- substArgTypes(fn, n.Left.Type, n.Left.Type, n.Type)
+ substArgTypes(&fn, n.Left.Type, n.Left.Type, n.Type)
} else {
- substArgTypes(fn, n.Left.Type, n.Type)
+ substArgTypes(&fn, n.Left.Type, n.Type)
}
dowidth(fn.Type)
n = Nod(OCALL, fn, nil)
@@ -1417,9 +1417,9 @@
// cannot use chanfn - closechan takes any, not chan any
case OCLOSE:
- fn := syslook("closechan", 1)
+ fn := syslook("closechan")
- substArgTypes(fn, n.Left.Type)
+ substArgTypes(&fn, n.Left.Type)
n = mkcall1(fn, nil, init, n.Left)
case OMAKECHAN:
@@ -1450,8 +1450,8 @@
r = Nod(OADDR, var_, nil)
}
- fn := syslook("makemap", 1)
- substArgTypes(fn, hmap(t), mapbucket(t), t.Down, t.Type)
+ fn := syslook("makemap")
+ substArgTypes(&fn, hmap(t), mapbucket(t), t.Down, t.Type)
n = mkcall1(fn, n.Type, init, typename(n.Type), conv(n.Left, Types[TINT64]), a, r)
case OMAKESLICE:
@@ -1480,9 +1480,9 @@
n = r
} else {
// makeslice(t *Type, nel int64, max int64) (ary []any)
- fn := syslook("makeslice", 1)
+ fn := syslook("makeslice")
- substArgTypes(fn, t.Type) // any-1
+ substArgTypes(&fn, t.Type) // any-1
n = mkcall1(fn, n.Type, init, typename(n.Type), conv(l, Types[TINT64]), conv(r, Types[TINT64]))
}
@@ -1563,14 +1563,14 @@
}
var fn *Node
if isnilinter(n.Left.Type) {
- fn = syslook("efaceeq", 1)
+ fn = syslook("efaceeq")
} else {
- fn = syslook("ifaceeq", 1)
+ fn = syslook("ifaceeq")
}
n.Right = cheapexpr(n.Right, init)
n.Left = cheapexpr(n.Left, init)
- substArgTypes(fn, n.Right.Type, n.Left.Type)
+ substArgTypes(&fn, n.Right.Type, n.Left.Type)
r := mkcall1(fn, n.Type, init, n.Left, n.Right)
// TODO(marvin): Fix Node.EType type union.
if Op(n.Etype) == ONE {
@@ -2010,35 +2010,35 @@
et = n.Type.Etype
if Isinter(n.Type) {
if isnilinter(n.Type) {
- on = syslook("printeface", 1)
+ on = syslook("printeface")
} else {
- on = syslook("printiface", 1)
+ on = syslook("printiface")
}
- substArgTypes(on, n.Type) // any-1
+ substArgTypes(&on, n.Type) // any-1
} else if Isptr[et] || et == TCHAN || et == TMAP || et == TFUNC || et == TUNSAFEPTR {
- on = syslook("printpointer", 1)
- substArgTypes(on, n.Type) // any-1
+ on = syslook("printpointer")
+ substArgTypes(&on, n.Type) // any-1
} else if Isslice(n.Type) {
- on = syslook("printslice", 1)
- substArgTypes(on, n.Type) // any-1
+ on = syslook("printslice")
+ substArgTypes(&on, n.Type) // any-1
} else if Isint[et] {
if et == TUINT64 {
if (t.Sym.Pkg == Runtimepkg || compiling_runtime != 0) && t.Sym.Name == "hex" {
- on = syslook("printhex", 0)
+ on = syslook("printhex")
} else {
- on = syslook("printuint", 0)
+ on = syslook("printuint")
}
} else {
- on = syslook("printint", 0)
+ on = syslook("printint")
}
} else if Isfloat[et] {
- on = syslook("printfloat", 0)
+ on = syslook("printfloat")
} else if Iscomplex[et] {
- on = syslook("printcomplex", 0)
+ on = syslook("printcomplex")
} else if et == TBOOL {
- on = syslook("printbool", 0)
+ on = syslook("printbool")
} else if et == TSTRING {
- on = syslook("printstring", 0)
+ on = syslook("printstring")
} else {
badtype(OPRINT, n.Type, nil)
continue
@@ -2080,8 +2080,8 @@
func callnew(t *Type) *Node {
dowidth(t)
- fn := syslook("newobject", 1)
- substArgTypes(fn, t)
+ fn := syslook("newobject")
+ substArgTypes(&fn, t)
return mkcall1(fn, Ptrto(t), nil, typename(t))
}
@@ -2698,7 +2698,7 @@
}
func mkcall(name string, t *Type, init nodesOrNodeListPtr, args ...*Node) *Node {
- return vmkcall(syslook(name, 0), t, init, args)
+ return vmkcall(syslook(name), t, init, args)
}
func mkcall1(fn *Node, t *Type, init nodesOrNodeListPtr, args ...*Node) *Node {
@@ -2719,14 +2719,14 @@
if t.Etype != TCHAN {
Fatalf("chanfn %v", t)
}
- fn := syslook(name, 1)
+ fn := syslook(name)
switch n {
default:
Fatalf("chanfn %d", n)
case 1:
- substArgTypes(fn, t.Type)
+ substArgTypes(&fn, t.Type)
case 2:
- substArgTypes(fn, t.Type, t.Type)
+ substArgTypes(&fn, t.Type, t.Type)
}
return fn
}
@@ -2735,8 +2735,8 @@
if t.Etype != TMAP {
Fatalf("mapfn %v", t)
}
- fn := syslook(name, 1)
- substArgTypes(fn, t.Down, t.Type, t.Down, t.Type)
+ fn := syslook(name)
+ substArgTypes(&fn, t.Down, t.Type, t.Down, t.Type)
return fn
}
@@ -2744,14 +2744,14 @@
if t.Etype != TMAP {
Fatalf("mapfn %v", t)
}
- fn := syslook(name, 1)
- substArgTypes(fn, t.Down, t.Type, t.Down)
+ fn := syslook(name)
+ substArgTypes(&fn, t.Down, t.Type, t.Down)
return fn
}
func writebarrierfn(name string, l *Type, r *Type) *Node {
- fn := syslook(name, 1)
- substArgTypes(fn, l, r)
+ fn := syslook(name)
+ substArgTypes(&fn, l, r)
return fn
}
@@ -2810,7 +2810,7 @@
slice.Esc = EscNone
}
- cat := syslook(fn, 0)
+ cat := syslook(fn)
r := Nod(OCALL, cat, nil)
setNodeSeq(&r.List, args)
typecheck(&r, Erv)
@@ -2859,8 +2859,8 @@
nif.Left = Nod(OGT, nt, Nodintconst(0))
// instantiate growslice_n(Type*, []any, int) []any
- fn := syslook("growslice_n", 1) // growslice_n(<type>, old []T, n int64) (ret []T)
- substArgTypes(fn, s.Type.Type, s.Type.Type)
+ fn := syslook("growslice_n") // growslice_n(<type>, old []T, n int64) (ret []T)
+ substArgTypes(&fn, s.Type.Type, s.Type.Type)
// s = growslice_n(T, s, n)
nif.Nbody.Set([]*Node{Nod(OAS, s, mkcall1(fn, s.Type, &nif.Ninit, typename(s.Type), s, nt))})
@@ -2873,8 +2873,8 @@
nptr1.Etype = 1
nptr2 := l2
- fn := syslook("typedslicecopy", 1)
- substArgTypes(fn, l1.Type, l2.Type)
+ fn := syslook("typedslicecopy")
+ substArgTypes(&fn, l1.Type, l2.Type)
nt := mkcall1(fn, Types[TINT], &l, typename(l1.Type.Type), nptr1, nptr2)
l = append(l, nt)
} else if instrumenting {
@@ -2886,11 +2886,11 @@
nptr2 := l2
var fn *Node
if l2.Type.Etype == TSTRING {
- fn = syslook("slicestringcopy", 1)
+ fn = syslook("slicestringcopy")
} else {
- fn = syslook("slicecopy", 1)
+ fn = syslook("slicecopy")
}
- substArgTypes(fn, l1.Type, l2.Type)
+ substArgTypes(&fn, l1.Type, l2.Type)
nt := mkcall1(fn, Types[TINT], &l, nptr1, nptr2, Nodintconst(s.Type.Type.Width))
l = append(l, nt)
} else {
@@ -2902,8 +2902,8 @@
nptr2 := Nod(OSPTR, l2, nil)
- fn := syslook("memmove", 1)
- substArgTypes(fn, s.Type.Type, s.Type.Type)
+ fn := syslook("memmove")
+ substArgTypes(&fn, s.Type.Type, s.Type.Type)
nwid := cheapexpr(conv(Nod(OLEN, l2, nil), Types[TUINTPTR]), &l)
@@ -2994,8 +2994,8 @@
nx := Nod(OIF, nil, nil) // if cap(s) - len(s) < argc
nx.Left = Nod(OLT, Nod(OSUB, Nod(OCAP, ns, nil), Nod(OLEN, ns, nil)), na)
- fn := syslook("growslice", 1) // growslice(<type>, old []T, mincap int) (ret []T)
- substArgTypes(fn, ns.Type.Type, ns.Type.Type)
+ fn := syslook("growslice") // growslice(<type>, old []T, mincap int) (ret []T)
+ substArgTypes(&fn, ns.Type.Type, ns.Type.Type)
nx.Nbody.Set([]*Node{Nod(OAS, ns, mkcall1(fn, ns.Type, &nx.Ninit, typename(ns.Type), ns, Nod(OADD, Nod(OLEN, ns, nil), na)))})
@@ -3045,11 +3045,11 @@
if runtimecall {
var fn *Node
if n.Right.Type.Etype == TSTRING {
- fn = syslook("slicestringcopy", 1)
+ fn = syslook("slicestringcopy")
} else {
- fn = syslook("slicecopy", 1)
+ fn = syslook("slicecopy")
}
- substArgTypes(fn, n.Left.Type, n.Right.Type)
+ substArgTypes(&fn, n.Left.Type, n.Right.Type)
return mkcall1(fn, n.Type, init, n.Left, n.Right, Nodintconst(n.Left.Type.Type.Width))
}
@@ -3077,9 +3077,9 @@
l = list(l, nif)
// Call memmove.
- fn := syslook("memmove", 1)
+ fn := syslook("memmove")
- substArgTypes(fn, nl.Type.Type, nl.Type.Type)
+ substArgTypes(&fn, nl.Type.Type, nl.Type.Type)
nwid := temp(Types[TUINTPTR])
l = list(l, Nod(OAS, nwid, conv(nlen, Types[TUINTPTR])))
nwid = Nod(OMUL, nwid, Nodintconst(nl.Type.Type.Width))
@@ -3103,8 +3103,8 @@
}
if a == AMEM {
- n := syslook("memequal", 1)
- substArgTypes(n, t, t)
+ n := syslook("memequal")
+ substArgTypes(&n, t, t)
*needsize = 1
return n
}
