The D param appears to be added to the end

dispatchrun · Dec 15, 2023 · be88525 · be88525
1 parent ab465f8
commit be88525
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/compiler/function.go b/compiler/function.go
@@ -178,13 +178,6 @@ func collectFunctypes(p *packages.Package, name string, fn ast.Node, scope *func
 				Names: []*ast.Ident{ast.NewIdent("F")},
 			},
 		}
-		if g != nil {
-			// Append a field for the dictionary.
-			fields = append(fields, &ast.Field{
-				Type:  ast.NewIdent("uintptr"),
-				Names: []*ast.Ident{ast.NewIdent("D")},
-			})
-		}
 		for i, freeVar := range freeVars {
 			fieldName := ast.NewIdent(fmt.Sprintf("X%d", i))
 			fieldType := freeVar.typ
@@ -204,6 +197,13 @@ func collectFunctypes(p *packages.Package, name string, fn ast.Node, scope *func
 				Names: []*ast.Ident{fieldName},
 			})
 		}
+		if g != nil {
+			// Append a field for the dictionary.
+			fields = append(fields, &ast.Field{
+				Type:  ast.NewIdent("uintptr"),
+				Names: []*ast.Ident{ast.NewIdent("D")},
+			})
+		}
 		functype.closure = &ast.StructType{
 			Fields: &ast.FieldList{List: fields},
 		}

diff --git a/compiler/testdata/coroutine_durable.go b/compiler/testdata/coroutine_durable.go
@@ -3574,12 +3574,12 @@ func init() {
 	_types.RegisterFunc[func(_fn1 int) (_ func(int))]("github.com/stealthrocket/coroutine/compiler/testdata.(*IdentityGenericStruct[go.shape.int]).Closure")
 	_types.RegisterClosure[func(_fn0 int), struct {
 		F  uintptr
-		D  uintptr
 		X0 *struct {
 			IP int
 			X0 *IdentityGenericStruct[int]
 			X1 int
 		}
+		D uintptr
 	}]("github.com/stealthrocket/coroutine/compiler/testdata.(*IdentityGenericStruct[go.shape.int]).Closure.func2")
 	_types.RegisterFunc[func()]("github.com/stealthrocket/coroutine/compiler/testdata.(*IdentityGenericStruct[go.shape.int]).Run")
 	_types.RegisterFunc[func(_fn1 int)]("github.com/stealthrocket/coroutine/compiler/testdata.(*MethodGeneratorState).MethodGenerator")
@@ -3721,8 +3721,8 @@ func init() {
 	_types.RegisterFunc[func(n int) func()]("github.com/stealthrocket/coroutine/compiler/testdata.buildClosure[go.shape.int]")
 	_types.RegisterClosure[func(), struct {
 		F  uintptr
-		D  uintptr
 		X0 int
+		D  uintptr
 	}]("github.com/stealthrocket/coroutine/compiler/testdata.buildClosure[go.shape.int].func1")
 	_types.RegisterFunc[func(_fn0 ...int)]("github.com/stealthrocket/coroutine/compiler/testdata.varArgs")
 }