x

goplus · Dec 21, 2024 · 5227258 · 5227258
1 parent 5baa65d
commit 5227258
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/ssa/abitype.go b/ssa/abitype.go
@@ -83,14 +83,18 @@ func (b Builder) abiTypeOf(t types.Type) func() Expr {
 
 func (b Builder) abiTupleOf(t *types.Tuple) func() Expr {
 	n := t.Len()
-	tuple := make([]Expr, n)
+	tuple := make([]func() Expr, n)
 	for i := 0; i < n; i++ {
-		tuple[i] = b.abiType(t.At(i).Type())
+		tuple[i] = b.abiTypeOf(t.At(i).Type())
 	}
 	return func() Expr {
 		prog := b.Prog
 		tSlice := prog.Slice(prog.AbiTypePtr())
-		return b.SliceLit(tSlice, tuple...)
+		elts := make([]Expr, n)
+		for i, fn := range tuple {
+			elts[i] = fn()
+		}
+		return b.SliceLit(tSlice, elts...)
 	}
 }