cmd/compile/internal/gc: remove a Curfn dependency from nod

Change-Id: I5daeb8f00044c86bb10510afbc6886898e61ba15
Reviewed-on: https://go-review.googlesource.com/38570
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>

diff --git a/src/cmd/compile/internal/gc/closure.go b/src/cmd/compile/internal/gc/closure.go
index 41ee74b8e033218ce5df62b4ca0f9c1e2fb7f7e0..f53501ca51ebdaacb1987457d5a449a0c4d5f422 100644 (file)
--- a/src/cmd/compile/internal/gc/closure.go
+++ b/src/cmd/compile/internal/gc/closure.go
@@ -11,6 +11,7 @@ import (
 // function literals aka closures
 func closurehdr(ntype *Node) {
        n := nod(OCLOSURE, nil, nil)
+       n.Func.SetIsHiddenClosure(Curfn != nil)
        n.Func.Ntype = ntype
        n.Func.Depth = funcdepth
        n.Func.Outerfunc = Curfn
@@ -209,6 +210,7 @@ func makeclosure(func_ *Node) *Node {
 
        // create the function
        xfunc := nod(ODCLFUNC, nil, nil)
+       xfunc.Func.SetIsHiddenClosure(Curfn != nil)
 
        xfunc.Func.Nname = newfuncname(closurename(func_))
        xfunc.Func.Nname.Sym.SetExported(true) // disable export

diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go
index 92a269f15d584a126cb272041a5c3730950e477e..6b18cd2f6ef9a9bba38045ec9a49d0ad037fee48 100644 (file)
--- a/src/cmd/compile/internal/gc/subr.go
+++ b/src/cmd/compile/internal/gc/subr.go
@@ -342,7 +342,6 @@ func nod(op Op, nleft *Node, nright *Node) *Node {
                }
                n = &x.Node
                n.Func = &x.Func
-               n.Func.SetIsHiddenClosure(Curfn != nil)
        case ONAME:
                var x struct {
                        Node