Consider receivers as vars when generating func/closure types

compiler/function.go

@@ -86,7 +86,8 @@ func collectFunctypes(p *packages.Package, name string, fn ast.Node, scope *func
 	signature := copyFunctionType(functionTypeOf(fn))
 	signature.TypeParams = nil
 
-	for _, fields := range []*ast.FieldList{signature.Params, signature.Results} {
+	recv := copyFieldList(functionRecvOf(fn))
+	for _, fields := range []*ast.FieldList{recv, signature.Params, signature.Results} {
 		if fields != nil {
 			for _, field := range fields.List {
 				for _, name := range field.Names {
@@ -348,6 +349,17 @@ func functionTypeOf(fn ast.Node) *ast.FuncType {
 	}
 }
 
+func functionRecvOf(fn ast.Node) *ast.FieldList {
+	switch f := fn.(type) {
+	case *ast.FuncDecl:
+		return f.Recv
+	case *ast.FuncLit:
+		return nil
+	default:
+		panic("node is neither *ast.FuncDecl or *ast.FuncLit")
+	}
+}
+
 func copyFunctionType(f *ast.FuncType) *ast.FuncType {
 	return &ast.FuncType{
 		TypeParams: copyFieldList(f.TypeParams),

compiler/testdata/coroutine_durable.go

@@ -3360,7 +3360,8 @@ func init() {
 	_types.RegisterClosure[func(x int), struct {
 		F  uintptr
 		D  uintptr
-		X0 int
+		X0 *IdentityGenericStruct[T]
+		X1 int
 	}]("github.com/stealthrocket/coroutine/compiler/testdata.(*IdentityGenericStruct[go.shape.int]).Closure.func1")
 	_types.RegisterFunc[func()]("github.com/stealthrocket/coroutine/compiler/testdata.(*IdentityGenericStruct[go.shape.int]).Run")
 	_types.RegisterFunc[func(n int)]("github.com/stealthrocket/coroutine/compiler/testdata.Double")