cmd/internal/gc: unembed Node.Func
This is a follow-up to CL 7360.
It was generated with eg and gofmt -r.
The only manual changes are the unembedding in syntax.go
and backporting changes from y.go to go.y.
Passes toolstash -cmp.
Change-Id: I3d6d06ecb659809a4bc8592395d5b9a18967218e
Reviewed-on: https://go-review.googlesource.com/8053
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
diff --git a/src/cmd/internal/gc/closure.go b/src/cmd/internal/gc/closure.go
index 7cee630..a5364fc 100644
--- a/src/cmd/internal/gc/closure.go
+++ b/src/cmd/internal/gc/closure.go
@@ -19,7 +19,7 @@
n := Nod(OCLOSURE, nil, nil)
n.Ntype = ntype
n.Funcdepth = Funcdepth
- n.Outerfunc = Curfn
+ n.Func.Outerfunc = Curfn
funchdr(n)
@@ -62,7 +62,7 @@
func_ := Curfn
func_.Nbody = body
- func_.Endlineno = lineno
+ func_.Func.Endlineno = lineno
funcbody(func_)
// closure-specific variables are hanging off the
@@ -70,7 +70,7 @@
// unhook them.
// make the list of pointers for the closure call.
var v *Node
- for l := func_.Cvars; l != nil; l = l.Next {
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
v = l.N
v.Closure.Closure = v.Outer
v.Outerexpr = oldname(v.Sym)
@@ -82,7 +82,7 @@
func typecheckclosure(func_ *Node, top int) {
var n *Node
- for l := func_.Cvars; l != nil; l = l.Next {
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
n = l.N.Closure
if !n.Captured {
n.Captured = true
@@ -98,7 +98,7 @@
}
}
- for l := func_.Dcl; l != nil; l = l.Next {
+ for l := func_.Func.Dcl; l != nil; l = l.Next {
if l.N.Op == ONAME && (l.N.Class == PPARAM || l.N.Class == PPARAMOUT) {
l.N.Decldepth = 1
}
@@ -141,36 +141,36 @@
gen := 0
outer := ""
prefix := ""
- if n.Outerfunc == nil {
+ if n.Func.Outerfunc == nil {
// Global closure.
outer = "glob"
prefix = "func"
closurename_closgen++
gen = closurename_closgen
- } else if n.Outerfunc.Op == ODCLFUNC {
+ } else if n.Func.Outerfunc.Op == ODCLFUNC {
// The outermost closure inside of a named function.
- outer = n.Outerfunc.Nname.Sym.Name
+ outer = n.Func.Outerfunc.Nname.Sym.Name
prefix = "func"
// Yes, functions can be named _.
// Can't use function closgen in such case,
// because it would lead to name clashes.
- if !isblank(n.Outerfunc.Nname) {
- n.Outerfunc.Closgen++
- gen = n.Outerfunc.Closgen
+ if !isblank(n.Func.Outerfunc.Nname) {
+ n.Func.Outerfunc.Func.Closgen++
+ gen = n.Func.Outerfunc.Func.Closgen
} else {
closurename_closgen++
gen = closurename_closgen
}
- } else if n.Outerfunc.Op == OCLOSURE {
+ } else if n.Func.Outerfunc.Op == OCLOSURE {
// Nested closure, recurse.
- outer = closurename(n.Outerfunc).Name
+ outer = closurename(n.Func.Outerfunc).Name
prefix = ""
- n.Outerfunc.Closgen++
- gen = n.Outerfunc.Closgen
+ n.Func.Outerfunc.Func.Closgen++
+ gen = n.Func.Outerfunc.Func.Closgen
} else {
Fatal("closurename called for %v", Nconv(n, obj.FmtShort))
}
@@ -198,10 +198,10 @@
declare(xfunc.Nname, PFUNC)
xfunc.Nname.Funcdepth = func_.Funcdepth
xfunc.Funcdepth = func_.Funcdepth
- xfunc.Endlineno = func_.Endlineno
+ xfunc.Func.Endlineno = func_.Func.Endlineno
xfunc.Nbody = func_.Nbody
- xfunc.Dcl = concat(func_.Dcl, xfunc.Dcl)
+ xfunc.Func.Dcl = concat(func_.Func.Dcl, xfunc.Func.Dcl)
if xfunc.Nbody == nil {
Fatal("empty body - won't generate any code")
}
@@ -230,8 +230,8 @@
lineno = xfunc.Lineno
func_ := xfunc.Closure
- func_.Enter = nil
- for l := func_.Cvars; l != nil; l = l.Next {
+ func_.Func.Enter = nil
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
v = l.N
if v.Type == nil {
// if v->type is nil, it means v looked like it was
@@ -273,7 +273,7 @@
}
typecheck(&outer, Erv)
- func_.Enter = list(func_.Enter, outer)
+ func_.Func.Enter = list(func_.Func.Enter, outer)
}
lineno = int32(lno)
@@ -314,7 +314,7 @@
var v *Node
var addr *Node
var fld *Type
- for l := func_.Cvars; l != nil; l = l.Next {
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
v = l.N
if v.Op == OXXX {
continue
@@ -343,7 +343,7 @@
fld.Sym = fld.Nname.Sym
// Declare the new param and append it to input arguments.
- xfunc.Dcl = list(xfunc.Dcl, fld.Nname)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, fld.Nname)
*param = fld
param = &fld.Down
@@ -364,7 +364,7 @@
var addr *Node
var v *Node
var cv *Node
- for l := func_.Cvars; l != nil; l = l.Next {
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
v = l.N
if v.Op == OXXX {
continue
@@ -389,7 +389,7 @@
v.Class = PAUTO
v.Ullman = 1
- xfunc.Dcl = list(xfunc.Dcl, v)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, v)
body = list(body, Nod(OAS, v, cv))
} else {
// Declare variable holding addresses taken from closure
@@ -399,7 +399,7 @@
addr.Class = PAUTO
addr.Used = true
addr.Curfn = xfunc
- xfunc.Dcl = list(xfunc.Dcl, addr)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, addr)
v.Heapaddr = addr
if v.Byval {
cv = Nod(OADDR, cv, nil)
@@ -410,8 +410,8 @@
typechecklist(body, Etop)
walkstmtlist(body)
- xfunc.Enter = body
- xfunc.Needctxt = nvar > 0
+ xfunc.Func.Enter = body
+ xfunc.Func.Needctxt = nvar > 0
}
lineno = int32(lno)
@@ -419,7 +419,7 @@
func walkclosure(func_ *Node, init **NodeList) *Node {
// If no closure vars, don't bother wrapping.
- if func_.Cvars == nil {
+ if func_.Func.Cvars == nil {
return func_.Closure.Nname
}
@@ -442,7 +442,7 @@
typ.List = list1(Nod(ODCLFIELD, newname(Lookup(".F")), typenod(Types[TUINTPTR])))
var typ1 *Node
var v *Node
- for l := func_.Cvars; l != nil; l = l.Next {
+ for l := func_.Func.Cvars; l != nil; l = l.Next {
v = l.N
if v.Op == OXXX {
continue
@@ -457,7 +457,7 @@
clos := Nod(OCOMPLIT, nil, Nod(OIND, typ, nil))
clos.Esc = func_.Esc
clos.Right.Implicit = true
- clos.List = concat(list1(Nod(OCFUNC, func_.Closure.Nname, nil)), func_.Enter)
+ clos.List = concat(list1(Nod(OCFUNC, func_.Closure.Nname, nil)), func_.Func.Enter)
// Force type conversion from *struct to the func type.
clos = Nod(OCONVNOP, clos, nil)
@@ -554,7 +554,7 @@
n = newname(Lookupf("a%d", i))
i++
n.Class = PPARAM
- xfunc.Dcl = list(xfunc.Dcl, n)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, n)
callargs = list(callargs, n)
fld = Nod(ODCLFIELD, n, typenod(t.Type))
if t.Isddd {
@@ -573,14 +573,14 @@
n = newname(Lookupf("r%d", i))
i++
n.Class = PPARAMOUT
- xfunc.Dcl = list(xfunc.Dcl, n)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, n)
retargs = list(retargs, n)
l = list(l, Nod(ODCLFIELD, n, typenod(t.Type)))
}
xtype.Rlist = l
- xfunc.Dupok = true
+ xfunc.Func.Dupok = true
xfunc.Nname = newfuncname(sym)
xfunc.Nname.Sym.Flags |= SymExported // disable export
xfunc.Nname.Ntype = xtype
@@ -589,7 +589,7 @@
// Declare and initialize variable holding receiver.
- xfunc.Needctxt = true
+ xfunc.Func.Needctxt = true
cv := Nod(OCLOSUREVAR, nil, nil)
cv.Xoffset = int64(Widthptr)
cv.Type = rcvrtype
@@ -603,7 +603,7 @@
ptr.Ullman = 1
ptr.Used = true
ptr.Curfn = xfunc
- xfunc.Dcl = list(xfunc.Dcl, ptr)
+ xfunc.Func.Dcl = list(xfunc.Func.Dcl, ptr)
var body *NodeList
if Isptr[rcvrtype.Etype] || Isinter(rcvrtype) {
ptr.Ntype = typenod(rcvrtype)
