fixes

Signed-off-by: Achille Roussel <[email protected]>

compiler/coroutine_test.go

@@ -133,7 +133,7 @@ func TestCoroutineYield(t *testing.T) {
 
 		{
 			name:   "range over closure capturing heterogenous values",
-			coro:   Range10ClosureCapturingPointers,
+			coro:   Range10ClosureHeterogenousCapture,
 			yields: []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
 		},
 

compiler/function.go

@@ -109,21 +109,26 @@ func generateFunctypesInit(pkg *ssa.Package, fn *ssa.Function, init *ast.BlockSt
 		},
 	})
 
+	fmt.Printf("%v => %+v\n", fn, fn.AnonFuncs)
+
 	anonFuncs := slices.Clone(fn.AnonFuncs)
 	slices.SortFunc(anonFuncs, func(f1, f2 *ssa.Function) int {
 		return cmp.Compare(f1.Name(), f2.Name())
 	})
 
-	for index, anonFunc := range anonFuncs {
-		_, colored := colors[anonFunc]
-		if colored {
-			// Colored functions (those rewritten into coroutines) have a
-			// deferred anonymous function injected at the beginning to perform
-			// stack unwinding, which takes the ".func1" name.
-			index++
-		}
-		name = anonFuncLinkName(name, index)
-		generateFunctypesInit(pkg, anonFunc, init, name, colors)
+	index := 0
+	// Colored functions (those rewritten into coroutines) have a
+	// deferred anonymous function injected at the beginning to perform
+	// stack unwinding, which takes the ".func1" name.
+	_, colored := colors[fn]
+	if colored {
+		index++
+	}
+
+	for _, anonFunc := range anonFuncs {
+		index++
+		anonFuncName := anonFuncLinkName(name, index)
+		generateFunctypesInit(pkg, anonFunc, init, anonFuncName, colors)
 	}
 }
 
@@ -133,5 +138,5 @@ func generateFunctypesInit(pkg *ssa.Package, fn *ssa.Function, init *ast.BlockSt
 // The function works with multiple levels of nesting as each level adds another
 // ".func<index>" suffix, with the index being local to the parent scope.
 func anonFuncLinkName(base string, index int) string {
-	return fmt.Sprintf("%s.func%d", base, index+1)
+	return fmt.Sprintf("%s.func%d", base, index)
 }

compiler/testdata/coroutine.go

@@ -3,7 +3,6 @@
 package testdata
 
 import (
-	"strconv"
 	"time"
 	"unsafe"
 
@@ -315,16 +314,16 @@ func Range10ClosureCapturingPointers() {
 
 func Range10ClosureHeterogenousCapture() {
 	var (
-		a int8          = 0
-		b int16         = 1
-		c int32         = 2
-		d int64         = 3
-		e uint8         = 4
-		f uint16        = 5
-		g uint32        = 6
-		h uint64        = 7
-		i uintptr       = 8
-		j func() string = func() string { return "9" }
+		a int8    = 0
+		b int16   = 1
+		c int32   = 2
+		d int64   = 3
+		e uint8   = 4
+		f uint16  = 5
+		g uint32  = 6
+		h uint64  = 7
+		i uintptr = 8
+		j         = func() int { return int(i) + 1 }
 	)
 
 	n := 0
@@ -350,8 +349,7 @@ func Range10ClosureHeterogenousCapture() {
 		case 8:
 			v = int(i)
 		case 9:
-			s := j()
-			v, _ = strconv.Atoi(s)
+			v = j()
 		}
 		n++
 		coroutine.Yield[int, any](v)

internal/serde/reflect.go

@@ -117,6 +117,8 @@ func SerializeAny(s *Serializer, t reflect.Type, p unsafe.Pointer) {
 		SerializeUint16(s, *(*uint16)(p))
 	case reflect.Uint8:
 		SerializeUint8(s, *(*uint8)(p))
+	case reflect.Uintptr:
+		SerializeUintptr(s, *(*uintptr)(p))
 	case reflect.Float64:
 		SerializeFloat64(s, *(*float64)(p))
 	case reflect.Float32:
@@ -179,6 +181,8 @@ func DeserializeAny(d *Deserializer, t reflect.Type, p unsafe.Pointer) {
 		DeserializeUint16(d, (*uint16)(p))
 	case reflect.Uint8:
 		DeserializeUint8(d, (*uint8)(p))
+	case reflect.Uintptr:
+		DeserializeUintptr(d, (*uintptr)(p))
 	case reflect.Float64:
 		DeserializeFloat64(d, (*float64)(p))
 	case reflect.Float32:
@@ -648,6 +652,16 @@ func DeserializeUint8(d *Deserializer, x *uint8) {
 	d.b = d.b[1:]
 }
 
+func SerializeUintptr(s *Serializer, x uintptr) {
+	SerializeUint64(s, uint64(x))
+}
+
+func DeserializeUintptr(d *Deserializer, x *uintptr) {
+	u := uint64(0)
+	DeserializeUint64(d, &u)
+	*x = uintptr(u)
+}
+
 func SerializeFloat32(s *Serializer, x float32) {
 	SerializeUint32(s, math.Float32bits(x))
 }

internal/serde/serde.go

@@ -80,7 +80,7 @@ func (d *Deserializer) readPtr() (unsafe.Pointer, sID) {
 
 func (d *Deserializer) store(i sID, p unsafe.Pointer) {
 	if d.ptrs[i] != nil {
-		panic(fmt.Errorf("trying to overwirte known ID %d with %p", i, p))
+		panic(fmt.Errorf("trying to overwwrite known ID %d with %p", i, p))
 	}
 	d.ptrs[i] = p
 }