fix(gnovm): follow up works on loop scope(#2429) #2440

ltzmaxwell · 2024-06-25T18:49:09Z

Complete the remaining work from feat(gnovm): handle loop variables #2429.
Go 1.22 loopvar are not fully supported. (should be supported in next Version).
e.g.
this is supported,

        for i, _ := range s {
		s1 = append(s1, &i)
	}

this is not supported:

        for i := 0; i < 3; i++ {
		fs = append(fs, func() { println(i) })
	}

codecov · 2024-06-25T19:01:24Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.79%. Comparing base (e3ad91f) to head (d24a3d5).

Additional details and impacted files

@@                 Coverage Diff                 @@
##           dev/jae/loopescape    #2440   +/-   ##
===================================================
  Coverage               54.79%   54.79%           
===================================================
  Files                     583      583           
  Lines                   78965    78929   -36     
===================================================
- Hits                    43269    43250   -19     
+ Misses                  32464    32450   -14     
+ Partials                 3232     3229    -3

Flag	Coverage Δ
contribs/gnodev	`23.81% <ø> (ø)`
contribs/gnofaucet	`14.46% <ø> (ø)`
contribs/gnokeykc	`0.00% <ø> (ø)`
contribs/gnomd	`0.00% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…well/jae/loopscope

gnovm/pkg/gnolang/preprocess.go

…well/jae/loopscope

gnovm/pkg/gnolang/preprocess.go

gno.land/pkg/sdk/vm/gas_test.go

ltzmaxwell · 2024-07-20T15:16:04Z

gnovm/pkg/gnolang/preprocess.go

-				for _, rte := range n.Type.Results {
-					if rte.Name != "" {
-						n.Predefine(false, rte.Name)
+				for i, rte := range n.Type.Results {
+					if rte.Name == "" {
+						rn := fmt.Sprintf(".res_%d", i)
+						rte.Name = Name(rn)
 					}
+					n.Predefine(false, rte.Name)


define hidden .res_x in initStaticBlocks to preserve the original init order: [param_0, param_1...param_n, res_0, res_1...res_n, var_0, var_1...var_n] . the order is changed by he initStaticBlocks logic to be [param_0, param_1...param_n , var_0, var_1...var_n, res_0, res_1...res_n].

This order will impact defer logic.

Another workaround is to modify the runtime returnToBlock and returnFromBlock logic.

ltzmaxwell · 2024-07-21T04:15:13Z

examples/gno.land/p/demo/avl/z_0_filetest.gno

 //                 },
 //                 "FileName": "main.gno",
 //                 "IsMethod": false,
-//                 "Name": "init.0",
+//                 "Name": "init.1",


is this introduced by the initStaticBlocks?

ltzmaxwell · 2024-07-21T04:41:01Z

examples/gno.land/p/demo/avl/z_0_filetest.gno

+//                 "@type": "/gno.PointerType",
+//                 "Elt": {
+//                     "@type": "/gno.RefType",
+//                     "ID": "gno.land/p/demo/avl.Node"
+//                 }
+//             },
+//             "V": {
+//                 "@type": "/gno.PointerValue",
+//                 "Base": {
+//                     "@type": "/gno.RefValue",
+//                     "Hash": "e925bb6bf884ece9620dd27f831dc510b5bc0e55",
+//                     "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6"
+//                 },
+//                 "Index": "0",
+//                 "TV": null
+//             }
+//         },
+//         {
+//             "T": {
 //                 "@type": "/gno.FuncType",


package var is inited firstly in initStaticBlocks, the the order changes.

ltzmaxwell · 2024-07-21T10:31:29Z

gnovm/pkg/gnolang/preprocess.go

@@ -4311,7 +4366,7 @@ func setNodeLocations(pkgPath string, fileName string, n Node) {
 // XXX check node lines, uniqueness of locations,
 // and also check location pkgpath and filename.
 func checkNodeLinesLocations(pkgPath string, fileName string, n Node) {
-	// XXX
+	// TODO: XXX


should be in another PR.

ltzmaxwell · 2024-07-21T11:21:36Z

gnovm/pkg/gnolang/preprocess.go

-				n.SetAttribute(ATTR_LOOP_DEFINES, lus)
-				// XXX implement delete.
-				// n.DelAttribute(ATTR_LOOP_USES)
+				// no need anymore
+				n.DelAttribute(ATTR_LOOP_USES)
+				n.DelAttribute(ATTR_LOOP_DEFINES)
 			}


no need anymore?

ltzmaxwell · 2024-07-22T10:23:02Z

gnovm/pkg/gnolang/preprocess.go

-						last.Predefine(false, n.Key.(*NameExpr).Name)
+						nx := n.Key.(*NameExpr)
+						if nx.Name != blankIdentifier {
+							nx.Type = NameExprTypeDefine
+							last.Predefine(false, nx.Name)
+						}
 					}


maybe we should not support loopvar with range either, to make it consistent with for loop.

yes. but TypeDefine is correct here as it is a define.

jaekwon · 2024-07-25T20:13:32Z

gnovm/pkg/gnolang/preprocess.go

@@ -2549,28 +2569,43 @@ func addHeapCapture(dbn BlockNode, fle *FuncLitExpr, name Name) uint16 {
 	ne := NameExpr{
 		Path: vp,
 		Name: name,
-		Type: NameExprTypeHeapClosure,
+		Type: NameExprTypeHeapClosure, // XXX, this is actually not used, remove?


right it's not actually used, but let's leave it because it is a special kind of use of a name, to copy it to func value captures. It just means it was captured by a closure, for now.

jaekwon · 2024-07-25T20:24:13Z

gnovm/pkg/gnolang/op_call.go

+
+	// Copy *FuncValue.Captures into block
+	// NOTE: addHeapCapture in preprocess ensures order.
+	// XXX, actually copy


I think we can remove the XXX right?

jaekwon · 2024-07-25T20:25:20Z

Brilliant.

ltzmaxwell requested review from jaekwon, moul, piux2, deelawn, thehowl and mvertes as code owners June 25, 2024 18:49

github-actions bot assigned ltzmaxwell Jun 25, 2024

github-actions bot added the 📦 🤖 gnovm Issues or PRs gnovm related label Jun 25, 2024

jaekwon force-pushed the init_static branch from 8e9c9a1 to 31bbcb6 Compare June 26, 2024 01:11

add test

c6411d6

ltzmaxwell force-pushed the dev/maxwell/dev/jae/loopscope branch from 241ecc9 to c6411d6 Compare July 1, 2024 09:47

ltzmaxwell added 2 commits July 1, 2024 20:52

alloc heapItem for ref

99b2a1e

Merge remote-tracking branch 'upstream/dev/jae/loopescape' into 2/max…

e7761ea

…well/jae/loopscope

ltzmaxwell changed the base branch from init_static to dev/jae/loopescape July 1, 2024 12:53

ltzmaxwell added 10 commits July 1, 2024 21:31

Merge remote-tracking branch 'upstream/dev/jae/loopescape' into 2/max…

26580ab

…well/jae/loopscope

test ref

0d2bbb1

Merge remote-tracking branch 'upstream/dev/jae/loopescape' into 2/max…

e7b4601

…well/jae/loopscope

add forloop tests

59ace4e

revert

348b3f6

fixup

256c289

clean

c2f0d56

fixup

9b50f5a

fixup

bc93048

fixup

17e51d1

jaekwon reviewed Jul 2, 2024

View reviewed changes

gnovm/pkg/gnolang/preprocess.go Outdated Show resolved Hide resolved

ltzmaxwell added 4 commits July 2, 2024 22:25

fixup

bb83812

fixup

e6ec47e

Merge remote-tracking branch 'upstream/dev/jae/loopescape' into 2/max…

2332e31

…well/jae/loopscope

Merge remote-tracking branch 'upstream/dev/jae/loopescape' into 2/max…

e0bd54f

…well/jae/loopscope

ltzmaxwell requested a review from a team as a code owner July 19, 2024 14:47

github-actions bot added the 🧾 package/realm Tag used for new Realms or Packages. label Jul 19, 2024

correct init order for func with unnamed return, all tests passed

0e49090

ltzmaxwell requested a review from gfanton as a code owner July 20, 2024 02:13

github-actions bot added the 📦 ⛰️ gno.land Issues or PRs gno.land package related label Jul 20, 2024

ltzmaxwell commented Jul 20, 2024

View reviewed changes

gnovm/pkg/gnolang/preprocess.go Outdated Show resolved Hide resolved

ltzmaxwell commented Jul 20, 2024

View reviewed changes

gno.land/pkg/sdk/vm/gas_test.go Outdated Show resolved Hide resolved

fixup

1d629f7

ltzmaxwell commented Jul 20, 2024

View reviewed changes

ltzmaxwell commented Jul 21, 2024

View reviewed changes

ltzmaxwell added 3 commits July 21, 2024 18:14

tune

7e83eb1

add preprocessed infos

b24a779

add TODO

f253108

ltzmaxwell commented Jul 21, 2024

View reviewed changes

delete attr

20e64f9

ltzmaxwell commented Jul 21, 2024

View reviewed changes

ltzmaxwell added 3 commits July 21, 2024 19:58

fixup

faecc70

fixup

921b293

fixup

fc9eaa1

Kouteki mentioned this pull request Jul 22, 2024

Minutes: Core Staff Weekly Syncs [every Monday] gnolang/meetings#36

Open

ltzmaxwell commented Jul 22, 2024

View reviewed changes

ltzmaxwell requested a review from jaekwon July 22, 2024 15:24

ltzmaxwell mentioned this pull request Jul 23, 2024

fix: re-create blocks on for loop iterations #1768

Closed

jaekwon reviewed Jul 25, 2024

View reviewed changes

Merge branch 'dev/jae/loopescape' into dev/maxwell/dev/jae/loopscope

d24a3d5

jaekwon merged commit c9eeed2 into gnolang:dev/jae/loopescape Jul 25, 2024
51 of 52 checks passed

michelleellen mentioned this pull request Jul 31, 2024

Minutes: Public Dev Calls [every Wednesday] gnolang/meetings#37

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(gnovm): follow up works on loop scope(#2429) #2440

fix(gnovm): follow up works on loop scope(#2429) #2440

ltzmaxwell commented Jun 25, 2024 •

edited

Loading

codecov bot commented Jun 25, 2024 •

edited

Loading

ltzmaxwell Jul 20, 2024 •

edited

Loading

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 21, 2024

ltzmaxwell Jul 22, 2024

jaekwon Jul 25, 2024

jaekwon Jul 25, 2024

jaekwon Jul 25, 2024 •

edited

Loading

jaekwon commented Jul 25, 2024

fix(gnovm): follow up works on loop scope(#2429) #2440

fix(gnovm): follow up works on loop scope(#2429) #2440

Conversation

ltzmaxwell commented Jun 25, 2024 • edited Loading

codecov bot commented Jun 25, 2024 • edited Loading

Codecov Report

ltzmaxwell Jul 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jaekwon Jul 25, 2024 • edited Loading

Choose a reason for hiding this comment

jaekwon commented Jul 25, 2024

ltzmaxwell commented Jun 25, 2024 •

edited

Loading

codecov bot commented Jun 25, 2024 •

edited

Loading

ltzmaxwell Jul 20, 2024 •

edited

Loading

jaekwon Jul 25, 2024 •

edited

Loading