porffor 0.58.19 → 0.59.1

package/compiler/codegen.js

@@ -1505,6 +1505,7 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
     typeUsed(func, returnType);
   }
 
+  func.jsLength = countLength(func);
   func.wasm = wasm;
   return func;
 };
@@ -1822,6 +1823,12 @@ const getNodeType = (scope, node) => {
         case '__Porffor_bs': return TYPES.bytestring;
         case '__Porffor_s': return TYPES.string;
       }
+
+      return getNodeType(scope, {
+        type: 'CallExpression',
+        callee: node.tag,
+        arguments: []
+      });
     }
 
     if (node.type === 'ThisExpression') {
@@ -5760,7 +5767,24 @@ const countLength = (func, name = undefined) => {
 
   let count = countParams(func, name);
   if (builtinFuncs[name] && name.includes('_prototype_')) count--;
-
+  if (func.hasRestArgument) count--;
+
+  if (func.internal) {
+    // some js built-ins have an old non-standard length
+    const override = ({
+      Array: 1,
+      String: 1,
+      __Object_assign: 2,
+      __String_fromCharCode: 1,
+      __String_fromCodePoint: 1,
+      __Array_prototype_concat: 1,
+      __Array_prototype_push: 1,
+      __Array_prototype_unshift: 1,
+      __String_prototype_concat: 1,
+      __ByteString_prototype_concat: 1
+    })[name];
+    if (override != null) return override;
+  }
   return count;
 };
 
@@ -6581,20 +6605,41 @@ const generateTaggedTemplate = (scope, decl, global = false, name = undefined, v
     return cacheAst(decl, intrinsics[decl.tag.name](str));
   }
 
-  return generate(scope, {
-    type: 'CallExpression',
-    callee: decl.tag,
-    arguments: [
-      { // strings
-        type: 'ArrayExpression',
-        elements: quasis.map(x => ({
-          type: 'Literal',
-          value: x.value.cooked
-        }))
-      },
-      ...expressions
-    ]
-  });
+  const tmp = localTmp(scope, '#tagged_template_strings');
+  const tmpIdent = {
+    type: 'Identifier',
+    name: '#tagged_template_strings',
+    _type: TYPES.array
+  };
+
+  return [
+    ...generate(scope, {
+      type: 'ArrayExpression',
+      elements: quasis.map(x => ({
+        type: 'Literal',
+        value: x.value.cooked
+      }))
+    }),
+    [ Opcodes.local_set, tmp ],
+
+    ...generate(scope, setObjProp(tmpIdent, 'raw', {
+      type: 'ArrayExpression',
+      elements: quasis.map(x => ({
+        type: 'Literal',
+        value: x.value.raw
+      }))
+    })),
+    [ Opcodes.drop ],
+
+    ...generate(scope, {
+      type: 'CallExpression',
+      callee: decl.tag,
+      arguments: [
+        tmpIdent,
+        ...expressions
+      ]
+    })
+  ];
 };
 
 globalThis._uniqId = 0;

package/compiler/pgo.js

@@ -1,20 +1,26 @@
 import { Opcodes, Valtype } from './wasmSpec.js';
 import { number } from './encoding.js';
-import { createImport, importedFuncs } from './builtins.js';
+import { createImport, importedFuncs, setImports } from './builtins.js';
 import assemble from './assemble.js';
 import wrap from './wrap.js';
 import * as Havoc from './havoc.js';
 import './prefs.js';
+import fs from 'node:fs';
 
