Use static memory locations for top-level captured variables AST-80

src/instrList.ml

@@ -46,6 +46,7 @@ let to_instr_list (is : t) : instr list =
 let to_nested_list d pos is =
   optimize (is Int32.(add d 1l) pos [])
 
+
 (* The concatenation operator *)
 let nop : t = fun _ _ rest -> rest
 let (^^) (is1 : t) (is2 : t) : t = fun d pos rest -> is1 d pos (is2 d pos rest)
@@ -111,3 +112,8 @@ let branch_to_ (p : depth) : t =
 
 let labeled_block_ (ty : block_type) depth (body : t) : t =
   block_ ty (remember_depth depth body)
+
+(* Intended to be used within assert *)
+
+let is_nop (is :t) =
+  is 0l Wasm.Source.no_region [] = []

test/compare-wat.sh

@@ -70,13 +70,13 @@ do
 
   rm -rf compare-out/$base.old
   mkdir compare-out/$base.old
-  old-asc/bin/asc --dfinity $file --map -o compare-out/$base.old/$base.wasm 2> compare-out/$base.old/$base.stderr
+  old-asc/bin/asc --dfinity $file -o compare-out/$base.old/$base.wasm 2> compare-out/$base.old/$base.stderr
   test ! -e compare-out/$base.old/$base.wasm ||
   $WASM2WAT compare-out/$base.old/$base.wasm >& compare-out/$base.old/$base.wat
 
   rm -rf compare-out/$base.new
   mkdir compare-out/$base.new
-  new-asc/bin/asc --dfinity $file --map -o compare-out/$base.new/$base.wasm 2> compare-out/$base.new/$base.stderr
+  new-asc/bin/asc --dfinity $file -o compare-out/$base.new/$base.wasm 2> compare-out/$base.new/$base.stderr
   test ! -e compare-out/$base.new/$base.wasm ||
   $WASM2WAT compare-out/$base.new/$base.wasm >& compare-out/$base.new/$base.wat
 

test/run-dfinity/counter-class.as

@@ -1,12 +1,12 @@
 actor class Counter(i : Int) {
-  private var c = i;
+  private var j = i;
 
   dec() {
-   showCounter(c);
-   c -= 1;
+   showCounter(j);
+   j -= 1;
   };
 
-  read() : async Int { c };
+  read() : async Int { j };
 };
 
 func showCounter(c : Int) {};

test/run-dfinity/counter.as

@@ -2,14 +2,24 @@ let a = actor {
   private var c = 1;
   inc() {
     c += 1;
-    printInt(c)
+    printInt c; print "\n";
   };
-  print () {
-    printInt(c)
+  printCounter () {
+    printInt c; print "\n";
   }
 };
 
 a.inc();
 a.inc();
 a.inc();
-a.print()
+a.printCounter();
+
+func test() {
+  var i : Int = 10;
+  while (i  > 0) {
+    a.inc();
+    i -= 1;
+  }
+};
+
+let _ = test();

test/run-dfinity/counter2.as

@@ -0,0 +1,14 @@
+actor {
+  private var c = 1;
+  inc() {
+    c += 1;
+    printInt c; print "\n";
+  };
+  printCounter () {
+    printInt c; print "\n";
+  }
+}
+//CALL inc
+//CALL inc
+//CALL inc
+//CALL printCounter

test/run-dfinity/ok/counter-class.wasm.stderr.ok

@@ -1,15 +1,15 @@
 non-closed actor: (ActorE
   anon-object-1.30
-  (VarD c (VarE i))
+  (VarD j (VarE i))
   (LetD
     (VarP dec)
     (FuncE
       dec
       (shared  0 -> 0)
       ()
       (BlockE
-        (LetD WildP (CallE ( 1 -> 0) (VarE showCounter) (VarE c)))
-        (AssignE (VarE c) (BinE Int (VarE c) SubOp (LitE (IntLit 1))))
+        (LetD WildP (CallE ( 1 -> 0) (VarE showCounter) (VarE j)))
+        (AssignE (VarE j) (BinE Int (VarE j) SubOp (LitE (IntLit 1))))
       )
     )
   )
@@ -39,7 +39,7 @@ non-closed actor: (ActorE
             ( 1 -> 0)
             (params $cont/0)
             ()
-            (CallE ( 1 -> 0) (VarE $cont/0) (VarE c))
+            (CallE ( 1 -> 0) (VarE $cont/0) (VarE j))
           )
           (FuncE
             $lambda

test/run-dfinity/ok/counter.dvm-run.ok

@@ -1 +1,14 @@
-2344
+2
+3
+4
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14

test/run-dfinity/ok/counter.run-ir.ok

@@ -1 +1,14 @@
-2344
+2
+3
+4
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14

test/run-dfinity/ok/counter.run-low.ok

@@ -1 +1,14 @@
-2344
+2
+3
+4
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14

test/run-dfinity/ok/counter.run.ok

@@ -1 +1,14 @@
-2344
+2
+3
+4
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14

test/run-dfinity/ok/counter2.dvm-run.ok

@@ -0,0 +1,8 @@
+DVM: Calling method inc
+2
+DVM: Calling method inc
+3
+DVM: Calling method inc
+4
+DVM: Calling method printCounter
+4

test/run/mutrec3.as

@@ -0,0 +1,35 @@
+// Like mutrec2, but now the functions capture static variables
+
+var step = 0;
+
+func even(n : Nat) : Bool {
+  if (n == 0) {
+    return true;
+  } else
+    return odd(n-step);
+  };
+
+func odd(n : Nat) : Bool {
+  if (n == 0) {
+    return false;
+  } else
+    return even(n-step);
+  };
+
+// There should be a bunch of calls to known functions here, but
+// no indirect calls
+// CHECK: func $start
+// CHECK: call $even
+// CHECK: call $even
+// CHECK: call $even
+// CHECK: call $even
+// CHECK: call $odd
+// CHECK: call $odd
+
+step := 1;
+assert(even(0));
+assert(even(2));
+assert(even(4));
+assert(even(6));
+assert(odd(5));
+assert(not odd(6));