diff --git a/src/cmd/compile/internal/gc/closure.go b/src/cmd/compile/internal/gc/closure.go index 89e2a4ef00..397162dac8 100644 --- a/src/cmd/compile/internal/gc/closure.go +++ b/src/cmd/compile/internal/gc/closure.go @@ -186,7 +186,7 @@ func capturevars(xfunc *Node) { outermost := v.Name.Defn // out parameters will be assigned to implicitly upon return. - if outer.Class() != PPARAMOUT && !outermost.Addrtaken() && !outermost.Assigned() && v.Type.Width <= 128 { + if outermost.Class() != PPARAMOUT && !outermost.Addrtaken() && !outermost.Assigned() && v.Type.Width <= 128 { v.Name.SetByval(true) } else { outermost.SetAddrtaken(true) diff --git a/test/fixedbugs/issue32175.go b/test/fixedbugs/issue32175.go new file mode 100644 index 0000000000..a67735148e --- /dev/null +++ b/test/fixedbugs/issue32175.go @@ -0,0 +1,22 @@ +// run + +// Copyright 2019 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 main + +// This used to print 0, because x was incorrectly captured by value. + +func f() (x int) { + defer func() func() { + return func() { + println(x) + } + }()() + return 42 +} + +func main() { + f() +} diff --git a/test/fixedbugs/issue32175.out b/test/fixedbugs/issue32175.out new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/test/fixedbugs/issue32175.out @@ -0,0 +1 @@ +42