cmd/compile: remove nodesOrNodeList outside of syntax.go

Passes toolstash -cmp.

Update #14473.

Change-Id: I717ebd948dfc8faf8b9ef5aa02c67484af618d18
Reviewed-on: https://go-review.googlesource.com/20359
Reviewed-by: Brad Fitzpatrick <[email protected]>

Author: ianlancetaylor

src/cmd/compile/internal/gc/alg.go

@@ -288,7 +288,7 @@ func genhash(sym *Sym, t *Type) {
 	Curfn = fn
 	fn.Func.Dupok = true
 	typecheck(&fn, Etop)
-	typechecklist(fn.Nbody, Etop)
+	typechecklist(fn.Nbody.Slice(), Etop)
 	Curfn = nil
 
 	// Disable safemode while compiling this code: the code we
@@ -486,7 +486,7 @@ func geneq(sym *Sym, t *Type) {
 	Curfn = fn
 	fn.Func.Dupok = true
 	typecheck(&fn, Etop)
-	typechecklist(fn.Nbody, Etop)
+	typechecklist(fn.Nbody.Slice(), Etop)
 	Curfn = nil
 
 	// Disable safemode while compiling this code: the code we

src/cmd/compile/internal/gc/bexport.go

@@ -806,7 +806,7 @@ func (p *exporter) inlinedBody(n *Node) {
 	p.int(index)
 }
 
-func (p *exporter) nodeList(list nodesOrNodeList) {
+func (p *exporter) nodeList(list Nodes) {
 	it := nodeSeqIterate(list)
 	if p.trace {
 		p.tracef("[ ")

src/cmd/compile/internal/gc/bimport.go

@@ -249,8 +249,8 @@ func (p *importer) typ() *Type {
 			}
 			sym := pkg.Lookup(name)
 
-			n := methodname1(newname(sym), recv.N.Right)
-			n.Type = functype(recv.N, params, result)
+			n := methodname1(newname(sym), recv[0].Right)
+			n.Type = functype(recv[0], params, result)
 			checkwidth(n.Type)
 			// addmethod uses the global variable structpkg to verify consistency
 			{
@@ -342,14 +342,14 @@ func (p *importer) qualifiedName() *Sym {
 }
 
 // go.y:hidden_structdcl_list
-func (p *importer) fieldList() *NodeList {
+func (p *importer) fieldList() []*Node {
 	i := p.int()
 	if i == 0 {
 		return nil
 	}
-	n := list1(p.field())
-	for i--; i > 0; i-- {
-		n = list(n, p.field())
+	n := make([]*Node, 0, i)
+	for ; i > 0; i-- {
+		n = append(n, p.field())
 	}
 	return n
 }
@@ -389,14 +389,14 @@ func (p *importer) note() (v Val) {
 }
 
 // go.y:hidden_interfacedcl_list
-func (p *importer) methodList() *NodeList {
+func (p *importer) methodList() []*Node {
 	i := p.int()
 	if i == 0 {
 		return nil
 	}
-	n := list1(p.method())
-	for i--; i > 0; i-- {
-		n = list(n, p.method())
+	n := make([]*Node, 0, i)
+	for ; i > 0; i-- {
+		n = append(n, p.method())
 	}
 	return n
 }
@@ -428,7 +428,7 @@ func (p *importer) fieldName() *Sym {
 }
 
 // go.y:ohidden_funarg_list
-func (p *importer) paramList() *NodeList {
+func (p *importer) paramList() []*Node {
 	i := p.int()
 	if i == 0 {
 		return nil
@@ -440,10 +440,9 @@ func (p *importer) paramList() *NodeList {
 		named = false
 	}
 	// i > 0
-	n := list1(p.param(named))
-	i--
+	n := make([]*Node, 0, i)
 	for ; i > 0; i-- {
-		n = list(n, p.param(named))
+		n = append(n, p.param(named))
 	}
 	return n
 }

src/cmd/compile/internal/gc/closure.go

@@ -111,7 +111,7 @@ func typecheckclosure(func_ *Node, top int) {
 		Curfn = func_
 		olddd := decldepth
 		decldepth = 1
-		typechecklist(func_.Nbody, Etop)
+		typechecklist(func_.Nbody.Slice(), Etop)
 		decldepth = olddd
 		Curfn = oldfn
 	}

src/cmd/compile/internal/gc/dcl.go

@@ -297,7 +297,7 @@ func constiter(vl *NodeList, t *Node, cl *NodeList) *NodeList {
 		lastconst = cl
 		lasttype = t
 	}
-	clcopy := listtreecopy(cl, lno)
+	clcopy := listtreecopy(nodeSeqSlice(cl), lno)
 
 	var v *Node
 	var c *Node
@@ -437,7 +437,7 @@ func colasname(n *Node) bool {
 	return false
 }
 
-func colasdefn(left nodesOrNodeList, defn *Node) {
+func colasdefn(left Nodes, defn *Node) {
 	for it := nodeSeqIterate(left); !it.Done(); it.Next() {
 		if it.N().Sym != nil {
 			it.N().Sym.Flags |= SymUniq
@@ -828,13 +828,13 @@ func checkdupfields(t *Type, what string) {
 
 // convert a parsed id/type list into
 // a type for struct/interface/arglist
-func tostruct(l nodesOrNodeList) *Type {
+func tostruct(l []*Node) *Type {
 	t := typ(TSTRUCT)
 	tostruct0(t, l)
 	return t
 }
 
-func tostruct0(t *Type, l nodesOrNodeList) {
+func tostruct0(t *Type, l []*Node) {
 	if t == nil || t.Etype != TSTRUCT {
 		Fatalf("struct expected")
 	}
@@ -860,7 +860,7 @@ func tostruct0(t *Type, l nodesOrNodeList) {
 	}
 }
 
-func tofunargs(l nodesOrNodeList) *Type {
+func tofunargs(l []*Node) *Type {
 	var f *Type
 
 	t := typ(TSTRUCT)
@@ -955,13 +955,13 @@ func interfacefield(n *Node) *Type {
 	return f
 }
 
-func tointerface(l nodesOrNodeList) *Type {
+func tointerface(l []*Node) *Type {
 	t := typ(TINTER)
 	tointerface0(t, l)
 	return t
 }
 
-func tointerface0(t *Type, l nodesOrNodeList) *Type {
+func tointerface0(t *Type, l []*Node) *Type {
 	if t == nil || t.Etype != TINTER {
 		Fatalf("interface expected")
 	}
@@ -1155,20 +1155,20 @@ func isifacemethod(f *Type) bool {
 }
 
 // turn a parsed function declaration into a type
-func functype(this *Node, in nodesOrNodeList, out nodesOrNodeList) *Type {
+func functype(this *Node, in, out []*Node) *Type {
 	t := typ(TFUNC)
 	functype0(t, this, in, out)
 	return t
 }
 
-func functype0(t *Type, this *Node, in nodesOrNodeList, out nodesOrNodeList) {
+func functype0(t *Type, this *Node, in, out []*Node) {
 	if t == nil || t.Etype != TFUNC {
 		Fatalf("function type expected")
 	}
 
-	var rcvr *NodeList
+	var rcvr []*Node
 	if this != nil {
-		rcvr = list1(this)
+		rcvr = []*Node{this}
 	}
 	t.Type = tofunargs(rcvr)
 	t.Type.Down = tofunargs(out)
@@ -1538,7 +1538,7 @@ func checknowritebarrierrec() {
 	})
 }
 
-func (c *nowritebarrierrecChecker) visitcodelist(l nodesOrNodeList) {
+func (c *nowritebarrierrecChecker) visitcodelist(l Nodes) {
 	for it := nodeSeqIterate(l); !it.Done(); it.Next() {
 		c.visitcode(it.N())
 	}

src/cmd/compile/internal/gc/esc.go

@@ -110,7 +110,7 @@ func (v *bottomUpVisitor) visit(n *Node) uint32 {
 	return min
 }
 
-func (v *bottomUpVisitor) visitcodelist(l nodesOrNodeList, min uint32) uint32 {
+func (v *bottomUpVisitor) visitcodelist(l Nodes, min uint32) uint32 {
 	for it := nodeSeqIterate(l); !it.Done(); it.Next() {
 		min = v.visitcode(it.N(), min)
 	}
@@ -300,9 +300,9 @@ func (l Level) guaranteedDereference() int {
 
 type NodeEscState struct {
 	Curfn             *Node
-	Escflowsrc        []*Node   // flow(this, src)
-	Escretval         *NodeList // on OCALLxxx, list of dummy return values
-	Escloopdepth      int32     // -1: global, 0: return variables, 1:function top level, increased inside function for every loop or label to mark scopes
+	Escflowsrc        []*Node // flow(this, src)
+	Escretval         Nodes   // on OCALLxxx, list of dummy return values
+	Escloopdepth      int32   // -1: global, 0: return variables, 1:function top level, increased inside function for every loop or label to mark scopes
 	Esclevel          Level
 	Walkgen           uint32
 	Maxextraloopdepth int32
@@ -522,7 +522,7 @@ var looping Label
 
 var nonlooping Label
 
-func escloopdepthlist(e *EscState, l nodesOrNodeList) {
+func escloopdepthlist(e *EscState, l Nodes) {
 	for it := nodeSeqIterate(l); !it.Done(); it.Next() {
 		escloopdepth(e, it.N())
 	}
@@ -566,7 +566,7 @@ func escloopdepth(e *EscState, n *Node) {
 	escloopdepthlist(e, n.Rlist)
 }
 
-func esclist(e *EscState, l nodesOrNodeList, up *Node) {
+func esclist(e *EscState, l Nodes, up *Node) {
 	for it := nodeSeqIterate(l); !it.Done(); it.Next() {
 		esc(e, it.N(), up)
 	}
@@ -771,7 +771,7 @@ func esc(e *EscState, n *Node, up *Node) {
 		}
 
 	case ORETURN:
-		ll := nodesOrNodeList(n.List)
+		ll := n.List
 		if nodeSeqLen(n.List) == 1 && Curfn.Type.Outtuple > 1 {
 			// OAS2FUNC in disguise
 			// esccall already done on n->list->n
@@ -1204,7 +1204,7 @@ func describeEscape(em uint16) string {
 
 // escassignfromtag models the input-to-output assignment flow of one of a function
 // calls arguments, where the flow is encoded in "note".
-func escassignfromtag(e *EscState, note *string, dsts nodesOrNodeList, src *Node) uint16 {
+func escassignfromtag(e *EscState, note *string, dsts Nodes, src *Node) uint16 {
 	em := parsetag(note)
 	if src.Op == OLITERAL {
 		return em
@@ -1320,7 +1320,7 @@ func escNoteOutputParamFlow(e uint16, vargen int32, level Level) uint16 {
 func initEscretval(e *EscState, n *Node, fntype *Type) {
 	i := 0
 	nE := e.nodeEscState(n)
-	setNodeSeq(&nE.Escretval, nil) // Suspect this is not nil for indirect calls.
+	nE.Escretval.Set(nil) // Suspect this is not nil for indirect calls.
 	for t := getoutargx(fntype).Type; t != nil; t = t.Down {
 		src := Nod(ONAME, nil, nil)
 		buf := fmt.Sprintf(".out%d", i)
@@ -1332,7 +1332,7 @@ func initEscretval(e *EscState, n *Node, fntype *Type) {
 		e.nodeEscState(src).Escloopdepth = e.loopdepth
 		src.Used = true
 		src.Lineno = n.Lineno
-		appendNodeSeqNode(&nE.Escretval, src)
+		nE.Escretval.Append(src)
 	}
 }
 
@@ -1368,7 +1368,7 @@ func esccall(e *EscState, n *Node, up *Node) {
 		indirect = true
 	}
 
-	ll := nodesOrNodeList(n.List)
+	ll := n.List
 	if nodeSeqLen(n.List) == 1 {
 		a := nodeSeqFirst(n.List)
 		if a.Type.Etype == TSTRUCT && a.Type.Funarg { // f(g()).

src/cmd/compile/internal/gc/export.go

@@ -106,7 +106,7 @@ func dumppkg(p *Pkg) {
 }
 
 // Look for anything we need for the inline body
-func reexportdeplist(ll nodesOrNodeList) {
+func reexportdeplist(ll Nodes) {
 	for it := nodeSeqIterate(ll); !it.Done(); it.Next() {
 		reexportdep(it.N())
 	}

src/cmd/compile/internal/gc/fmt.go

@@ -1699,7 +1699,9 @@ func Nconv(n *Node, flag int) string {
 }
 
 func (l *NodeList) String() string {
-	return Hconv(l, 0)
+	var n Nodes
+	n.Set(nodeSeqSlice(l))
+	return Hconv(n, 0)
 }
 
 func (n Nodes) String() string {
@@ -1708,7 +1710,7 @@ func (n Nodes) String() string {
 
 // Fmt '%H': NodeList.
 // Flags: all those of %N plus ',': separate with comma's instead of semicolons.
-func Hconv(l nodesOrNodeList, flag int) string {
+func Hconv(l Nodes, flag int) string {
 	if nodeSeqLen(l) == 0 && fmtmode == FDbg {
 		return "<nil>"
 	}
@@ -1736,7 +1738,7 @@ func Hconv(l nodesOrNodeList, flag int) string {
 	return buf.String()
 }
 
-func dumplist(s string, l nodesOrNodeList) {
+func dumplist(s string, l Nodes) {
 	fmt.Printf("%s%v\n", s, Hconv(l, obj.FmtSign))
 }
 

src/cmd/compile/internal/gc/gen.go

@@ -215,7 +215,7 @@ func stmtlabel(n *Node) *Label {
 }
 
 // compile statements
-func Genlist(l nodesOrNodeList) {
+func Genlist(l Nodes) {
 	for it := nodeSeqIterate(l); !it.Done(); it.Next() {
 		gen(it.N())
 	}
@@ -440,7 +440,7 @@ func cgen_dottype(n *Node, res, resok *Node, wb bool) {
 		r1.Type = byteptr
 		r2.Type = byteptr
 		setNodeSeq(&call.List, list(list(list1(&r1), &r2), typename(n.Left.Type)))
-		setNodeSeq(&call.List, ascompatte(OCALLFUNC, call, false, getinarg(fn.Type), call.List, 0, nil))
+		setNodeSeq(&call.List, ascompatte(OCALLFUNC, call, false, getinarg(fn.Type), call.List.Slice(), 0, nil))
 		gen(call)
 		Regfree(&r1)
 		Regfree(&r2)
@@ -526,7 +526,7 @@ func Cgen_As2dottype(n, res, resok *Node) {
 	dowidth(fn.Type)
 	call := Nod(OCALLFUNC, fn, nil)
 	setNodeSeq(&call.List, list(list(list1(&r1), &r2), typename(n.Left.Type)))
-	setNodeSeq(&call.List, ascompatte(OCALLFUNC, call, false, getinarg(fn.Type), call.List, 0, nil))
+	setNodeSeq(&call.List, ascompatte(OCALLFUNC, call, false, getinarg(fn.Type), call.List.Slice(), 0, nil))
 	gen(call)
 	Regfree(&r1)
 	Regfree(&r2)

src/cmd/compile/internal/gc/init.go

@@ -94,7 +94,7 @@ func fninit(n *NodeList) {
 		return
 	}
 
-	nf := initfix(n)
+	nf := initfix(nodeSeqSlice(n))
 	if !anyinit(nf) {
 		return
 	}