porffor 0.60.2 → 0.60.4

package/compiler/codegen.js

@@ -4292,8 +4292,6 @@ const generateUnary = (scope, decl) => {
         if (object.type === 'Super') return internalThrow(scope, 'ReferenceError', 'Cannot delete super property', true);
 
         const property = getProperty(decl.argument);
-        if (property.value === 'length' || property.value === 'name') scope.noFastFuncMembers = true;
-
         const coctc = coctcOffset(decl.argument);
         const objectTmp = coctc > 0 && localTmp(scope, '#coctc_object', Valtype.i32);
 
@@ -5808,19 +5806,7 @@ const generateMember = (scope, decl, _global, _name) => {
   let final = [], finalEnd, extraBC = {};
   let name = decl.object.name;
 
-  // todo: handle globalThis.foo
-
-  // hack: .name
-  if (decl.property.name === 'name' && hasFuncWithName(name) && !scope.noFastFuncMembers) {
-    // function name can mismatch variable/access name
-    name = funcByName(name)?.name ?? name;
-
-    // eg: __String_prototype_toLowerCase -> toLowerCase
-    if (name.startsWith('__')) name = name.split('_').pop();
-    if (name.startsWith('#')) name = '';
-
-    return withType(scope, makeString(scope, name, true), TYPES.bytestring);
-  }
+  // todo: handle globalThis.foo efficiently
 
   const object = decl.object;
   const property = getProperty(decl);
@@ -5837,16 +5823,6 @@ const generateMember = (scope, decl, _global, _name) => {
   // hack: .length
   if (decl.property.name === 'length') {
     // todo: support optional
-
-    if (!scope.noFastFuncMembers) {
-      const func = funcByName(name);
-      if (func) return withType(scope, [ number(countLength(func, name)) ], TYPES.number);
-
-      if (Object.hasOwn(builtinFuncs, name)) return withType(scope, [ number(countLength(builtinFuncs[name], name)) ], TYPES.number);
-      if (Object.hasOwn(importedFuncs, name)) return withType(scope, [ number(importedFuncs[name].params.length) ], TYPES.number);
-      if (Object.hasOwn(internalConstrs, name)) return withType(scope, [ number(internalConstrs[name].length ?? 0) ], TYPES.number);
-    }
-
     const out = [
       ...generate(scope, object),
       Opcodes.i32_to_u
@@ -6257,7 +6233,8 @@ const generateAwait = (scope, decl) => {
 const generateClass = (scope, decl) => {
   const expr = decl.type === 'ClassExpression';
 
-  const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
+  if (!decl.id) decl.id = { type: 'Identifier', name: `#anonymous${uniqId()}` };
+  const name = decl.id.name;
   if (!expr) hoist(scope, name, 2, true);
 
   const body = decl.body.body;
@@ -6732,7 +6709,8 @@ const builtinFuncByName = name => {
 const generateFunc = (scope, decl, forceNoExpr = false) => {
   doNotMarkFuncRef = false;
 
-  const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
+  if (!decl.id) decl.id = { type: 'Identifier', name: `#anonymous${uniqId()}` };
+  const name = decl.id.name;
   if (decl.type.startsWith('Class')) {
     const out = generateClass(scope, {
       ...decl,

package/compiler/index.js

@@ -200,7 +200,7 @@ export default (code, module = Prefs.module) => {
   const out = { funcs, globals, tags, exceptions, pages, data, times: [ t0, t1, t2, t3 ] };
   if (globalThis.precompile) return out;
 
-  const wasm = out.wasm = assemble(funcs, globals, tags, pages, data);
+  let wasm = out.wasm = assemble(funcs, globals, tags, pages, data);
   if (logProgress) progressDone('assembled', t3);
 
   if (Prefs.optFuncs || Prefs.f) logFuncs(funcs, globals, exceptions);
@@ -212,6 +212,48 @@ export default (code, module = Prefs.module) => {
     console.log([...pages.keys()].map(x => `\x1B[36m - ${x}\x1B[0m`).join('\n') + '\n');
   }
 
+  if (Prefs.emscripten) {
+    const tmpFile = 'porffor_tmp.wasm';
+    const cO = Prefs._cO ?? 'Oz';
+
+    const args = [
+      'emcc',
+      '-xc', '-', // use stdin as c source in
+      '-s', 'STANDALONE_WASM=1',
+      '-s', 'NO_FILESYSTEM=1',
+      '-s', 'EXPORTED_FUNCTIONS=\'["_m"]\'',
+      '-nostartfiles',
+      '-Wl,--no-entry',
+      '-o', tmpFile,
+      '-' + cO,
+      Prefs.d ? '-g' : ''
+    ];
+
+    if (Prefs.clangFast) args.push('-flto=thin', '-march=native', '-ffast-math', '-fno-asynchronous-unwind-tables');
+
+    if (Prefs.s) args.push('-s');
+
+    Prefs['2cWasmImports'] = true;
+    const c = toc(out)
+    .replace(`int main()`, `
+void __wasi_proc_exit(int code) {
+  __builtin_trap();
+}
+
+int m()`);
+    Prefs['2cWasmImports'] = false;
+
+    // obvious command escape is obvious
+    execSync(args.join(' '), {
+      stdio: [ 'pipe', 'inherit', 'inherit' ],
+      input: c,
+      encoding: 'utf8'
+    });
+
+    out.wasm = wasm = fs.readFileSync(tmpFile, null);
+    fs.unlinkSync(tmpFile);
+  }
+
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 

package/foo.js

@@ -0,0 +1,9 @@
+const func = () => {
+  let before = 0;
+
+  TypeError('wow');
+
+  let after = 1;
+};
+
+func();

package/package.json

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

package/runtime/index.js

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