aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/compile/internal/ir
diff options
context:
space:
mode:
authorKeith Randall <khr@golang.org>2021-08-13 09:30:19 -0700
committerKeith Randall <khr@golang.org>2021-08-16 16:55:27 +0000
commit5a401001417151649363a4b2fbd658f3f1957cba (patch)
treee7b154c2a952f41f7b32269f5c481fcd5cd57a85 /src/cmd/compile/internal/ir
parentc92f5ee170e6f9c639f1ca684061a0cedde54108 (diff)
downloadgo-5a401001417151649363a4b2fbd658f3f1957cba.tar.gz
go-5a401001417151649363a4b2fbd658f3f1957cba.zip
cmd/compile: fix dictionaries for nested closures
Capturing dictionary closure variables is ok. Fixes #47684 Change-Id: I049c87117915e0c5a172b9665bfac2f91064b2d4 Reviewed-on: https://go-review.googlesource.com/c/go/+/342050 Trust: Keith Randall <khr@golang.org> Trust: Dan Scales <danscales@google.com> Run-TryBot: Keith Randall <khr@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Dan Scales <danscales@google.com>
Diffstat (limited to 'src/cmd/compile/internal/ir')
-rw-r--r--src/cmd/compile/internal/ir/name.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/ir/name.go b/src/cmd/compile/internal/ir/name.go
index a2eec05013..48fe572124 100644
--- a/src/cmd/compile/internal/ir/name.go
+++ b/src/cmd/compile/internal/ir/name.go
@@ -404,7 +404,9 @@ func CaptureName(pos src.XPos, fn *Func, n *Name) *Name {
if n.Op() != ONAME || n.Curfn == nil {
return n // okay to use directly
}
- if n.IsClosureVar() {
+ if n.IsClosureVar() && n.Sym().Name != ".dict" {
+ // Note: capturing dictionary closure variables is ok. This makes
+ // sure the generated code is correctly optimized.
base.FatalfAt(pos, "misuse of CaptureName on closure variable: %v", n)
}