cmd/compile: remove Node.Nincr, Node.Nelse, Node.Initplan
$ sizeof -p cmd/compile/internal/gc Node
Node 288
$
Change-Id: I4e316efa246132b3faa3a892e4fe9c9039250665
Reviewed-on: https://go-review.googlesource.com/10520
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
diff --git a/src/cmd/compile/internal/gc/range.go b/src/cmd/compile/internal/gc/range.go
index 03beb1c..1036cf9 100644
--- a/src/cmd/compile/internal/gc/range.go
+++ b/src/cmd/compile/internal/gc/range.go
@@ -146,6 +146,7 @@
a := n.Right
lno := int(setlineno(a))
+ n.Right = nil
var v1 *Node
if n.List != nil {
@@ -201,7 +202,6 @@
n.Nbody = nil
n.Ntest = Nod(ONE, Nod(OLEN, a, nil), Nodintconst(0))
- n.Nincr = nil
// hp = &a[0]
hp := temp(Ptrto(Types[TUINT8]))
@@ -267,7 +267,7 @@
}
n.Ntest = Nod(OLT, hv1, hn)
- n.Nincr = Nod(OAS, hv1, Nod(OADD, hv1, Nodintconst(1)))
+ n.Right = Nod(OAS, hv1, Nod(OADD, hv1, Nodintconst(1)))
if v1 == nil {
body = nil
} else if v2 == nil {
@@ -294,7 +294,7 @@
tmp.Right.Typecheck = 1
a = Nod(OAS, hp, tmp)
typecheck(&a, Etop)
- n.Nincr.Ninit = list1(a)
+ n.Right.Ninit = list1(a)
}
// orderstmt allocated the iterator for us.
@@ -317,7 +317,7 @@
fn = syslook("mapiternext", 1)
substArgTypes(fn, th)
- n.Nincr = mkcall1(fn, nil, nil, Nod(OADDR, hit, nil))
+ n.Right = mkcall1(fn, nil, nil, Nod(OADDR, hit, nil))
key := Nod(ODOT, hit, keyname)
key = Nod(OIND, key, nil)
@@ -397,7 +397,7 @@
n.Ninit = concat(n.Ninit, init)
typechecklist(n.Ntest.Ninit, Etop)
typecheck(&n.Ntest, Erv)
- typecheck(&n.Nincr, Etop)
+ typecheck(&n.Right, Etop)
typechecklist(body, Etop)
n.Nbody = concat(body, n.Nbody)
walkstmt(&n)
