Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: more nodeSeq conversions

Browse source 
Found by temporarily flipping fields from *NodeList to Nodes and fixing
all the compilation errors.  This CL does not actually change any
fields.

Passes toolstash -cmp.

Update #14473.

Change-Id: Ib98fa37e8752f96358224c973a743618a6a0e736
Reviewed-on: https://go-review.googlesource.com/20320
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Ian Lance Taylor 2016-03-07 09:36:24 -08:00
parent c3dfad5df9
commit 2a68c6c27c
15 changed files with 234 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/cmd/compile/internal/gc/esc.go
View file

@ -771,12 +771,12 @@ func esc(e *EscState, n *Node, up *Node) {
}
case ORETURN:
ll := n.List
ll := nodesOrNodeList(n.List)
if nodeSeqLen(n.List) == 1 && Curfn.Type.Outtuple > 1 {
// OAS2FUNC in disguise
// esccall already done on n->list->n
// tie n->list->n->escretval to curfn->dcl PPARAMOUT's
ll = e.nodeEscState(n.List.N).Escretval
ll = e.nodeEscState(nodeSeqFirst(n.List)).Escretval
}
llit := nodeSeqIterate(ll)
@ -1368,9 +1368,9 @@ func esccall(e *EscState, n *Node, up *Node) {
indirect = true
}
ll := n.List
if n.List != nil && n.List.Next == nil {
a := n.List.N
ll := nodesOrNodeList(n.List)
if nodeSeqLen(n.List) == 1 {
a := nodeSeqFirst(n.List)
if a.Type.Etype == TSTRUCT && a.Type.Funarg { // f(g()).
ll = e.nodeEscState(a).Escretval
}
@ -1481,15 +1481,16 @@ func esccall(e *EscState, n *Node, up *Node) {
}
var src *Node
for t := getinargx(fntype).Type; ll != nil; ll = ll.Next {
src = ll.N
it := nodeSeqIterate(ll)
for t := getinargx(fntype).Type; !it.Done(); it.Next() {
src = it.N()
if t.Isddd && !n.Isddd {
// Introduce ODDDARG node to represent ... allocation.
src = Nod(ODDDARG, nil, nil)
src.Lineno = n.Lineno
src.Type = typ(TARRAY)
src.Type.Type = t.Type.Type
src.Type.Bound = int64(count(ll))
src.Type.Bound = int64(it.Len())
src.Type = Ptrto(src.Type) // make pointer so it will be tracked
e.track(src)
n.Right = src
@ -1522,18 +1523,18 @@ func esccall(e *EscState, n *Node, up *Node) {
}
}
if src != ll.N {
if src != it.N() {
// This occurs when function parameter type Isddd and n not Isddd
break
}
t = t.Down
}
for ; ll != nil; ll = ll.Next {
for ; !it.Done(); it.Next() {
if Debug['m'] > 2 {
fmt.Printf("%v::esccall:: ... <- %v\n", linestr(lineno), Nconv(ll.N, obj.FmtShort))
fmt.Printf("%v::esccall:: ... <- %v\n", linestr(lineno), Nconv(it.N(), obj.FmtShort))
}
escassign(e, src, ll.N) // args to slice
escassign(e, src, it.N()) // args to slice
}
}