fix(gnolang): ensure complete Uverse initialization

gnovm/pkg/gnolang/gno_test.go

@@ -404,18 +404,6 @@ func BenchmarkBenchdata(b *testing.B) {
 				name += "_param:" + param
 			}
 			b.Run(name, func(b *testing.B) {
-				if strings.HasPrefix(name, "matrix.gno_param") {
-					// CGO_ENABLED=0 go test -bench . -benchmem ./... -short -run=^$ -cpu 1,2 -count=1 ./...
-					// That is not just exposing test and benchmark traces as output, but these benchmarks are failing
-					// making the output unparseable:
-					/*
-						BenchmarkBenchdata/matrix.gno_param:3           panic: runtime error: index out of range [31] with length 25 [recovered]
-						panic: runtime error: index out of range [31] with length 25:
-						...
-					*/
-					b.Skip("it panics causing an error when parsing benchmark results")
-				}
-
 				// Gen template with N and param.
 				var buf bytes.Buffer
 				require.NoError(b, tpl.Execute(&buf, bdataParams{

gnovm/pkg/gnolang/preprocess.go

@@ -739,12 +739,8 @@
 			// TRANS_BLOCK -----------------------
 			case *FuncDecl:
 				// retrieve cached function type.
+				// the type and receiver are already set in predefineNow.
 				ft := getType(&n.Type).(*FuncType)
-				if n.IsMethod {
-					// recv/type set @ predefineNow().
-				} else {
-					// type set @ predefineNow().
-				}
 
 				// push func body block.
 				pushInitBlock(n, &last, &stack)
@@ -2531,8 +2527,8 @@
 		defer doRecover(stack, n)
 
 		if debug {
 			debug.Printf("findGotoLoopDefines %s (%v) stage:%v\n", n.String(), reflect.TypeOf(n), stage)
 		}
 
 		switch stage {
 		// ----------------------------------------
@@ -2569,8 +2565,8 @@
 							case *FuncLitExpr:
 								// inner funcs.
 								return n, TRANS_SKIP
 							case *FuncDecl:
 								panic("unexpected inner func decl")
 							case *NameExpr:
 								if n.Type == NameExprTypeDefine {
 									n.Type = NameExprTypeHeapDefine
@@ -2639,12 +2635,12 @@
 										// inner funcs.
 										return n, TRANS_SKIP
 									}
 									return n, TRANS_CONTINUE
 								case *FuncDecl:
 									if len(ns) > 0 {
 										panic("unexpected inner func decl")
 									}
 									return n, TRANS_CONTINUE
 								// Otherwise mark stmt as gotoloop.
 								case Stmt:
 									// we're done if we
@@ -2696,8 +2692,8 @@
 		defer doRecover(stack, n)
 
 		if debug {
 			debug.Printf("findLoopUses1 %s (%v) stage:%v\n", n.String(), reflect.TypeOf(n), stage)
 		}
 
 		switch stage {
 		// ----------------------------------------
@@ -2752,8 +2748,8 @@
 					// on NameExpr can know that this was loop defined
 					// on this block.
 					setAttrHeapDefine(last, n.Name)
 				case NameExprTypeHeapUse, NameExprTypeHeapClosure:
 					panic("unexpected node type")
 				}
 			}
 			return n, TRANS_CONTINUE
@@ -2778,7 +2774,7 @@
 
 func assertNotHasName(names []Name, name Name) {
 	if slices.Contains(names, name) {
 		panic(fmt.Sprintf("name: %s already contained in names: %v", name, names))
 	}
 }
 
@@ -2808,7 +2804,7 @@
 			var ok bool
 			idx, ok = fle.GetLocalIndex("~" + name)
 			if !ok {
 				panic("~name not added to fle atomically")
 			}
 			return // already exists
 		}
@@ -2817,7 +2813,7 @@
 	// define ~name to fle.
 	_, ok := fle.GetLocalIndex("~" + name)
 	if ok {
 		panic("~name already defined in fle")
 	}
 
 	tv := dbn.GetValueRef(nil, name, true)
@@ -2841,7 +2837,7 @@
 		}
 	}
 
 	panic("should not happen, idx not found")
 }
 
 // finds the first FuncLitExpr in the stack at or after stop.
@@ -2872,7 +2868,7 @@
 			}
 		}
 	}
 	panic("stop not found in stack")
 }
 
 // Convert non-loop uses of loop names to NameExprTypeHeapUse.
