cmd/compile: move Node.Curfn into both Node.Func and Node.Name
$ sizeof -p cmd/compile/internal/gc Node
Node 168
$
Change-Id: If624a2d72ec04ef30a1bc7ce76c0d61a526d8a37
Reviewed-on: https://go-review.googlesource.com/10532
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/test/escape2n.go b/test/escape2n.go
index 56f05eb..f1481c1 100644
--- a/test/escape2n.go
+++ b/test/escape2n.go
@@ -606,7 +606,7 @@
vv := v // ERROR "moved to heap: vv$"
// actually just escapes its scope
array[i] = func() { // ERROR "func literal escapes to heap$"
- println(&vv) // ERROR "&vv escapes to heap$" "<S> &vv does not escape$"
+ println(&vv) // ERROR "&vv escapes to heap$" "foo74c.func1 &vv does not escape$"
}
}
}
@@ -1235,7 +1235,7 @@
p := &i // ERROR "&i escapes to heap$"
func() { // ERROR "foo129 func literal does not escape$"
q := p // ERROR "leaking closure reference p$"
- func() { // ERROR "<S> func literal does not escape$"
+ func() { // ERROR "foo129.func1 func literal does not escape$"
r := q // ERROR "leaking closure reference q$"
px = r
}()
@@ -1277,7 +1277,7 @@
p := &i // ERROR "foo134 &i does not escape$"
func() { // ERROR "foo134 func literal does not escape$"
q := p
- func() { // ERROR "<S> func literal does not escape$"
+ func() { // ERROR "foo134.func1 func literal does not escape$"
r := q
_ = r
}()
@@ -1289,7 +1289,7 @@
p := &i // ERROR "&i escapes to heap$"
go func() { // ERROR "func literal escapes to heap$"
q := p
- func() { // ERROR "<S> func literal does not escape$"
+ func() { // ERROR "foo135.func1 func literal does not escape$"
r := q
_ = r
}()
@@ -1301,7 +1301,7 @@
p := &i // ERROR "&i escapes to heap$"
go func() { // ERROR "func literal escapes to heap$"
q := p // ERROR "leaking closure reference p$"
- func() { // ERROR "<S> func literal does not escape$"
+ func() { // ERROR "foo136.func1 func literal does not escape$"
r := q // ERROR "leaking closure reference q$"
px = r
}()
@@ -1408,7 +1408,7 @@
func() { // ERROR "foo143 func literal does not escape$"
for i := 0; i < 1; i++ {
var t Tm
- t.M() // ERROR "<S> t does not escape$"
+ t.M() // ERROR "foo143.func1 t does not escape$"
}
}()
}
