qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 14:30:02 -07:00
Code Releases Activity

cmd/compile: cleanup Order.cleanTempNoPop slightly

Browse Source 
Passes toolstash-check.

Change-Id: Ia769e719e89e508201711775ea3e2cb3979387fa
Reviewed-on: https://go-review.googlesource.com/102215
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
This commit is contained in:
Matthew Dempsky 2018-03-22 12:49:48 -07:00
parent bcc8edfd8a
commit 096d96779a
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/cmd/compile/internal/gc/order.go
View File

@ -236,7 +236,8 @@ func (o *Order) popTemp(mark ordermarker) {
// Cleantempnopop emits VARKILL and if needed VARLIVE instructions // Cleantempnopop emits VARKILL and if needed VARLIVE instructions
// to *out for each temporary above the mark on the temporary stack. // to *out for each temporary above the mark on the temporary stack.
// It does not pop the temporaries from the stack. // It does not pop the temporaries from the stack.
func (o *Order) cleanTempNoPop(mark ordermarker, out *[]*Node) { func (o *Order) cleanTempNoPop(mark ordermarker) []*Node {
var out []*Node
for i := len(o.temp) - 1; i >= int(mark); i-- { for i := len(o.temp) - 1; i >= int(mark); i-- {
n := o.temp[i] n := o.temp[i]
if n.Name.Keepalive() { if n.Name.Keepalive() {
@ -244,18 +245,19 @@ func (o *Order) cleanTempNoPop(mark ordermarker, out *[]*Node) {
n.SetAddrtaken(true) // ensure SSA keeps the n variable n.SetAddrtaken(true) // ensure SSA keeps the n variable
live := nod(OVARLIVE, n, nil) live := nod(OVARLIVE, n, nil)
live = typecheck(live, Etop) live = typecheck(live, Etop)
*out = append(*out, live) out = append(out, live)
} }
kill := nod(OVARKILL, n, nil) kill := nod(OVARKILL, n, nil)
kill = typecheck(kill, Etop) kill = typecheck(kill, Etop)
*out = append(*out, kill) out = append(out, kill)
} }
return out
} }
// cleanTemp emits VARKILL instructions for each temporary above the // cleanTemp emits VARKILL instructions for each temporary above the
// mark on the temporary stack and removes them from the stack. // mark on the temporary stack and removes them from the stack.
func (o *Order) cleanTemp(top ordermarker) { func (o *Order) cleanTemp(top ordermarker) {
o.cleanTempNoPop(top, &o.out) o.out = append(o.out, o.cleanTempNoPop(top)...)
o.popTemp(top) o.popTemp(top)
} }
@ -646,9 +648,7 @@ func (o *Order) stmt(n *Node) {
case OFOR: case OFOR:
t := o.markTemp() t := o.markTemp()
n.Left = o.exprInPlace(n.Left) n.Left = o.exprInPlace(n.Left)
var l []*Node n.Nbody.Prepend(o.cleanTempNoPop(t)...)
o.cleanTempNoPop(t, &l)
n.Nbody.Prepend(l...)
orderBlock(&n.Nbody) orderBlock(&n.Nbody)
n.Right = orderStmtInPlace(n.Right) n.Right = orderStmtInPlace(n.Right)
o.out = append(o.out, n) o.out = append(o.out, n)
@ -659,12 +659,8 @@ func (o *Order) stmt(n *Node) {
case OIF: case OIF:
t := o.markTemp() t := o.markTemp()
n.Left = o.exprInPlace(n.Left) n.Left = o.exprInPlace(n.Left)
var l []*Node n.Nbody.Prepend(o.cleanTempNoPop(t)...)
o.cleanTempNoPop(t, &l) n.Rlist.Prepend(o.cleanTempNoPop(t)...)
n.Nbody.Prepend(l...)
l = nil
o.cleanTempNoPop(t, &l)
n.Rlist.Prepend(l...)
o.popTemp(t) o.popTemp(t)
orderBlock(&n.Nbody) orderBlock(&n.Nbody)
orderBlock(&n.Rlist) orderBlock(&n.Rlist)
@ -881,9 +877,11 @@ func (o *Order) stmt(n *Node) {
// Also insert any ninit queued during the previous loop. // Also insert any ninit queued during the previous loop.
// (The temporary cleaning must follow that ninit work.) // (The temporary cleaning must follow that ninit work.)
for _, n3 := range n.List.Slice() { for _, n3 := range n.List.Slice() {
s := n3.Ninit.Slice() n3.Nbody.Prepend(o.cleanTempNoPop(t)...)
o.cleanTempNoPop(t, &s)
n3.Nbody.Prepend(s...) // TODO(mdempsky): Is this actually necessary?
// walkselect appears to walk Ninit.
n3.Nbody.Prepend(n3.Ninit.Slice()...)
n3.Ninit.Set(nil) n3.Ninit.Set(nil)
} }
@ -1082,10 +1080,7 @@ func (o *Order) expr(n, lhs *Node) *Node {
// Clean temporaries from first branch at beginning of second. // Clean temporaries from first branch at beginning of second.
// Leave them on the stack so that they can be killed in the outer // Leave them on the stack so that they can be killed in the outer
// context in case the short circuit is taken. // context in case the short circuit is taken.
var s []*Node n.Right = addinit(n.Right, o.cleanTempNoPop(mark))
o.cleanTempNoPop(mark, &s)
n.Right = addinit(n.Right, s)
n.Right = o.exprInPlace(n.Right) n.Right = o.exprInPlace(n.Right)
case OCALLFUNC, case OCALLFUNC,