porffor 0.37.7 → 0.37.9

package/compiler/codegen.js

@@ -2964,6 +2964,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
 
     const typed = typedInput && pattern.typeAnnotation;
     let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(pattern).type != null));
+    addVarMetadata(scope, name, global, { kind });
 
     if (typed) {
       addVarMetadata(scope, name, global, extractTypeAnnotation(pattern));
@@ -3563,6 +3564,9 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     ];
   }
 
+  // check not const
+  if (local.metadata?.kind === 'const') return internalThrow(scope, 'TypeError', `Cannot assign to constant variable ${name}`, true);
+
   if (op === '=') {
     return setLocalWithType(scope, name, isGlobal, decl.right, true);
   }
@@ -6274,9 +6278,9 @@ export default program => {
       // run callbacks
       const wasm = f.wasm;
       for (let j = 0; j < wasm.length; j++) {
-        const i = wasm[j];
-        if (i[0] === null && typeof i[1] === 'function') {
-          wasm.splice(j, 1, ...i[1]());
+        const o = wasm[j];
+        if (o[0] === null && typeof o[1] === 'function') {
+          wasm.splice(j--, 1, ...o[1]());
         }
       }
 

package/compiler/index.js

@@ -53,6 +53,8 @@ const progressClear = () => {
 };
 
 export default (code, flags) => {
+  const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
+
   let target = Prefs.target ?? 'wasm';
   if (Prefs.native) target = 'native';
 
@@ -67,8 +69,13 @@ export default (code, flags) => {
 
   // change some prefs by default for c/native
   if (target !== 'wasm') {
-    Prefs.pgo = Prefs.pgo === false ? false : true;
-    Prefs.passiveData = false;
+    Prefs.pgo = Prefs.pgo === false ? false : true; // enable pgo
+    Prefs.passiveData = false; // disable using passive Wasm data as unsupported by 2c for now
+  }
+
+  // change some prefs by default for -O2
+  if (optLevel >= 2) {
+    Prefs.cyclone = Prefs.cyclone === false ? false : true; // enable cyclone
   }
 
   if (Prefs.pgo) pgo.setup();

package/compiler/opt.js

@@ -9,88 +9,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
   if (optLevel === 0) return;
 
   const tailCall = Prefs.tailCall;
-  if (tailCall) log.warning('opt', 'tail call proposal is not widely implemented! (you used -tail-call)');
-
-  if (optLevel >= 2 && !Prefs.optNoInline) {
-    // inline pass (very WIP)
-    // get candidates for inlining
-    // todo: pick smart in future (if func is used <N times? or?)
-    const callsSelf = f => f.wasm.some(x => x[0] === Opcodes.call && x[1] === f.index);
-    const suitableReturns = wasm => wasm.reduce((acc, x) => acc + (x[0] === Opcodes.return), 0) <= 1;
-    const candidates = funcs.filter(x => x.name !== 'main' && Object.keys(x.locals).length === x.params.length && (x.returns.length === 0 || suitableReturns(x.wasm)) && !callsSelf(x) && !x.throws).reverse();
-    if (Prefs.optLog) {
-      log('opt', `found inline candidates: ${candidates.map(x => x.name).join(', ')} (${candidates.length}/${funcs.length - 1})`);
-
-      let reasons = {};
-      for (const f of funcs) {
-        if (f.name === 'main') continue;
-        reasons[f.name] = [];
-
-        if (f.name === 'main') reasons[f.name].push('main');
-        if (Object.keys(f.locals).length !== f.params.length) reasons[f.name].push('cannot inline funcs with locals yet');
-        if (f.returns.length !== 0 && !suitableReturns(f.wasm)) reasons[f.name].push('cannot inline funcs with multiple returns yet');
-        if (callsSelf(f)) reasons[f.name].push('cannot inline func calling itself');
-        if (f.throws) reasons[f.name].push('will not inline funcs throwing yet');
-      }
-
-      if (Object.values(reasons).some(x => x.length > 0)) console.log(`     reasons not:\n${Object.keys(reasons).filter(x => reasons[x].length > 0).map(x => `       ${x}: ${reasons[x].join(', ')}`).join('\n')}\n`)
-    }
-
-    for (const c of candidates) {
-      const cWasm = c.wasm;
-
-      for (const t of funcs) {
-        const tWasm = t.wasm;
-        if (t.name === c.name) continue; // skip self
-
-        for (let i = 0; i < tWasm.length; i++) {
-          const inst = tWasm[i];
-          if (inst[0] === Opcodes.call && inst[1] === c.index) {
-            if (Prefs.optLog) log('opt', `inlining call for ${c.name} (in ${t.name})`);
-            tWasm.splice(i, 1); // remove this call
-
-            // add params as locals and set in reverse order
-            const paramIdx = {};
-            let localIdx = Math.max(-1, ...Object.values(t.locals).map(x => x.idx)) + 1;
-            for (let j = c.params.length - 1; j >= 0; j--) {
-              const name = `__porf_inline_${c.name}_param_${j}`;
-
-              if (t.locals[name] === undefined) {
-                t.locals[name] = { idx: localIdx++, type: c.params[j] };
-              }
-
-              const idx = t.locals[name].idx;
-              paramIdx[j] = idx;
-
-              tWasm.splice(i, 0, [ Opcodes.local_set, idx ]);
-              i++;
-            }
-
-            let iWasm = cWasm.slice().map(x => x.slice()); // deep clone arr (depth 2)
-            // remove final return
-            if (iWasm.length !== 0 && iWasm[iWasm.length - 1][0] === Opcodes.return) iWasm = iWasm.slice(0, -1);
-
-            // adjust local operands to go to correct param index
-            for (const inst of iWasm) {
-              if ((inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) && inst[1] < c.params.length) {
-                if (Prefs.optLog) log('opt', `replacing local operand in inlined wasm (${inst[1]} -> ${paramIdx[inst[1]]})`);
-                inst[1] = paramIdx[inst[1]];
-              }
-            }
-
-            tWasm.splice(i, 0, ...iWasm);
-            i += iWasm.length;
-          }
-        }
-
-        if (t.index > c.index) t.index--; // adjust index if after removed func
-      }
-
-      funcs.splice(funcs.indexOf(c), 1); // remove func from funcs
-    }
-  }
-
-  if (Prefs.optInlineOnly) return;
+  if (tailCall) log.warning('opt', 'tail call proposal is not widely implemented! (you used --tail-call)');
 
   // todo: this breaks exceptions after due to indexes not being adjusted
   // const tagUse = tags.reduce((acc, x) => { acc[x.idx] = 0; return acc; }, {});

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