1
0
mirror of https://github.com/golang/go synced 2024-11-26 08:38:01 -07:00

cmd/compile: fix missing descend in Addrtaken for closures.

ComputeAddrtaken needs to descend into closures, now that imported
bodies can include closures. The bug was that we weren't properly
setting Addrtaken for a variable inside a closure inside a function that
we were importing.

For now, still disable inlining of functions with closures for -G mode.
I'll enable it in a later change -- there are just a few fixes related
to the fact that we don't need to set Ntype for closure functions.

Added a test derived from the cilium repro in the issue.

Fixes #44370

Change-Id: Ida2a403636bf8740b471b3ad68b5474951811e19
Reviewed-on: https://go-review.googlesource.com/c/go/+/296649
Run-TryBot: Dan Scales <danscales@google.com>
Trust: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Dan Scales 2021-02-25 12:13:23 -08:00
parent a61524d103
commit 9a555fc24c
6 changed files with 47 additions and 5 deletions

View File

@ -159,6 +159,7 @@ func ParseFlags() {
Flag.LinkShared = &Ctxt.Flag_linkshared Flag.LinkShared = &Ctxt.Flag_linkshared
Flag.Shared = &Ctxt.Flag_shared Flag.Shared = &Ctxt.Flag_shared
Flag.WB = true Flag.WB = true
Debug.InlFuncsWithClosures = 1
Flag.Cfg.ImportMap = make(map[string]string) Flag.Cfg.ImportMap = make(map[string]string)

View File

@ -354,9 +354,7 @@ func (v *hairyVisitor) doNode(n ir.Node) bool {
return true return true
case ir.OCLOSURE: case ir.OCLOSURE:
if base.Debug.InlFuncsWithClosures == 0 { if base.Debug.InlFuncsWithClosures == 0 || base.Flag.G > 0 {
// TODO(danscales): change default of InlFuncsWithClosures
// to 1 when #44370 is fixed
v.reason = "not inlining functions with closures" v.reason = "not inlining functions with closures"
return true return true
} }

View File

@ -106,7 +106,8 @@ var DirtyAddrtaken = false
func ComputeAddrtaken(top []ir.Node) { func ComputeAddrtaken(top []ir.Node) {
for _, n := range top { for _, n := range top {
ir.Visit(n, func(n ir.Node) { var doVisit func(n ir.Node)
doVisit = func(n ir.Node) {
if n.Op() == ir.OADDR { if n.Op() == ir.OADDR {
if x := ir.OuterValue(n.(*ir.AddrExpr).X); x.Op() == ir.ONAME { if x := ir.OuterValue(n.(*ir.AddrExpr).X); x.Op() == ir.ONAME {
x.Name().SetAddrtaken(true) x.Name().SetAddrtaken(true)
@ -117,7 +118,11 @@ func ComputeAddrtaken(top []ir.Node) {
} }
} }
} }
}) if n.Op() == ir.OCLOSURE {
ir.VisitList(n.(*ir.ClosureExpr).Func.Body, doVisit)
}
}
ir.Visit(n, doVisit)
} }
} }

View File

@ -0,0 +1,20 @@
// 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
// A StoppableWaitGroup waits for a collection of goroutines to finish.
type StoppableWaitGroup struct {
// i is the internal counter which can store tolerate negative values
// as opposed the golang's library WaitGroup.
i *int64
}
// NewStoppableWaitGroup returns a new StoppableWaitGroup. When the 'Stop' is
// executed, following 'Add()' calls won't have any effect.
func NewStoppableWaitGroup() *StoppableWaitGroup {
return &StoppableWaitGroup{
i: func() *int64 { i := int64(0); return &i }(),
}
}

View File

@ -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 JoinClusterServices() {
_ = a.NewStoppableWaitGroup()
}

View File

@ -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