porffor 0.50.9 → 0.50.11

package/compiler/codegen.js

@@ -48,14 +48,16 @@ const cacheAst = (decl, wasm) => {
 };
 
 let indirectFuncs = [];
+let doNotMarkFuncRef = false;
 const funcRef = func => {
-  func.generate?.();
-  func.referenced = true;
+  if (!doNotMarkFuncRef) func.referenced = true;
 
   if (globalThis.precompile) return [
     [ Opcodes.const, 'funcref', func.name ]
   ];
 
+  func.generate?.();
+
   const wrapperArgc = Prefs.indirectWrapperArgc ?? 10;
   if (!func.wrapperFunc) {
     const locals = {}, params = [];
@@ -1786,15 +1788,11 @@ const disposeLeftover = wasm => {
 };
 
 const generateExp = (scope, decl) => {
-  const expression = decl.expression;
-
-  if (expression.type === 'Literal' && typeof expression.value === 'string') {
-    if (expression.value === 'use strict') {
-      scope.strict = true;
-    }
+  if (decl.directive === 'use strict') {
+    scope.strict = true;
   }
 
-  const out = generate(scope, expression, undefined, undefined, !scope.inEval);
+  const out = generate(scope, decl.expression, undefined, undefined, !scope.inEval);
   disposeLeftover(out);
 
   return out;
@@ -3727,6 +3725,9 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     const useCoctc = Prefs.coctc && !decl.left.computed && !decl.left.optional && !['prototype', 'size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength', 'length', '__proto__'].includes(decl.left.property.name) && coctcOffset(decl.left.property.name) > 0;
     if (useCoctc) valueUnused = false;
 
+    // opt: do not mark prototype funcs as referenced to optimize this in them
+    if (object?.property?.name === 'prototype' && isFuncType(decl.right.type)) decl.right._doNotMarkFuncRef = true;
+
     const out = [
       ...generate(scope, object),
       [ Opcodes.local_set, objectTmp ],
@@ -5645,9 +5646,13 @@ const generateMember = (scope, decl, _global, _name) => {
 
   let chainCount = scope.chainMembers != null ? ++scope.chainMembers : 0;
 
+  doNotMarkFuncRef = true;
+
   // generate now so type is gotten correctly later (it gets cached)
   generate(scope, object);
 
+  doNotMarkFuncRef = false;
+
   // hack: .length
   if (decl.property.name === 'length') {
     // todo: support optional
@@ -6385,6 +6390,8 @@ const funcByIndex = idx => {
 const funcByName = name => funcByIndex(funcIndex[name]);
 
 const generateFunc = (scope, decl, forceNoExpr = false) => {
+  doNotMarkFuncRef = false;
+
   const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
   if (decl.type.startsWith('Class')) {
     const out = generateClass(scope, {
@@ -6404,6 +6411,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
   // TODO: share scope/locals between !!!
   const arrow = decl.type === 'ArrowFunctionExpression' || decl.type === 'Program';
   const func = {
+    start: decl.start,
     locals: {},
     localInd: 0,
     // value, type
@@ -6432,6 +6440,25 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         };
       }
 
+      // todo: enable for all block statement bodies, not just main
+      if (name === '#main') {
+        // hoist function declarations to the top of AST pre-codegen so
+        // we can optimize function calls so calls before decl are not indirect
+        // (without more post-codegen jank)
+        // plus, more spec-compliant hoisting!
+
+        let b = body.body, j = 0;
+
+        // append after directive if it exists
+        if (b[0]?.directive) j++;
+
+        for (let i = 0; i < b.length; i++) {
+          if (b[i].type === 'FunctionDeclaration') {
+            b.splice(j++, 0, b.splice(i, 1)[0]);
+          }
+        }
+      }
+
       func.identFailEarly = true;
       let localInd = args.length * 2;
       for (let i = 0; i < args.length; i++) {
@@ -6701,7 +6728,10 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
   // force generate all for precompile
   if (globalThis.precompile) func.generate();
 
+  if (decl._doNotMarkFuncRef) doNotMarkFuncRef = true;
   const out = decl.type.endsWith('Expression') && !forceNoExpr ? funcRef(func) : [];
+  doNotMarkFuncRef = false;
+
   astCache.set(decl, out);
   return [ func, out ];
 };

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.50.9",
+  "version": "0.50.11",
   "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.50.9';
+globalThis.version = '0.50.11';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {