fix after rebase

Author: ltzmaxwell

gnovm/pkg/gnolang/alloc.go

@@ -2,7 +2,6 @@ package gnolang
 
 import (
 	"fmt"
-	"reflect"
 )
 
 // Keeps track of in-memory allocations.
@@ -30,9 +29,6 @@ const (
 	_allocStructValue      = 160
 	_allocArrayValue       = 184
 	_allocSliceValue       = 40
-	_allocMapValue         = 144
-	_allocBoundMethodValue = 176
-	_allocBlock            = 464
 	_allocFuncValue        = 196
 	_allocMapValue         = 152
 	_allocBoundMethodValue = 184
@@ -396,10 +392,6 @@ func (sv StringValue) GetShallowSize() int64 {
 	return allocString + allocStringByte*int64(len(sv))
 }
 
-func (nv *NativeValue) GetShallowSize() int64 {
-	return allocNative
-}
-
 func (bv BigintValue) GetShallowSize() int64 {
 	return allocBigint
 }

gnovm/pkg/gnolang/garbage_collector.go

@@ -271,10 +271,6 @@ func (dbv DataByteValue) VisitAssociated(vis Visitor) (stop bool) {
 	return false
 }
 
-func (nv *NativeValue) VisitAssociated(vis Visitor) (stop bool) {
-	return false
-}
-
 func (rv RefValue) VisitAssociated(vis Visitor) (stop bool) {
 	return false
 }

gnovm/pkg/gnolang/nodes.go

@@ -2422,8 +2422,10 @@ func validatePkgName(name string) error {
 
 // The distinction is used for validation to work
 // both before and after preprocessing.
-const missingResultNamePrefix = ".res."    // if there was no name
-const underscoreResultNamePrefix = ".res_" // if was underscore
+const (
+	missingResultNamePrefix    = ".res." // if there was no name
+	underscoreResultNamePrefix = ".res_" // if was underscore
+)
 
 func isUnnamedResult(name string) bool {
 	return isMissingResult(name) || isUnderscoreResult(name)

gnovm/pkg/gnolang/preprocess.go

@@ -451,7 +451,7 @@ func Preprocess(store Store, ctx BlockNode, n Node) Node {
 	// XXX well the following may be isn't idempotent,
 	// XXX so it is currently strange.
 	if bn, ok := n.(BlockNode); ok {
-		//findGotoLoopDefines(ctx, bn)
+		// findGotoLoopDefines(ctx, bn)
 		findHeapDefinesByUse(ctx, bn)
 		findHeapUsesDemoteDefines(ctx, bn)
 		findPackageSelectors(bn)
@@ -2893,7 +2893,7 @@ func addHeapCapture(dbn BlockNode, fle *FuncLitExpr, depth int, nx *NameExpr) (i
 	// vp := fle.GetPathForName(nil, name)
 	vp := nx.Path
 	vp.SetDepth(vp.Depth - uint8(depth))
-	//vp.SetDepth(vp.Depth - 1) // minus 1 for fle itself.
+	// vp.SetDepth(vp.Depth - 1) // minus 1 for fle itself.
 	ne := NameExpr{
 		Path: vp,
 		Name: name,

gnovm/pkg/gnolang/realm.go

@@ -558,7 +558,7 @@ func (rlm *Realm) processNewEscapedMarks(store Store, start int) int {
 	// (and never can be unescaped,)
 	// except for new-reals that get demoted
 	// because ref-count isn't >= 2.
-	//for _, eo := range rlm.newEscaped[start:] {
+	// for _, eo := range rlm.newEscaped[start:] {
 	for i := 0; i < len(rlm.newEscaped[start:]); i++ { // may expand.
 		eo := rlm.newEscaped[i]
 		if debug {

gnovm/pkg/gnolang/string_methods.go

@@ -16,4 +16,4 @@ func main() {
 }
 
 // Output:
-// MemStats:  Allocator{maxBytes:100000000, bytes:4862}
+// MemStats:  Allocator{maxBytes:100000000, bytes:5030}

gnovm/stdlibs/generated.go

@@ -21,4 +21,4 @@ func main() {
 }
 
 // Output:
-// MemStats:  Allocator{maxBytes:100000000, bytes:5904}
+// MemStats:  Allocator{maxBytes:100000000, bytes:6072}

gnovm/tests/files/alloc_0.gno

@@ -11,4 +11,4 @@ func main() {
 }
 
 // Output:
-// MemStats after GC:  Allocator{maxBytes:110000000, bytes:4376}
+// MemStats after GC:  Allocator{maxBytes:110000000, bytes:4472}

gnovm/tests/files/alloc_1.gno

@@ -22,5 +22,5 @@ func main() {
 }
 
 // Output:
-// memstats in main after first GC:  Allocator{maxBytes:50000, bytes:12389}
-// memstats in main after second GC:  Allocator{maxBytes:50000, bytes:5309}
+// memstats in main after first GC:  Allocator{maxBytes:50000, bytes:12653}
+// memstats in main after second GC:  Allocator{maxBytes:50000, bytes:5381}

gnovm/tests/files/alloc_3.gno

@@ -19,4 +19,4 @@ func main() {
 }
 
 // Output:
-// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:4376}
+// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:4472}

gnovm/tests/files/alloc_4.gno

@@ -13,4 +13,4 @@ func main() {
 }
 
 // Output:
-// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:4604}
+// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:4700}

gnovm/tests/files/alloc_5.gno

@@ -15,4 +15,4 @@ func main() {
 }
 
 // Output:
-// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:5116}
+// memstats in main after GC:  Allocator{maxBytes:100000000, bytes:5212}

gnovm/tests/files/alloc_6.gno

@@ -13,4 +13,4 @@ func main() {
 }
 
 // Output:
-// MemStats:  Allocator{maxBytes:100000000, bytes:4496}
+// MemStats:  Allocator{maxBytes:100000000, bytes:4664}