defer varg

gnovm/pkg/gnolang/alloc.go

@@ -128,14 +128,16 @@ func (alloc *Allocator) GC() {
 		}
 		// defer func
 		for _, dfr := range fr.Defers {
-			debug2.Println2("has defer")
 			fv := dfr.Func
 			ft := fv.GetType(alloc.m.Store)
-			numParams := len(ft.Params)
-			numArgs := len(dfr.Args)
-			nvar := numArgs - (numParams - 1)
-			throwaway.AllocateSlice()
-			throwaway.AllocateListArray(int64(nvar))
+			if ft.HasVarg() {
+				debug2.Println2("has defer, has varg")
+				numParams := len(ft.Params)
+				numArgs := len(dfr.Args)
+				nvar := numArgs - (numParams - 1)
+				throwaway.AllocateSlice()
+				throwaway.AllocateListArray(int64(nvar))
+			}
 		}
 	}
 

gnovm/tests/files/alloc1.gno

@@ -12,6 +12,17 @@ var m = map[string]int{"a": 1}
 
 type Foo struct{ name string }
 
+func xyz(args ...int) {
+	runtime.GC() // in this case, frame contains this one and main.
+}
+
+func xyz2() {
+	defer func(args ...int) {
+		//
+	}()
+	runtime.GC() // in this case, frame contains this one and main.
+}
+
 // after new block: 3483
 func bar() {
 	f := &Foo{"foo"} // + field 40 + struct 184 + pointer 24 + heapItem 72 + NewType: *main.Foo 232 = 4305
@@ -36,12 +47,14 @@ func main() {
 	}
 	f()
 	runtime.GC()
+	xyz(1, 2, 3)
+	xyz2()
 }
 
 // Output:
 // MemStats 1:  Allocator{maxBytes:10000000000, bytes:1944}
 // &(struct{("foo" string)} main.Foo)
 // MemStats 2:  Allocator{maxBytes:10000000000, bytes:6019}
 // MemStats before GC:  Allocator{maxBytes:10000000000, bytes:7518}
-// MemStats after GC:  Allocator{maxBytes:10000000000, bytes:2901}
+// MemStats after GC:  Allocator{maxBytes:10000000000, bytes:2981}
 // func lit