cmd/compile: respect -newescape in genwrapper

Noticed while preparing a CL for Go 1.14 to remove esc.go. Change-Id: Ic12be33f5b16c8424d85f373fa450247be086078 Reviewed-on: https://go-review.googlesource.com/c/go/+/173298 Run-TryBot: Matthew Dempsky <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Cherry Zhang <[email protected]>
cloudflare · Apr 23, 2019 · a152dd0 · a152dd0
1 parent f0fdbb1
commit a152dd0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/cmd/compile/internal/gc/esc.go b/src/cmd/compile/internal/gc/esc.go
@@ -46,11 +46,14 @@ import (
 var newescape bool
 
 func escapes(all []*Node) {
- esc := escAnalyze
+ visitBottomUp(all, escapeImpl())
+}
+
+func escapeImpl() func([]*Node, bool) {
  if newescape {
- esc = escapeFuncs
+ return escapeFuncs
  }
- visitBottomUp(all, esc)
+ return escAnalyze
 }
 
 const (

diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go
@@ -1574,7 +1574,7 @@ func genwrapper(rcvr *types.Type, method *types.Field, newnam *types.Sym) {
  if rcvr.IsPtr() && rcvr.Elem() == method.Type.Recv().Type && rcvr.Elem().Sym != nil {
  inlcalls(fn)
  }
- escAnalyze([]*Node{fn}, false)
+ escapeImpl()([]*Node{fn}, false)
 
  Curfn = nil
  funccompile(fn)