cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-27 10:21:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile: inline list storage stealing

Browse Source 
It is only necessary in a few places, and this inlining will
simplify the transition away from NodeLists.

Passes toolstash -cmp.

Change-Id: I4ee9b4bf56ffa04df23e20a0a83b302d36b33510
Reviewed-on: https://go-review.googlesource.com/20290
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Josh Bleecher Snyder 2016-03-05 16:25:58 -08:00
parent b8a2e25f55
commit a81283d5d9
2 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cmd/compile/internal/gc/parser.go
View File

@ -684,7 +684,11 @@ func (p *parser) labeled_stmt(label *Node) *Node {
label.Name.Defn = ls label.Name.Defn = ls
l := list1(label) l := list1(label)
if ls != nil { if ls != nil {
l = list(l, ls) if ls.Op == OBLOCK && nodeSeqLen(ls.Ninit) == 0 {
l = concat(l, ls.List)
} else {
l = list(l, ls)
}
} }
return liststmt(l) return liststmt(l)
} }
@ -1043,7 +1047,12 @@ func (p *parser) if_stmt() *Node {
if p.tok == LIF { if p.tok == LIF {
setNodeSeq(&stmt.Rlist, []*Node{p.if_stmt()}) setNodeSeq(&stmt.Rlist, []*Node{p.if_stmt()})
} else { } else {
setNodeSeq(&stmt.Rlist, []*Node{p.compound_stmt(true)}) cs := p.compound_stmt(true)
if cs.Op == OBLOCK && cs.Ninit == nil {
setNodeSeq(&stmt.Rlist, cs.List)
} else {
setNodeSeq(&stmt.Rlist, []*Node{cs})
}
} }
} }
@ -2538,7 +2547,11 @@ func (p *parser) stmt_list() (l *NodeList) {
if s == missing_stmt { if s == missing_stmt {
break break
} }
l = list(l, s) if s != nil && s.Op == OBLOCK && nodeSeqLen(s.Ninit) == 0 {
l = concat(l, s.List)
} else {
l = list(l, s)
}
// customized version of osemi: // customized version of osemi:
// ';' is optional before a closing ')' or '}' // ';' is optional before a closing ')' or '}'
if p.tok == ')' || p.tok == '}' { if p.tok == ')' || p.tok == '}' {

27
src/cmd/compile/internal/gc/syntax.go
View File

@ -391,15 +391,6 @@ func list1(n *Node) *NodeList {
if n == nil { if n == nil {
return nil return nil
} }
if n.Op == OBLOCK && nodeSeqLen(n.Ninit) == 0 {
// Flatten list and steal storage.
// Poison pointer to catch errant uses.
l := n.List
setNodeSeq(&n.List, nil)
return l
}
l := new(NodeList) l := new(NodeList)
l.N = n l.N = n
l.End = l l.End = l
@ -741,15 +732,6 @@ func setNodeSeq(a nodesOrNodeListPtr, b nodesOrNodeList) {
// This is an interim function during the transition from NodeList to Nodes. // This is an interim function during the transition from NodeList to Nodes.
// TODO(iant): Remove when transition is complete. // TODO(iant): Remove when transition is complete.
func setNodeSeqNode(a nodesOrNodeListPtr, n *Node) { func setNodeSeqNode(a nodesOrNodeListPtr, n *Node) {
// This is what the old list1 function did;
// the rest of the compiler has come to expect it.
if n.Op == OBLOCK && nodeSeqLen(n.Ninit) == 0 {
l := n.List
setNodeSeq(&n.List, nil)
setNodeSeq(a, l)
return
}
switch a := a.(type) { switch a := a.(type) {
case **NodeList: case **NodeList:
*a = list1(n) *a = list1(n)
@ -822,15 +804,6 @@ func appendNodeSeq(a nodesOrNodeListPtr, b nodesOrNodeList) {
// This is an interim function during the transition from NodeList to Nodes. // This is an interim function during the transition from NodeList to Nodes.
// TODO(iant): Remove when transition is complete. // TODO(iant): Remove when transition is complete.
func appendNodeSeqNode(a nodesOrNodeListPtr, n *Node) { func appendNodeSeqNode(a nodesOrNodeListPtr, n *Node) {
// This is what the old list1 function did;
// the rest of the compiler has come to expect it.
if n.Op == OBLOCK && nodeSeqLen(n.Ninit) == 0 {
l := n.List
setNodeSeq(&n.List, nil)
appendNodeSeq(a, l)
return
}
switch a := a.(type) { switch a := a.(type) {
case **NodeList: case **NodeList:
*a = list(*a, n) *a = list(*a, n)