porffor 0.35.4 → 0.36.1

package/compiler/codegen.js

@@ -3883,18 +3883,21 @@ const generateForOf = (scope, decl) => {
     if (depth[i] === 'forof') count++;
   }
 
-  const iterType = getNodeType(scope, decl.right);
-
   const pointer = localTmp(scope, '#forof_base_pointer' + count, Valtype.i32);
   const length = localTmp(scope, '#forof_length' + count, Valtype.i32);
   const counter = localTmp(scope, '#forof_counter' + count, Valtype.i32);
 
+  const iterType = [ [ Opcodes.local_get, localTmp(scope, '#forof_itertype' + count, Valtype.i32) ] ];
+
   out.push(
     // set pointer as right
     ...generate(scope, decl.right),
     Opcodes.i32_to_u,
     [ Opcodes.local_set, pointer ],
 
+    ...getNodeType(scope, decl.right),
+    [ Opcodes.local_set, localTmp(scope, '#forof_itertype' + count, Valtype.i32) ],
+
     // set counter as 0 (could be already used)
     ...number(0, Valtype.i32),
     [ Opcodes.local_set, counter ],
@@ -4260,8 +4263,6 @@ const generateForIn = (scope, decl) => {
     if (depth[i] === 'forin') count++;
   }
 
-  const iterType = getNodeType(scope, decl.right);
-
   const pointer = localTmp(scope, '#forin_base_pointer' + count, Valtype.i32);
   const length = localTmp(scope, '#forin_length' + count, Valtype.i32);
   const counter = localTmp(scope, '#forin_counter' + count, Valtype.i32);
@@ -4276,14 +4277,6 @@ const generateForIn = (scope, decl) => {
     ...number(0, Valtype.i32),
     [ Opcodes.local_set, counter ],
 
-    ...iterType,
-    ...number(TYPES.object, Valtype.i32),
-    [ Opcodes.i32_eq ],
-    [ Opcodes.i32_eqz ],
-    [ Opcodes.if, Blocktype.void ],
-      ...internalThrow(scope, 'TypeError', `Tried for..in on unsupported type`),
-    [ Opcodes.end ],
-
     // get length
     [ Opcodes.local_get, pointer ],
     [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
@@ -4313,70 +4306,64 @@ const generateForIn = (scope, decl) => {
 
   // set type for local
   // todo: optimize away counter and use end pointer
-  out.push(...typeSwitch(scope, iterType, {
-    [TYPES.object]: [
-      [ Opcodes.loop, Blocktype.void ],
-
-      // read key
-      [ Opcodes.local_get, pointer ],
-      [ Opcodes.i32_load, 0, 5 ],
-      [ Opcodes.local_tee, tmp ],
+  out.push(
+    [ Opcodes.loop, Blocktype.void ],
 
-      ...setType(scope, tmpName, [
-        [ Opcodes.i32_const, 31 ],
-        [ Opcodes.i32_shr_u ],
-        [ Opcodes.if, Valtype.i32 ],
-          // unset MSB in tmp
-          [ Opcodes.local_get, tmp ],
-          ...number(0x7fffffff, Valtype.i32),
-          [ Opcodes.i32_and ],
-          [ Opcodes.local_set, tmp ],
+    // read key
+    [ Opcodes.local_get, pointer ],
+    [ Opcodes.i32_load, 0, 5 ],
+    [ Opcodes.local_tee, tmp ],
 
-          [ Opcodes.i32_const, ...unsignedLEB128(TYPES.string) ],
-        [ Opcodes.else ],
-          [ Opcodes.i32_const, ...unsignedLEB128(TYPES.bytestring) ],
-        [ Opcodes.end ]
-      ]),
+    ...setType(scope, tmpName, [
+      [ Opcodes.i32_const, 31 ],
+      [ Opcodes.i32_shr_u ],
+      [ Opcodes.if, Valtype.i32 ],
+        // unset MSB in tmp
+        [ Opcodes.local_get, tmp ],
+        ...number(0x7fffffff, Valtype.i32),
+        [ Opcodes.i32_and ],
+        [ Opcodes.local_set, tmp ],
 
-      ...setVar,
+        [ Opcodes.i32_const, ...unsignedLEB128(TYPES.string) ],
+      [ Opcodes.else ],
+        [ Opcodes.i32_const, ...unsignedLEB128(TYPES.bytestring) ],
+      [ Opcodes.end ]
+    ]),
 
-      [ Opcodes.block, Blocktype.void ],
+    ...setVar,
 
-      // todo/perf: do not read key for non-enumerables
-      // only run body if entry is enumerable
-      [ Opcodes.local_get, pointer ],
-      [ Opcodes.i32_load8_u, 0, 17 ],
-      [ Opcodes.i32_const, 0b0100 ],
-      [ Opcodes.i32_and ],
-      [ Opcodes.if, Blocktype.void ],
-      ...generate(scope, decl.body),
-      [ Opcodes.end ],
+    [ Opcodes.block, Blocktype.void ],
 
-      // increment pointer by 14
-      [ Opcodes.local_get, pointer ],
-      ...number(14, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, pointer ],
+    // todo/perf: do not read key for non-enumerables
+    // only run body if entry is enumerable
+    [ Opcodes.local_get, pointer ],
+    [ Opcodes.i32_load8_u, 0, 17 ],
+    [ Opcodes.i32_const, 0b0100 ],
+    [ Opcodes.i32_and ],
+    [ Opcodes.if, Blocktype.void ],
+    ...generate(scope, decl.body),
+    [ Opcodes.end ],
 
-      // increment counter by 1
-      [ Opcodes.local_get, counter ],
-      ...number(1, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_tee, counter ],
+    // increment pointer by 14
+    [ Opcodes.local_get, pointer ],
+    ...number(14, Valtype.i32),
+    [ Opcodes.i32_add ],
+    [ Opcodes.local_set, pointer ],
 
-      // loop if counter != length
-      [ Opcodes.local_get, length ],
-      [ Opcodes.i32_ne ],
-      [ Opcodes.br_if, 1 ],
+    // increment counter by 1
+    [ Opcodes.local_get, counter ],
+    ...number(1, Valtype.i32),
+    [ Opcodes.i32_add ],
+    [ Opcodes.local_tee, counter ],
 
-      [ Opcodes.end ],
-      [ Opcodes.end ]
-    ],
+    // loop if counter != length
+    [ Opcodes.local_get, length ],
+    [ Opcodes.i32_ne ],
+    [ Opcodes.br_if, 1 ],
 
-    // todo: use Object.keys as fallback
-    // should be unreachable?
-    default: internalThrow(scope, 'TypeError', `Tried for..in on unsupported type`)
-  }, Blocktype.void));
+    [ Opcodes.end ],
+    [ Opcodes.end ]
+  );
 
   out.push([ Opcodes.end ]); // end if
 
@@ -4384,7 +4371,33 @@ const generateForIn = (scope, decl) => {
   depth.pop();
   depth.pop();
 
-  return out;
+  return typeSwitch(scope, getNodeType(scope, decl.right), {
+    // fast path for objects
+    [TYPES.object]: out,
+
+    // wrap for of object.keys
+    default: generate(scope, {
+      type: 'ForOfStatement',
+      left: decl.left,
+      body: decl.body,
+      right: {
+        type: 'CallExpression',
+        callee: {
+          type: 'Identifier',
+          name: '__Object_keys'
+        },
+        arguments: [ {
+          type: 'LogicalExpression',
+          left: decl.right,
+          operator: '??',
+          right: {
+            type: 'Literal',
+            value: 0
+          }
+        } ]
+      }
+    })
+  }, Blocktype.void);
 };
 
 const generateSwitch = (scope, decl) => {
@@ -5730,24 +5743,27 @@ const objectHack = node => {
 
   if (node.type === 'MemberExpression') {
     const out = (() => {
+      const abortOut = { ...node, object: objectHack(node.object) };
       if (node.computed || node.optional) return;
 
       // hack: block these properties as they can be accessed on functions
-      if (node.property.name === 'length' || node.property.name === 'name' || node.property.name === 'call') return;
+      if (node.property.name === 'length' || node.property.name === 'name' || node.property.name === 'call') return abortOut;
 
-      if (node.property.name === '__proto__') return;
+      if (node.property.name === '__proto__') return abortOut;
 
       let objectName = node.object.name;
 
       // if object is not identifier or another member exp, give up
-      if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
-      if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
+      if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return abortOut;
+      if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return abortOut;
 
       if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
       if (!objectName || (!objectHackers.includes(objectName) && !objectHackers.some(x => objectName.startsWith(`${x}_`)))) {
-        return;
+        return abortOut;
       }
 
+      if (objectName !== 'Object_prototype' && (node.property.name === 'propertyIsEnumerable' || node.property.name === 'hasOwnProperty' || node.property.name === 'isPrototypeOf')) return abortOut;
+
       const name = '__' + objectName + '_' + node.property.name;
       if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 

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