cmd/compile: simplify as2 method of *Order

Merge the two for loops that set up the node lists for
temporaries into one for loop.

Passes toolstash -cmp

Change-Id: Ibc739115f38c8869b0dcfbf9819fdc2fc96962e0
Reviewed-on: https://go-review.googlesource.com/c/141819
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Martin Möhrmann <moehrmann@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/gc/order.go b/src/cmd/compile/internal/gc/order.go
index 519fad4b7edcbf60512962fd8616e43796d4fd8f..f33689298f3130674189d64c61ef1c4111421890 100644 (file)
--- a/src/cmd/compile/internal/gc/order.go
+++ b/src/cmd/compile/internal/gc/order.go
@@ -1253,9 +1253,10 @@ func okas(ok, val *Node) *Node {
 func (o *Order) as2(n *Node) {
        tmplist := []*Node{}
        left := []*Node{}
-       for _, l := range n.List.Slice() {
+       for ni, l := range n.List.Slice() {
                if !l.isBlank() {
                        tmp := o.newTemp(l.Type, types.Haspointers(l.Type))
+                       n.List.SetIndex(ni, tmp)
                        tmplist = append(tmplist, tmp)
                        left = append(left, l)
                }
@@ -1268,14 +1269,6 @@ func (o *Order) as2(n *Node) {
        as.Rlist.Set(tmplist)
        as = typecheck(as, Etop)
        o.stmt(as)
-
-       ti := 0
-       for ni, l := range n.List.Slice() {
-               if !l.isBlank() {
-                       n.List.SetIndex(ni, tmplist[ti])
-                       ti++
-               }
-       }
 }
 
 // okAs2 orders OAS2 with ok.