porffor 0.37.0 → 0.37.2

package/compiler/codegen.js

@@ -1691,12 +1691,7 @@ const setObjProp = (obj, prop, value) => {
   });
 };
 
-const createThisArg = (scope, decl, knownThis = undefined) => {
-  if (knownThis) {
-    // todo: check compliance
-    return knownThis;
-  }
-
+const createThisArg = (scope, decl) => {
   const name = mapName(decl.callee?.name);
   if (decl._new) {
     // if precompiling or builtin func, just make empty object
@@ -2258,8 +2253,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       let getCalleeObj = undefined;
       let initCalleeObj = undefined;
 
-      // hack: this should be more thorough, Function.bind, etc.
-      if (decl.callee.type == 'MemberExpression') {
+      // hack: this should be more thorough, Function.bind, etc
+      if (decl.callee.type == 'MemberExpression' && !decl._new) {
         const callee = localTmp(scope, '#indirect_callee_obj', Valtype.f64);
         initCalleeObj = [
           ...generate(scope, decl.callee.object),
@@ -2274,12 +2269,12 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ];
       }
 
-      let callee = decl.callee, callAsNew = decl._new, overrideThisWasm = decl._thisWasm;
+      let callee = decl.callee, callAsNew = decl._new;
       if (callee.type === 'Super') {
         // call super constructor with direct super() call
         callee = getObjProp(callee, 'constructor');
         callAsNew = true;
-        overrideThisWasm = [
+        knownThis = [
           ...generate(scope, { type: 'ThisExpression' }),
           ...getNodeType(scope, { type: 'ThisExpression' })
         ];
@@ -2289,7 +2284,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         [ Opcodes.local_get, funcLocal ],
         Opcodes.i32_from_u
       ], callAsNew);
-      const thisWasm = overrideThisWasm ?? createThisArg(scope, decl, knownThis);
+      const thisWasm = knownThis ?? createThisArg(scope, decl);
 
       const gen = argc => {
         const argsOut = [];
@@ -3834,7 +3829,7 @@ const generateFor = (scope, decl) => {
 
   out.push([ Opcodes.br, 1 ]);
   out.push([ Opcodes.end ], [ Opcodes.end ]);
-  depth.pop(); depth.pop();
+  depth.pop(); depth.pop(); depth.pop();
 
   return out;
 };
@@ -4266,6 +4261,7 @@ const generateForOf = (scope, decl) => {
   depth.pop();
   depth.pop();
   depth.pop();
+  depth.pop();
 
   return out;
 };
@@ -4385,6 +4381,7 @@ const generateForIn = (scope, decl) => {
   depth.pop();
   depth.pop();
   depth.pop();
+  depth.pop();
 
   return typeSwitch(scope, getNodeType(scope, decl.right), {
     // fast path for objects
@@ -4533,7 +4530,7 @@ const generateBreak = (scope, decl) => {
   })[type];
 
   return [
-    [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
+    [ Opcodes.br, ...unsignedLEB128(depth.length - target - offset) ]
   ];
 };
 
@@ -4554,7 +4551,7 @@ const generateContinue = (scope, decl) => {
   })[type];
 
   return [
-    [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
+    [ Opcodes.br, ...unsignedLEB128(depth.length - target - offset) ]
   ];
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.37.0+44ce75202",
+  "version": "0.37.2+c66ebc0c6",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.37.0+44ce75202';
+globalThis.version = '0.37.2+c66ebc0c6';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {