From 5f3dabbb79fb3dc8eea9a5050557e9241793dce3 Mon Sep 17 00:00:00 2001 From: Dan Scales Date: Fri, 19 Feb 2021 09:40:35 -0800 Subject: [PATCH] cmd/compile: fix import of functions of multiple nested closure For import of functions with closures, the connections among closure variables are constructed on-the-fly via CaptureName(). For multiple nested closures, we need to temporarily set r.curfn to each closure we construct, so that the processing of closure variables will be correct for any nested closure inside that closure. Fixes #44335 Change-Id: I34f99e2822250542528ff6b2232bf36756140868 Reviewed-on: https://go-review.googlesource.com/c/go/+/294212 Run-TryBot: Dan Scales TryBot-Result: Go Bot Trust: Dan Scales Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/typecheck/iimport.go | 12 ++++++++---- test/fixedbugs/issue44335.dir/a.go | 17 +++++++++++++++++ test/fixedbugs/issue44335.dir/b.go | 11 +++++++++++ test/fixedbugs/issue44335.go | 7 +++++++ 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 test/fixedbugs/issue44335.dir/a.go create mode 100644 test/fixedbugs/issue44335.dir/b.go create mode 100644 test/fixedbugs/issue44335.go diff --git a/src/cmd/compile/internal/typecheck/iimport.go b/src/cmd/compile/internal/typecheck/iimport.go index 7b5b113b15..29090a9178 100644 --- a/src/cmd/compile/internal/typecheck/iimport.go +++ b/src/cmd/compile/internal/typecheck/iimport.go @@ -986,15 +986,19 @@ func (r *importReader) node() ir.Node { fn.ClosureVars = cvars r.allClosureVars = append(r.allClosureVars, cvars...) - fn.Dcl = r.readFuncDcls(fn) - body := r.stmtList() + fn.Inl = &ir.Inline{} + // Read in the Dcls and Body of the closure after temporarily + // setting r.curfn to fn. + r.funcBody(fn) + fn.Dcl = fn.Inl.Dcl + fn.Body = fn.Inl.Body + fn.Inl = nil + ir.FinishCaptureNames(pos, r.curfn, fn) clo := ir.NewClosureExpr(pos, fn) fn.OClosure = clo - fn.Body = body - return clo // case OPTRLIT: diff --git a/test/fixedbugs/issue44335.dir/a.go b/test/fixedbugs/issue44335.dir/a.go new file mode 100644 index 0000000000..2c9c217813 --- /dev/null +++ b/test/fixedbugs/issue44335.dir/a.go @@ -0,0 +1,17 @@ +// Copyright 2021 The Go Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in +// the LICENSE file + +package a + +type W struct { + M func(string) string +} + +func FM(m string) func(W) { + return func(pw W) { + pw.M = func(string) string { + return m + } + } +} diff --git a/test/fixedbugs/issue44335.dir/b.go b/test/fixedbugs/issue44335.dir/b.go new file mode 100644 index 0000000000..e72c2abc6a --- /dev/null +++ b/test/fixedbugs/issue44335.dir/b.go @@ -0,0 +1,11 @@ +// Copyright 2021 The Go Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in +// the LICENSE file. + +package b + +import "./a" + +func F() { + a.FM("") +} diff --git a/test/fixedbugs/issue44335.go b/test/fixedbugs/issue44335.go new file mode 100644 index 0000000000..d406838588 --- /dev/null +++ b/test/fixedbugs/issue44335.go @@ -0,0 +1,7 @@ +// compiledir + +// Copyright 2021 The Go Authors. All rights reserved. Use of this +// source code is governed by a BSD-style license that can be found in +// the LICENSE file. + +package ignored -- 2.50.0