fix(gnovm): revert "top sort var/const globals (#1854)" (#1956)

per discussion with @jaekwon; see
#1854 (comment)

gnovm/pkg/gnolang/nodes.go

@@ -158,23 +158,6 @@ type Attributes struct {
  data map[interface{}]interface{} // not persisted
 }
 
-func (attr *Attributes) Copy() Attributes {
- if attr == nil {
- return Attributes{}
- }
-
- data := make(map[interface{}]interface{})
- for k, v := range attr.data {
- data[k] = v
- }
-
- return Attributes{
- Line: attr.Line,
- Label: attr.Label,
- data: data,
- }
-}
-
 func (attr *Attributes) GetLine() int {
  return attr.Line
 }
@@ -1631,7 +1614,7 @@ func (sb *StaticBlock) GetPathForName(store Store, n Name) ValuePath {
  bp = bp.GetParentNode(store)
  gen++
  if 0xff < gen {
- panic("GetPathForName: value path depth overflow")
+ panic("value path depth overflow")
  }
  }
  }

gnovm/pkg/gnolang/preprocess.go

@@ -14,21 +14,11 @@ import (
 // Anything predefined or preprocessed here get skipped during the Preprocess
 // phase.
 func PredefineFileSet(store Store, pn *PackageNode, fset *FileSet) {
- for _, fn := range fset.Files {
- decls, err := sortValueDeps(fn.Decls)
- if err != nil {
- panic(err)
- }
-
- fn.Decls = decls
- }
-
  // First, initialize all file nodes and connect to package node.
  for _, fn := range fset.Files {
  SetNodeLocations(pn.PkgPath, string(fn.Name), fn)
  fn.InitStaticBlock(fn, pn)
  }
-
  // NOTE: much of what follows is duplicated for a single *FileNode
  // in the main Preprocess translation function. Keep synced.
 
@@ -40,22 +30,29 @@ func PredefineFileSet(store Store, pn *PackageNode, fset *FileSet) {
  d := fn.Decls[i]
  switch d.(type) {
  case *ImportDecl:
- if d.GetAttribute(ATTR_PREDEFINED) != true {
+ if d.GetAttribute(ATTR_PREDEFINED) == true {
+ // skip declarations already predefined
+ // (e.g. through recursion for a
+ // dependent)
+ } else {
  // recursively predefine dependencies.
  d2, _ := predefineNow(store, fn, d)
  fn.Decls[i] = d2
  }
  }
  }
  }
-
  // Predefine all type decls decls.
  for _, fn := range fset.Files {
  for i := 0; i < len(fn.Decls); i++ {
  d := fn.Decls[i]
  switch d.(type) {
  case *TypeDecl:
- if d.GetAttribute(ATTR_PREDEFINED) != true {
+ if d.GetAttribute(ATTR_PREDEFINED) == true {
+ // skip declarations already predefined
+ // (e.g. through recursion for a
+ // dependent)
+ } else {
  // recursively predefine dependencies.
  d2, _ := predefineNow(store, fn, d)
  fn.Decls[i] = d2
@@ -69,21 +66,27 @@ func PredefineFileSet(store Store, pn *PackageNode, fset *FileSet) {
  d := fn.Decls[i]
  switch d.(type) {
  case *FuncDecl:
- if d.GetAttribute(ATTR_PREDEFINED) != true {
+ if d.GetAttribute(ATTR_PREDEFINED) == true {
+ // skip declarations already predefined
+ // (e.g. through recursion for a
+ // dependent)
+ } else {
  // recursively predefine dependencies.
  d2, _ := predefineNow(store, fn, d)
  fn.Decls[i] = d2
  }
  }
  }
  }
-
  // Finally, predefine other decls and
  // preprocess ValueDecls..
  for _, fn := range fset.Files {
  for i := 0; i < len(fn.Decls); i++ {
  d := fn.Decls[i]
- if d.GetAttribute(ATTR_PREDEFINED) != true {
+ if d.GetAttribute(ATTR_PREDEFINED) == true {
+ // skip declarations already predefined (e.g.
+ // through recursion for a dependent)
+ } else {
  // recursively predefine dependencies.
  d2, _ := predefineNow(store, fn, d)
  fn.Decls[i] = d2