cmd/compile: create LSym for closures with type conversion

Follow-up to #54959 with another failing case.

The linker needs FuncInfo metadata for all inlined functions. CL 436240 explicitly creates LSym for direct closure calls to ensure we keep the FuncInfo metadata.

However, CL 436240 won't work if the direct closure call is wrapped by a no-effect type conversion, even if that closure could be inlined.

This commit should fix such case.

Fixes #73716

Change-Id: Icda6024da54c8d933f87300e691334c080344695
GitHub-Last-Rev: e9aed02eb6
GitHub-Pull-Request: golang/go#73718
Reviewed-on: https://go-review.googlesource.com/c/go/+/672855
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
Yongyue Sun 2025-05-15 13:53:23 +00:00 committed by David Chase
parent 6df855ebac
commit fc641e7fae
2 changed files with 46 additions and 3 deletions

View File

@ -1117,12 +1117,18 @@ func mkinlcall(callerfn *ir.Func, n *ir.CallExpr, fn *ir.Func, bigCaller, closur
// Not a standard call. // Not a standard call.
return return
} }
if n.Fun.Op() != ir.OCLOSURE {
// Not a direct closure call. var nf = n.Fun
// Skips ir.OCONVNOPs, see issue #73716.
for nf.Op() == ir.OCONVNOP {
nf = nf.(*ir.ConvExpr).X
}
if nf.Op() != ir.OCLOSURE {
// Not a direct closure call or one with type conversion.
return return
} }
clo := n.Fun.(*ir.ClosureExpr) clo := nf.(*ir.ClosureExpr)
if !clo.Func.IsClosure() { if !clo.Func.IsClosure() {
// enqueueFunc will handle non closures anyways. // enqueueFunc will handle non closures anyways.
return return

View File

@ -0,0 +1,37 @@
// build
// Copyright 2025 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.
// Issue 73716: cmd/compile: unnamed functions missing FuncInfo
package main
import "fmt"
type EP func()
type F func(EP) EP
func main() {
eps := []EP{ep1, ep2}
var h EP
for _, ep := range eps {
h = F(func(e EP) EP {
return func() {
ep()
e()
}
})(h)
}
h()
}
func ep1() {
fmt.Printf("ep1\n")
}
func ep2() {
fmt.Printf("ep2\n")
}