+let activeFunc, localData;
 export const setup = () => {
   // enable these prefs by default for pgo
   for (const x of [
     'typeswitchUniqueTmp', // use unique tmps for typeswitches
-    'lengthNoTmp', // use duplicated inline code instead of tmp for .length
-    'cyclone', // enable cyclone pre-evaler
+    // 'cyclone', // enable cyclone pre-evaler
   ]) {
     Prefs[x] = Prefs[x] === false ? false : true;
   }
+
+  createImport('profileLocalSet', [ Valtype.i32, Valtype.i32, Valtype.f64 ], 0, (activeFunc, i, n) => {
+    if (activeFunc == null) throw 'fail';
+    localData[activeFunc][i].push(n);
+  });
 };
 
 export const run = obj => {
@@ -34,15 +40,7 @@ export const run = obj => {
 
   time(0, `injecting PGO logging...`);
 
-  let activeFunc = null, abort = false;
-  createImport('profile1', [ Valtype.i32 ], 0, n => {
-    activeFunc = n;
-  });
-  createImport('profile2', [ Valtype.i32, Valtype.f64 ], 0, (i, n) => {
-    if (activeFunc == null) throw 'fail';
-    localData[activeFunc][i].push(n);
-  });
-
+  let abort = false;
   let funcs = [];
   for (let i = 0; i < wasmFuncs.length; i++) {
     const { name, internal, params, locals, wasm } = wasmFuncs[i];
@@ -55,16 +53,13 @@ export const run = obj => {
     funcs.push({ name, id, locals, params, invLocals });
 
     wasm.unshift(
-      // mark active func
-      number(i, Valtype.i32),
-      [ Opcodes.call, importedFuncs.profile1 ],
-
       // log args
       ...params.flatMap((_, i) => [
+        number(id, Valtype.i32),
         number(i, Valtype.i32),
         [ Opcodes.local_get, i ],
         ...(invLocals[i].type !== Valtype.f64 ? [ Opcodes.i32_from ] : []),
-        [ Opcodes.call, importedFuncs.profile2 ]
+        [ Opcodes.call, importedFuncs.profileLocalSet ]
       ])
     );
 
@@ -72,49 +67,32 @@ export const run = obj => {
       const inst = wasm[j];
       if (inst[0] === Opcodes.local_set || inst[0] === Opcodes.local_tee) {
         wasm.splice(j + 1, 0,
+          number(id, Valtype.i32),
           number(inst[1], Valtype.i32),
           [ Opcodes.local_get, inst[1] ],
           ...(invLocals[inst[1]].type !== Valtype.f64 ? [ Opcodes.i32_from ] : []),
-          [ Opcodes.call, importedFuncs.profile2 ]
+          [ Opcodes.call, importedFuncs.profileLocalSet ]
         );
       }
     }
   }
 
-  let localData = funcs.map(x => new Array(Object.keys(x.locals).length).fill(0).map(() => []));
+  localData = funcs.map(x => new Array(Object.keys(x.locals).length).fill(0).map(() => []));
 
   time(0, `injected PGO logging`);
   time(1, `running with PGO logging...`);
 
-
   try {
     obj.wasm = assemble(obj.funcs, obj.globals, obj.tags, obj.pages, obj.data, true);
 
     Prefs._profileCompiler = Prefs.profileCompiler;
     Prefs.profileCompiler = false;
 
-    const { exports } = wrap(obj, undefined, {
-      readArgv: (ind, outPtr) => {
-        // const pgoInd = process.argv.indexOf('--pgo');
-        // let args = process.argv.slice(pgoInd);
-        // args = args.slice(args.findIndex(x => !x.startsWith('-')) + 1);
-
-        // const str = args[ind - 1];
-        // if (pgoInd === -1 || !str) {
-        //   if (Prefs.pgoLog) console.log('\nPGO warning: script was expecting arguments, please specify args to use for PGO after --pgo arg');
-        //   return -1;
-        // }
-
-        // writeByteStr(exports.$, outPtr, str);
-        // return str.length;
-        return -1;
-      },
-      readFile: (pathPtr, outPtr) => {
-        return -1;
-      }
-    }, () => {});
-
+    const priorImports = { ...importedFuncs };
+    const { exports } = wrap(obj, undefined, () => {});
     exports.main();
+
+    setImports(priorImports);
   } catch (e) {
     throw e;
   }
@@ -242,8 +220,8 @@ export const run = obj => {
       consts.push(number(c, valtype));
     }
 
-    log += `  ${x.name}: replaced ${targets.length} locals with consts\n`;
-    if (targets.length > 0) Havoc.localsToConsts(wasmFunc, targets, consts, { localKeys: x.localKeys });
+    // log += `  ${x.name}: replaced ${targets.length} locals with consts\n`;
+    // if (targets.length > 0) Havoc.localsToConsts(wasmFunc, targets, consts, { localKeys: x.localKeys });
   }
 
   time(3, 'optimized using PGO data\n' + log);

package/compiler/wrap.js

@@ -481,10 +481,9 @@ export { createImport };
  *
  * @param {string} source - JavaScript source code to compile
  * @param {boolean} module - If the source is a module or not (default: false)
- * @param {object} customImports - Custom imports
  * @param {(str: string) => void} print - Function to use for printing (used by console.log etc)
  */
-export default (source, module = undefined, customImports = {}, print = str => process.stdout.write(str)) => {
+export default (source, module = undefined, print = str => process.stdout.write(str)) => {
   createImport('print', 1, 0, i => print(i.toString()));
   createImport('printChar', 1, 0, i => print(String.fromCharCode(i)));
   createImport('time', 0, 1, () => performance.now());
@@ -512,12 +511,6 @@ export default (source, module = undefined, customImports = {}, print = str => p
     }
   });
 
-  for (const x in customImports) {
-    const custom = customImports[x];
-    // todo: make a simpler api for just js functions at some point using function.length etc
-    createImport(x, custom.params, custom.returns, custom.js, custom.c);
-  }
-
   const times = [];
 
   const t1 = performance.now();
@@ -575,6 +568,8 @@ export default (source, module = undefined, customImports = {}, print = str => p
     instance = new WebAssembly.Instance(module, {
       '': Object.keys(importedFuncs).reduce((acc, y) => {
         const x = importedFuncs[y];
+        if (!x.import) return acc;
+
         acc[x.import] = x.js ?? (() => {});
         return acc;
       }, {})

package/fuzz/index.js

@@ -246,7 +246,7 @@ if (cluster.isPrimary) {
     let stage = 0;
 
     try {
-      const out = compile(code, false, {});
+      const out = compile(code, false);
 
       try {
         out.exports.main();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.58.19",
+  "version": "0.59.1",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/debug.js

@@ -109,7 +109,7 @@ createImport('profile2', 1, 0, n => {
 });
 
 try {
-  const { exports } = compile(source, undefined, {}, s => output += s);
+  const { exports } = compile(source, undefined, s => output += s);
   exports.main();
 } catch (e) {
   console.error(e);

package/runtime/index.js

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

package/runtime/profile.js

@@ -94,7 +94,7 @@ globalThis.compileCallback = ({ funcs }) => {
 };
 
 console.log('Compiling...');
-const { exports } = compile(source, undefined, {}, () => {});
+const { exports } = compile(source, undefined, () => {});
 
 // --- Execution with Progress Spinner ---
 

package/runtime/repl.js

@@ -95,7 +95,7 @@ const run = (source, _context, _filename, callback, run = true) => {
 
   let shouldPrint = !prev;
   try {
-    const { exports, pages } = compile(toRun, undefined, {}, str => {
+    const { exports, pages } = compile(toRun, undefined, str => {
       if (shouldPrint) process.stdout.write(str);
       if (str === '-4919') shouldPrint = true;
     });

package/wow.js

@@ -1 +0,0 @@
-(false ? 42 : 42) + (false ? null : 'G9vBsCA4GzkqlZN')