@@ -2889,8 +2885,8 @@
 		defer doRecover(stack, n)
 
 		if debug {
 			debug.Printf("findLoopUses2 %s (%v) stage:%v\n", n.String(), reflect.TypeOf(n), stage)
 		}
 
 		switch stage {
 		// ----------------------------------------
@@ -2958,7 +2954,7 @@
 				lds, _ := n.GetAttribute(ATTR_LOOP_DEFINES).([]Name)
 				lus, _ := n.GetAttribute(ATTR_LOOP_USES).([]Name)
 				if len(lds) < len(lus) {
 					panic("defines should be a superset of used-defines")
 				}
 				// no need anymore
 				n.DelAttribute(ATTR_LOOP_USES)
@@ -3005,7 +3001,7 @@
 	*last = bn
 	*stack = append(*stack, bn)
 	if len(*stack) >= math.MaxUint8 {
 		panic("block node depth reached maximum MaxUint8")
 	}
 }
 
@@ -3015,7 +3011,7 @@
 func pushInitBlockAndCopy(bn BlockNode, last *BlockNode, stack *[]BlockNode) {
 	if _, ok := bn.(*IfCaseStmt); !ok {
 		if _, ok := bn.(*SwitchClauseStmt); !ok {
 			panic("should not happen")
 		}
 	}
 	orig := *last
@@ -3773,7 +3769,7 @@
 				panic("cannot elide unknown composite type")
 			}
 			ct = t
 			cx.Type = constType(cx, t)
 		} else {
 			un = findUndefined(store, last, cx.Type)
 			if un != "" {

gnovm/pkg/gnolang/uverse.go

@@ -61,26 +61,55 @@
 var (
 	uverseNode  *PackageNode
 	uverseValue *PackageValue
+	uverseInit  = uverseUninitialized
 )
 
+const (
+	uverseUninitialized = iota
+	uverseInitializing
+	uverseInitialized
+)
+
+func init() {
+	// Call Uverse() so we initialize the Uverse node ahead of any calls to the package.
+	Uverse()
+}
+
 const uversePkgPath = ".uverse"
 
-// Always returns a new copy from the latest state of source.
+// UverseNode returns the uverse PackageValue.
+// If called while initializing the UverseNode itself, it will return an empty
+// PackageValue.
 func Uverse() *PackageValue {
-	if uverseValue == nil {
-		pn := UverseNode()
-		uverseValue = pn.NewPackage()
+	switch uverseInit {
+	case uverseUninitialized:
+		uverseInit = uverseInitializing
+		makeUverseNode()
+		uverseInit = uverseInitialized
+	case uverseInitializing:
+		return &PackageValue{}
 	}
+
 	return uverseValue
 }
 
-// Always returns the same instance with possibly differing completeness.
+// UverseNode returns the uverse PackageNode.
+// If called while initializing the UverseNode itself, it will return an empty
+// PackageNode.
 func UverseNode() *PackageNode {
-	// Global is singleton.
-	if uverseNode != nil {
-		return uverseNode
+	switch uverseInit {
+	case uverseUninitialized:
+		uverseInit = uverseInitializing
+		makeUverseNode()
+		uverseInit = uverseInitialized
+	case uverseInitializing:
+		return &PackageNode{}
 	}
 
+	return uverseNode
+}
+
+func makeUverseNode() {
 	// NOTE: uverse node is hidden, thus the leading dot in pkgPath=".uverse".
 	uverseNode = NewPackageNode("uverse", uversePkgPath, nil)
 
@@ -1017,7 +1046,7 @@
 			m.Exceptions = nil
 		},
 	)
-	return uverseNode
+	uverseValue = uverseNode.NewPackage()
 }
 
 func copyDataToList(dst []TypedValue, data []byte, et Type) {