porffor 0.37.24 → 0.37.26

package/compiler/codegen.js

@@ -357,6 +357,13 @@ const generateIdent = (scope, decl) => {
     }
 
     if (local?.idx === undefined) {
+      if (name === 'arguments' && scope.name !== 'main' && !scope.arrow) {
+        // todo: stub arguments as [] for now :)
+        return generateArray(scope, {
+          elements: []
+        }, false, '#arguments');
+      }
+
       // no local var with name
       if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
 
@@ -559,7 +566,8 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
   const useTmp = knownType(scope, type) == null;
   const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
-  const def = (truthyMode => {
+  const truthyMode = forceTruthyMode ?? Prefs.truthy ?? 'full';
+  const def = (() => {
     if (truthyMode === 'full') return [
       // if value != 0 or NaN
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
@@ -584,7 +592,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
       ...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ])
     ];
-  })(forceTruthyMode ?? Prefs.truthy ?? 'full');
+  })();
 
   return [
     ...wasm,
@@ -603,6 +611,17 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(1, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
+      ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
+        // always truthy :))
+        ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+        ...number(1, intOut ? Valtype.i32 : valtypeBinary)
+      ] ] ] : []),
       [ 'default', def ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
@@ -612,7 +631,8 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
   const useTmp = knownType(scope, type) == null;
   const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
-  const def = (truthyMode => {
+  const truthyMode = forceTruthyMode ?? Prefs.truthy ?? 'full';
+  const def = (() => {
     if (truthyMode === 'full') return [
       // if value == 0 or NaN
       ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
@@ -638,7 +658,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
       ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
       ...(intOut ? [] : [ Opcodes.i32_from_u ])
     ];
-  })(forceTruthyMode ?? Prefs.truthy ?? 'full');
+  })();
 
   return [
     ...wasm,
@@ -656,6 +676,17 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
         [ Opcodes.i32_eqz ],
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(0, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
+      ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
+        // always truthy :))
+        ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+        ...number(0, intOut ? Valtype.i32 : valtypeBinary)
+      ] ] ] : []),
       [ 'default', def ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
@@ -1143,6 +1174,10 @@ const getType = (scope, _name) => {
     return number(TYPES.undefined, Valtype.i32);
   }
 
+  if (name === 'arguments' && scope.name !== 'main' && !scope.arrow) {
+    return number(TYPES.array, Valtype.i32);
+  }
+
   if (Object.hasOwn(globals, name)) {
     if (globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
 
@@ -1680,6 +1715,20 @@ const setObjProp = (obj, prop, value) => {
   });
 };
 
+const aliasPrimObjsBC = bc => {
+  const add = (x, y) => {
+    if (bc[x] == null) return;
+
+    // bc[`${x},${y}`] = original;
+
+    // intentionally duplicate to avoid extra bc for prim objs as rarely used
+    bc[y] = bc[x];
+  };
+
+  add(TYPES.boolean, TYPES.booleanobject);
+  add(TYPES.number, TYPES.numberobject);
+};
+
 const createThisArg = (scope, decl) => {
   const name = mapName(decl.callee?.name);
   if (decl._new) {
@@ -2075,6 +2124,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       // fallback to object prototype impl as a basic prototype chain hack
       if (protoBC[TYPES.object]) def = protoBC[TYPES.object];
 
+      // alias primitive prototype with primitive object types
+      aliasPrimObjsBC(protoBC);
+
       return [
         ...out,
 
@@ -2718,27 +2770,40 @@ const typeUsed = (scope, x) => {
   scope.usedTypes ??= new Set();
   scope.usedTypes.add(x);
 };
+
 const typeSwitch = (scope, type, bc, returns = valtypeBinary, fallthrough = false) => {
+  if (typeof bc === 'function') bc = bc();
+
+  let def;
+  if (!Array.isArray(bc)) {
+    def = bc.default;
+    bc = Object.entries(bc);
+
+    // turn keys back into numbers from keys
+    for (const x of bc) {
+      const k = x[0];
+      if (k === 'default') continue;
+
+      // uncomment if needed/used again
+      // x[0] = k.split(',').map(x => +x);
+      x[0] = +k;
+    }
+  }
+
   const known = knownType(scope, type);
   if (known != null) {
-    if (Array.isArray(bc)) {
-      let def;
-      for (const [ type, wasm ] of bc) {
-        if (type === 'default') {
-          def = wasm;
-          continue;
-        }
-
-        if (Array.isArray(type)) {
-          if (type.includes(known)) return typeof wasm === 'function' ? wasm() : wasm;
-        } else if (type === known) return typeof wasm === 'function' ? wasm() : wasm;
+    for (const [ type, wasm ] of bc) {
+      if (type === 'default') {
+        def = wasm;
+        continue;
       }
 
-      return typeof def === 'function' ? def() : def;
-    } else {
-      const wasm = bc[known] ?? bc.default;
-      return typeof wasm === 'function' ? wasm() : wasm;
+      if (type === known || (Array.isArray(type) && type.includes(known))) {
+        return typeof wasm === 'function' ? wasm() : wasm;
+      }
     }
+
+    return typeof def === 'function' ? def() : def;
   }
 
   if (Prefs.typeswitchBrtable) {
@@ -2753,19 +2818,6 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary, fallthrough = fals
     [ Opcodes.block, returns ]
   ];
 
-  if (typeof bc === 'function') bc = bc();
-
-  let def;
-  if (!Array.isArray(bc)) {
-    def = bc.default;
-    bc = Object.entries(bc);
-
-    // turn keys back into numbers from keys
-    for (const x of bc) {
-      if (x[0] !== 'default') x[0] = +x[0];
-    }
-  }
-
   for (let i = 0; i < bc.length; i++) {
     let [ types, wasm ] = bc[i];
     if (types === 'default') {
@@ -2837,6 +2889,17 @@ const typeIsOneOf = (type, types, valtype = Valtype.i32) => {
   return out;
 };
 
+const typeIsNotOneOf = (type, types, valtype = Valtype.i32) => {
+  const out = [];
+
+  for (let i = 0; i < types.length; i++) {
+    out.push(...type, ...number(types[i], valtype), valtype === Valtype.f64 ? [ Opcodes.f64_ne ] : [ Opcodes.i32_ne ]);
+    if (i !== 0) out.push([ Opcodes.i32_and ]);
+  }
+
+  return out;
+};
+
 const allocVar = (scope, name, global = false, type = true) => {
   const target = global ? globals : scope.locals;
 
@@ -3565,7 +3628,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
         // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
         default: () => [
           ...objectWasm,
-          Opcodes.i32_to_u,
+          Opcodes.i32_to,
           ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
           ...getNodeType(scope, object),
 
@@ -5411,7 +5474,10 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       if (type === known) return bc[type]();
     }
 
-    if (known == null) extraBC = bc;
+    if (known == null) {
+      aliasPrimObjsBC(bc);
+      extraBC = bc;
+    }
   }
 
   // todo/perf: use i32 object (and prop?) locals
@@ -5574,7 +5640,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
     // default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
     default: () => [
       ...objectWasm,
-      Opcodes.i32_to_u,
+      Opcodes.i32_to,
       ...getNodeType(scope, object),
 
       ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
@@ -5892,6 +5958,7 @@ const generateFunc = (scope, decl) => {
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!
+  const arrow = decl.type === 'ArrowFunctionExpression' || decl.type === 'Program';
   const func = {
     locals: {},
     localInd: 0,
@@ -5899,11 +5966,8 @@ const generateFunc = (scope, decl) => {
     returns: [ valtypeBinary, Valtype.i32 ],
     name,
     index: currentFuncIndex++,
-    constr:
-      // not arrow function or main
-      (decl.type && decl.type !== 'ArrowFunctionExpression' && decl.type !== 'Program') &&
-      // not async or generator
-      !decl.async && !decl.generator,
+    arrow,
+    constr: !arrow && !decl.generator && !decl.async,
     _onlyConstr: decl._onlyConstr, _onlyThisMethod: decl._onlyThisMethod,
     strict: scope.strict || decl.strict,
 
@@ -6097,10 +6161,11 @@ const generateFunc = (scope, decl) => {
         TYPES.weakref, TYPES.weakset, TYPES.weakmap,
         TYPES.arraybuffer, TYPES.sharedarraybuffer, TYPES.dataview
       ].includes(typeAnno.type)) {
+        let types = [ typeAnno.type ];
+        if (typeAnno.type === TYPES.number) types.push(TYPES.numberobject);
+
         prelude.push(
-          [ Opcodes.local_get, func.locals[name].idx + 1 ],
-          ...number(typeAnno.type, Valtype.i32),
-          [ Opcodes.i32_ne ],
+          ...typeIsNotOneOf([ [ Opcodes.local_get, func.locals[name].idx + 1 ] ], types),
           [ Opcodes.if, Blocktype.void ],
             ...internalThrow(func, 'TypeError', `${unhackName(func.name)} expects 'this' to be a ${TYPE_NAMES[typeAnno.type]}`),
           [ Opcodes.end ]

package/compiler/types.js

@@ -74,6 +74,9 @@ registerInternalType('WeakMap');
 
 registerInternalType('Promise');
 
+registerInternalType('BooleanObject');
+registerInternalType('NumberObject');
+
 if (Prefs.largestTypes) {
   const typeKeys = Object.keys(TYPES);
   const typeVals = Object.values(TYPES);

package/compiler/wrap.js

@@ -41,7 +41,12 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type, override = undefin
     case TYPES.undefined:
       return undefined;
 
+    case TYPES.number: return value;
+    case TYPES.numberobject: return new Number(value);
+
     case TYPES.boolean: return Boolean(value);
+    case TYPES.booleanobject: return new Boolean(value);
+
     case TYPES.object: {
       if (value === 0 || checkOOB(memory, value)) return null;
 

package/nova.comp.cjs

@@ -0,0 +1,3 @@
+const uniq = [...new Set(require('../nova.json').pass.map(x => x.slice(5))).difference(new Set(require('./test262/results.json').passes))];
+console.log([...uniq.reduce((acc, x) => { let k = x.split('/').slice(0, -1).join('/'); return acc.set(k, (acc.get(k) || 0) + 1); }, new Map()).entries()].sort((a, b) => a[1] - b[1]).slice(-20).map(x => x[0] + ': ' + x[1]).join('\n'));
+console.log(uniq.filter(x => x.startsWith('built-ins/Object/defineProperty')).join('\n'))

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.24+5dd7ec92f",
+  "version": "0.37.26+4f2db33d1",
   "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.24+5dd7ec92f';
+globalThis.version = '0.37.26+4f2db33d1';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {