cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile: mark closures made for generic function expressions as wrappers

Browse Source 
Fixes #52237

Change-Id: I7488020c8d157e069202017a293d18230e3aef0d
Reviewed-on: https://go-review.googlesource.com/c/go/+/408876
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
This commit is contained in:
Keith Randall 2022-05-26 11:33:09 -07:00
parent ec9258029e
commit dbf5220475
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/compile/internal/noder/stencil.go
View File

@ -407,6 +407,7 @@ func (g *genInst) buildClosure(outer *ir.Func, x ir.Node) ir.Node {
// Make a new internal function. // Make a new internal function.
fn, formalParams, formalResults := startClosure(pos, outer, typ) fn, formalParams, formalResults := startClosure(pos, outer, typ)
fn.SetWrapper(true) // See issue 52237
// This is the dictionary we want to use. // This is the dictionary we want to use.
// It may be a constant, it may be the outer functions's dictionary, or it may be // It may be a constant, it may be the outer functions's dictionary, or it may be

22
src/testing/helper_test.go
View File

@ -24,20 +24,22 @@ func TestTBHelper(t *T) {
want := `--- FAIL: Test (?s) want := `--- FAIL: Test (?s)
helperfuncs_test.go:12: 0 helperfuncs_test.go:12: 0
helperfuncs_test.go:33: 1 helperfuncs_test.go:40: 1
helperfuncs_test.go:21: 2 helperfuncs_test.go:21: 2
helperfuncs_test.go:35: 3 helperfuncs_test.go:42: 3
helperfuncs_test.go:42: 4 helperfuncs_test.go:49: 4
--- FAIL: Test/sub (?s) --- FAIL: Test/sub (?s)
helperfuncs_test.go:45: 5 helperfuncs_test.go:52: 5
helperfuncs_test.go:21: 6 helperfuncs_test.go:21: 6
helperfuncs_test.go:44: 7 helperfuncs_test.go:51: 7
helperfuncs_test.go:56: 8 helperfuncs_test.go:63: 8
--- FAIL: Test/sub2 (?s) --- FAIL: Test/sub2 (?s)
helperfuncs_test.go:71: 11 helperfuncs_test.go:78: 11
helperfuncs_test.go:75: recover 12 helperfuncs_test.go:82: recover 12
helperfuncs_test.go:64: 9 helperfuncs_test.go:84: GenericFloat64
helperfuncs_test.go:60: 10 helperfuncs_test.go:85: GenericInt
helperfuncs_test.go:71: 9
helperfuncs_test.go:67: 10
` `
lines := strings.Split(buf.String(), "\n") lines := strings.Split(buf.String(), "\n")
durationRE := regexp.MustCompile(`\(.*\)$`) durationRE := regexp.MustCompile(`\(.*\)$`)

10
src/testing/helperfuncs_test.go
View File

@ -26,6 +26,13 @@ func helperCallingHelper(t *T, msg string) {
helper(t, msg) helper(t, msg)
} }
func genericHelper[G any](t *T, msg string) {
t.Helper()
t.Error(msg)
}
var genericIntHelper = genericHelper[int]
func testHelper(t *T) { func testHelper(t *T) {
// Check combinations of directly and indirectly // Check combinations of directly and indirectly
// calling helper functions. // calling helper functions.
@ -73,6 +80,9 @@ func testHelper(t *T) {
// Check that helper-ness propagates up through panic/recover. // Check that helper-ness propagates up through panic/recover.
// See https://golang.org/issue/31154. // See https://golang.org/issue/31154.
recoverHelper(t, "12") recoverHelper(t, "12")
genericHelper[float64](t, "GenericFloat64")
genericIntHelper(t, "GenericInt")
} }
func parallelTestHelper(t *T) { func parallelTestHelper(t *T) {