porffor 0.57.24 → 0.57.26

package/compiler/codegen.js

@@ -3583,19 +3583,43 @@ const memberTmpNames = scope => {
   };
 };
 
-// COCTC: cross-object compile-time cache
-const coctcOffset = prop => {
-  if (!Prefs.coctc) return 0;
+const ctHash = prop => {
+  if (!Prefs.ctHash || !prop ||
+    prop.computed || prop.optional ||
+    prop.property.type === 'PrivateIdentifier'
+  ) return null;
+
+  prop = prop.property.name;
+  if (!prop || prop === '__proto__' || !byteStringable(prop)) return null;
+
+  let i = 0;
+  const len = prop.length;
+  let hash = 374761393 + len;
 
-  if (typeof prop === 'object') {
-    if (
-      prop.computed || prop.optional ||
-      ['prototype', 'size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength', 'name', 'message', 'constructor', 'length', '__proto__'].includes(prop.property.name)
-    ) return 0;
+  const rotl = (n, k) => (n << k) | (n >>> (32 - k));
+  const read = () => (prop.charCodeAt(i + 3) << 24 | prop.charCodeAt(i + 2) << 16 | prop.charCodeAt(i + 1) << 8 | prop.charCodeAt(i));
 
-    prop = prop.property.name;
+  // hash in chunks of i32 (4 bytes)
+  for (; i <= len; i += 4) {
+    hash = Math.imul(rotl(hash + Math.imul(read(), 3266489917), 17), 668265263);
   }
 
+  // final avalanche
+  hash = Math.imul(hash ^ (hash >>> 15), 2246822519);
+  hash = Math.imul(hash ^ (hash >>> 13), 3266489917);
+  return (hash ^ (hash >>> 16));
+};
+
+// COCTC: cross-object compile-time (inline) cache
+const coctcOffset = prop => {
+  if (!Prefs.coctc || !prop ||
+    prop.computed || prop.optional ||
+    prop.property.type === 'PrivateIdentifier'
+  ) return 0;
+
+  prop = prop.property.name;
+  if (!prop || ['prototype', 'size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength', 'name', 'message', 'constructor', 'length', '__proto__'].includes(prop)) return 0;
+
   let offset = coctc.get(prop);
   if (offset == null) {
     offset = (coctc.lastOffset ?? Prefs.coctcOffset ?? (globalThis.pageSize - 128)) - 9;
@@ -3726,8 +3750,9 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     // todo/perf: use i32 object (and prop?) locals
     const { objectTmp, propertyTmp, objectGet, propertyGet } = memberTmpNames(scope);
 
-    const useCoctc = coctcOffset(decl.left) > 0;
-    if (useCoctc) valueUnused = false;
+    const hash = ctHash(decl.left);
+    const coctc = coctcOffset(decl.left);
+    if (coctc > 0) 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;
@@ -4004,12 +4029,24 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
             [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
             [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
 
-            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
+            ...(hash != null ? [
+              number(hash, Valtype.i32),
+              number(TYPES.number, Valtype.i32),
+              [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get_withHash').index ]
+            ] : [
+              [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ]
+            ]),
             ...setLastType(scope)
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right))),
           ...getNodeType(scope, decl),
 
-          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
+          ...(hash != null ? [
+            number(hash, Valtype.i32),
+            number(TYPES.number, Valtype.i32),
+            [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict_withHash' : '__Porffor_object_set_withHash').index ],
+          ] : [
+            [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
+          ]),
           [ Opcodes.drop ],
           ...(valueUnused ? [ [ Opcodes.drop ] ] : [])
           // ...setLastType(scope, getNodeType(scope, decl)),
@@ -4018,9 +4055,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
       ...optional(number(UNDEFINED), valueUnused)
     ];
 
-    if (useCoctc) {
+    if (coctc > 0) {
       // set COCTC
-      const offset = coctcOffset(decl.left.property.name);
       const valueTmp = localTmp(scope, '#coctc_value');
       const objectTmp = localTmp(scope, '#coctc_object', Valtype.i32);
 
@@ -4030,11 +4066,11 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
         [ Opcodes.local_get, objectTmp ],
         [ Opcodes.local_get, valueTmp ],
-        [ Opcodes.f64_store, 0, ...unsignedLEB128(offset) ],
+        [ Opcodes.f64_store, 0, ...unsignedLEB128(coctc) ],
 
         [ Opcodes.local_get, objectTmp ],
         ...getNodeType(scope, decl),
-        [ Opcodes.i32_store8, 0, ...unsignedLEB128(offset + 8) ]
+        [ Opcodes.i32_store8, 0, ...unsignedLEB128(coctc + 8) ]
       );
     }
 
@@ -4222,8 +4258,8 @@ const generateUnary = (scope, decl) => {
         const property = getProperty(decl.argument);
         if (property.value === 'length' || property.value === 'name') scope.noFastFuncMembers = true;
 
-        const useCoctc = coctcOffset(decl.argument) > 0;
-        const objectTmp = useCoctc && localTmp(scope, '#coctc_object', Valtype.i32);
+        const coctc = coctcOffset(decl.argument);
+        const objectTmp = coctc > 0 && localTmp(scope, '#coctc_object', Valtype.i32);
 
         const out = [
           ...generate(scope, object),
@@ -4237,20 +4273,18 @@ const generateUnary = (scope, decl) => {
           Opcodes.i32_from_u
         ];
 
-        if (useCoctc) {
+        if (coctc > 0) {
           // set COCTC
-          const offset = coctcOffset(decl.argument.property.name);
-
           out.push(
             ...coctcSetup(scope, object, objectTmp, null, [ [ Opcodes.local_get, objectTmp ] ], false),
 
             [ Opcodes.local_get, objectTmp ],
             number(0),
-            [ Opcodes.f64_store, 0, ...unsignedLEB128(offset) ],
+            [ Opcodes.f64_store, 0, ...unsignedLEB128(coctc) ],
 
             [ Opcodes.local_get, objectTmp ],
             number(0, Valtype.i32),
-            [ Opcodes.i32_store8, 0, ...unsignedLEB128(offset + 8) ]
+            [ Opcodes.i32_store8, 0, ...unsignedLEB128(coctc + 8) ]
           );
         }
 
@@ -5860,8 +5894,9 @@ const generateMember = (scope, decl, _global, _name) => {
     if (known == null) extraBC = bc;
   }
 
-  const useCoctc = coctcOffset(decl) > 0;
-  const coctcObjTmp = useCoctc && localTmp(scope, '#coctc_obj' + uniqId(), Valtype.i32);
+  const hash = ctHash(decl);
+  const coctc = coctcOffset(decl);
+  const coctcObjTmp = coctc > 0 && localTmp(scope, '#coctc_obj' + uniqId(), Valtype.i32);
 
   const out = typeSwitch(scope, type, {
     ...(decl.computed ? {
@@ -6057,7 +6092,7 @@ const generateMember = (scope, decl, _global, _name) => {
     [TYPES.undefined]: internalThrow(scope, 'TypeError', `Cannot read property of undefined`, true),
 
     default: () => [
-      ...(useCoctc && known === TYPES.object ? [
+      ...(coctc > 0 && known === TYPES.object ? [
         [ Opcodes.local_get, coctcObjTmp ],
         number(TYPES.object, Valtype.i32)
       ] : [
@@ -6068,7 +6103,14 @@ const generateMember = (scope, decl, _global, _name) => {
 
       ...toPropertyKey(scope, [ propertyGet ], getNodeType(scope, property), decl.computed, true),
 
-      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
+      ...(hash != null ? [
+        number(hash, Valtype.i32),
+        number(TYPES.number, Valtype.i32),
+        [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get_withHash').index ]
+      ] : [
+        [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ]
+      ]),
+
       ...setLastType(scope)
     ],
 
@@ -6096,21 +6138,19 @@ const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.end ]
     );
   } else {
-    if (useCoctc) {
+    if (coctc > 0) {
       // fast path: COCTC
-      const offset = coctcOffset(decl.property.name);
-
       out.unshift(
         ...generate(scope, decl.object),
         [ Opcodes.local_set, objectTmp ],
         ...coctcSetup(scope, decl.object, coctcObjTmp, 'get', [ [ Opcodes.local_get, objectTmp ] ]),
 
         [ Opcodes.local_get, coctcObjTmp ],
-        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(offset + 8) ],
+        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(coctc + 8) ],
         [ Opcodes.local_tee, localTmp(scope, '#coctc_tmp', Valtype.i32) ],
         [ Opcodes.if, Valtype.f64 ],
           [ Opcodes.local_get, coctcObjTmp ],
-          [ Opcodes.f64_load, 0, ...unsignedLEB128(offset) ],
+          [ Opcodes.f64_load, 0, ...unsignedLEB128(coctc) ],
 
           ...setLastType(scope, [
             [ Opcodes.local_get, localTmp(scope, '#coctc_tmp', Valtype.i32) ],
@@ -6493,7 +6533,7 @@ const objectHack = node => {
   if (node.type === 'MemberExpression') {
     const out = (() => {
       const abortOut = { ...node, object: objectHack(node.object) };
-      if (node.computed || node.optional) return;
+      if (node.computed || node.optional || node.property.type === 'PrivateIdentifier') return;
 
       // hack: block these properties as they can be accessed on functions
       if (node.object.name !== 'Porffor' && (node.property.name === 'length' || node.property.name === 'name' || node.property.name === 'call')) return abortOut;

package/compiler/precompile.js

@@ -23,14 +23,19 @@ globalThis.precompile = true;
 globalThis.valtypeOverrides = {
   returns: {
     __Porffor_object_get: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_get_withHash: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_readValue: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_set: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_set_withHash: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_setStrict: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_setStrict_withHash: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_packAccessor: [ Valtype.f64 ]
   },
   params: {
     __Porffor_object_set: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_set_withHash: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_setStrict: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_setStrict_withHash: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_expr_init: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_fastAdd: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_class_value: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],

package/compiler/prefs.js

@@ -1,10 +1,9 @@
-const onByDefault = [ 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'passiveData', 'rmUnusedTypes', 'optTypes', 'coctc' ];
+const onByDefault = [ 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'passiveData', 'rmUnusedTypes', 'optTypes', 'coctc', 'ctHash' ];
 
 const nameToKey = x => x.replace(/[a-z]\-[a-z]/g, y => `${y[0]}${y[2].toUpperCase()}`);
 
-let prefs = {};
 const getPrefs = () => {
-  prefs = {};
+  const prefs = globalThis.Prefs = {};
   for (const x of onByDefault) prefs[x] = true;
 
   for (const x of process.argv) {
@@ -18,12 +17,8 @@ const getPrefs = () => {
       prefs[nameToKey(name)] = value ?? true;
     }
   }
-
-  globalThis.Prefs = prefs;
 };
 getPrefs();
 
-// export default prefs;
-
 export const uncache = () => getPrefs();
 globalThis.argvChanged = uncache;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.57.24",
+  "version": "0.57.26",
   "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.57.24';
+globalThis.version = '0.57.26';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/foo.js

@@ -1 +0,0 @@
-console.log(await Promise.resolve(5));

package/foo.ts

@@ -1,12 +0,0 @@
-// namespace wasm {
-//   export declare function imported_wasm_func(a: number): void;
-// }
-
-// wasm.imported_wasm_func(1337);
-
-class Vector {
-  foo(x: number): number
-}
-
-const foo = new Vector()
-console.log(foo.foo(""))