aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/compile/internal/inline
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2021-06-12 07:33:18 -0700
committerMatthew Dempsky <mdempsky@google.com>2021-06-12 15:17:14 +0000
commitf1b1c2f67fae0598db5c20f324334c23d4cd3038 (patch)
tree40efa9b750e0c8247ef3414b0712f5b619110ffa /src/cmd/compile/internal/inline
parentdb7c868307c87c5e9338e1cb0b5738eb96a929ad (diff)
downloadgo-f1b1c2f67fae0598db5c20f324334c23d4cd3038.tar.gz
go-f1b1c2f67fae0598db5c20f324334c23d4cd3038.zip
[dev.typeparams] cmd/compile: simplify NewClosureFunc
I initially made NewClosureFunc take an "outerfn *Func" parameter because I was planning on having it handle closure naming, until remembering that naming needs to wait until typecheck for noder. We don't actually need the *Func yet, just to know whether it's non-nil. So change the parameter to a bool, which simplifies callers a little. Change-Id: Ie83ee4a1ed0571ac6d3879ffd8474c6c3c1a9ff9 Reviewed-on: https://go-review.googlesource.com/c/go/+/327450 Trust: Matthew Dempsky <mdempsky@google.com> Run-TryBot: Matthew Dempsky <mdempsky@google.com> Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com> TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/inline')
-rw-r--r--src/cmd/compile/internal/inline/inl.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/cmd/compile/internal/inline/inl.go b/src/cmd/compile/internal/inline/inl.go
index 76a15dab8b..0620191bbf 100644
--- a/src/cmd/compile/internal/inline/inl.go
+++ b/src/cmd/compile/internal/inline/inl.go
@@ -1153,13 +1153,8 @@ func (subst *inlsubst) closure(n *ir.ClosureExpr) ir.Node {
//fmt.Printf("Inlining func %v with closure into %v\n", subst.fn, ir.FuncName(ir.CurFunc))
- outerfunc := subst.newclofn
- if outerfunc == nil {
- outerfunc = ir.CurFunc
- }
-
oldfn := n.Func
- newfn := ir.NewClosureFunc(oldfn.Pos(), outerfunc)
+ newfn := ir.NewClosureFunc(oldfn.Pos(), true)
// Ntype can be nil for -G=3 mode.
if oldfn.Nname.Ntype != nil {