fix assertion bug in injectClosedLocals

Author: DuncanUszkay1

src/compiler.ts

@@ -6043,7 +6043,7 @@ export class Compiler extends DiagnosticEmitter {
     switch (target.kind) {
       case ElementKind.LOCAL: {
         let local = <Local>target;
-        if (local.closureContextOffset >= 0) {
+        if (local.closureContextOffset > 0) {
           // TODO: ability to update closed over locals
           this.error(
             DiagnosticCode.Not_implemented,
@@ -6439,12 +6439,13 @@ export class Compiler extends DiagnosticEmitter {
     for (let i = 0, k = _values.length; i < k; ++i) {
       let local = unchecked(_values[i]);
       let nativeType = local.type.toNativeType();
+      assert(local.closureContextOffset > 0);
       exprs[i] = module.store(
         local.type.byteSize,
         module.local_get(closureContextLocal.index, this.options.nativeSizeType),
         module.local_get(local.index, nativeType),
         nativeType,
-        assert(local.closureContextOffset >= 0)
+        local.closureContextOffset
       );
     }
     return module.block(null, exprs);
@@ -8454,7 +8455,7 @@ export class Compiler extends DiagnosticEmitter {
         let localType = local.type;
         assert(localType != Type.void);
         var localClosureContextOffset = local.closureContextOffset;
-        if (localClosureContextOffset >= 0) {
+        if (localClosureContextOffset > 0) {
           let contextLocal = assert(flow.lookupLocal(CommonNames.this_));
 
           // TODO: replace this with a class field access, once we are able to construct the class before

src/program.ts

@@ -3277,7 +3277,7 @@ export class Local extends VariableLikeElement {
     /** Declaration reference. */
     declaration: VariableLikeDeclarationStatement = parent.program.makeNativeVariableDeclaration(name),
     /** Offset of this variable within closure context, if it's value is held there */
-    public closureContextOffset: usize = -1,
+    public closureContextOffset: usize = 0,
   ) {
     super(
       ElementKind.LOCAL,

tests/compiler/closure.optimized.wat

@@ -1203,13 +1203,13 @@
   i32.store
   local.get $0
   i32.const 11
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 4
-  i32.store offset=1
+  i32.store offset=8
   local.get $0
   i32.const 7
-  i32.store offset=1
+  i32.store offset=12
   local.get $0
   i32.const 4
   i32.shr_s
@@ -1242,10 +1242,10 @@
   i32.store
   local.get $0
   i32.const 1
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 7
-  i32.store offset=1
+  i32.store offset=8
   local.get $0
   local.get $1
   local.get $0
@@ -1284,7 +1284,7 @@
   i32.store
   local.get $0
   i32.const 1
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 4
   i32.shr_s
@@ -1337,7 +1337,7 @@
   i32.store
   local.get $0
   i32.const 2
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 4
   i32.shr_s
@@ -1379,7 +1379,7 @@
   i32.store
   local.get $0
   i32.const 0
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 4
   i32.shr_s
@@ -1421,7 +1421,7 @@
   i32.store
   local.get $0
   i32.const 0
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 4
   i32.shr_s
@@ -1518,13 +1518,13 @@
   i32.store
   local.get $0
   i32.const 1
-  i32.store offset=1
+  i32.store offset=4
   local.get $0
   i32.const 1
-  i32.store offset=1
+  i32.store offset=8
   local.get $0
   i32.const 1
-  i32.store offset=1
+  i32.store offset=12
   local.get $0
   i32.const 4
   i32.shr_s

tests/compiler/closure.untouched.wat

@@ -1561,7 +1561,7 @@
   local.set $3
   local.get $3
   local.get $1
-  i32.store offset=1
+  i32.store offset=4
   local.get $3
   i32.const 4
   i32.shr_s
@@ -1612,7 +1612,7 @@
   local.set $2
   local.get $2
   local.get $0
-  i32.store offset=1
+  i32.store offset=4
   local.get $2
   i32.const 4
   i32.shr_s
@@ -1663,7 +1663,7 @@
   local.set $2
   local.get $2
   local.get $0
-  i32.store offset=1
+  i32.store offset=4
   local.get $2
   i32.const 4
   i32.shr_s
@@ -1755,13 +1755,13 @@
   local.set $8
   local.get $8
   local.get $2
-  i32.store offset=1
+  i32.store offset=4
   local.get $8
   local.get $3
-  i32.store offset=1
+  i32.store offset=8
   local.get $8
   local.get $1
-  i32.store offset=1
+  i32.store offset=12
   local.get $8
   i32.const 4
   i32.shr_s
@@ -1887,10 +1887,10 @@
   local.set $4
   local.get $4
   local.get $0
-  i32.store offset=1
+  i32.store offset=4
   local.get $4
   local.get $1
-  i32.store offset=1
+  i32.store offset=8
   local.get $4
   local.get $2
   i32.const 1
@@ -1944,7 +1944,7 @@
   local.set $3
   local.get $3
   local.get $0
-  i32.store offset=1
+  i32.store offset=4
   local.get $3
   i32.const 4
   i32.shr_s
@@ -2091,13 +2091,13 @@
   local.set $4
   local.get $4
   local.get $0
-  i32.store offset=1
+  i32.store offset=4
   local.get $4
   local.get $1
-  i32.store offset=1
+  i32.store offset=8
   local.get $4
   local.get $2
-  i32.store offset=1
+  i32.store offset=12
   local.get $4
   i32.const 4
   i32.shr_s