porffor 0.57.31 → 0.57.33

package/compiler/builtins_objects.js

@@ -2,7 +2,7 @@ import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { TYPES } from './types.js';
 import { number } from './encoding.js';
 
-export default function({ builtinFuncs }, Prefs) {
+export default function ({ builtinFuncs }, Prefs) {
   const makePrefix = name => (name.startsWith('__') ? '' : '__') + name + '_';
 
   const done = new Set();
@@ -72,16 +72,15 @@ export default function({ builtinFuncs }, Prefs) {
             continue;
           }
 
-          let flags = 0b0000;
+          let add = true;
+          if (existingFunc && (x === 'prototype' || x === 'constructor')) add = false;
 
+          let flags = 0b0000;
           const d = props[x];
           if (d.configurable) flags |= 0b0010;
           if (d.enumerable) flags |= 0b0100;
           if (d.writable) flags |= 0b1000;
 
-          // hack: do not generate objects inside of objects as it causes issues atm
-          if (this[prefix + x]?.type === TYPES.object && this[prefix + x] !== this.null) value = { type: 'ObjectExpression', properties: [] };
-
           out.push(
             [ Opcodes.local_get, 0 ],
             number(TYPES.object, Valtype.i32),
@@ -96,7 +95,7 @@ export default function({ builtinFuncs }, Prefs) {
             number(flags, Valtype.i32),
             number(TYPES.number, Valtype.i32),
 
-            [ Opcodes.call, builtin('__Porffor_object_fastAdd') ]
+            [ Opcodes.call, builtin(add ? '__Porffor_object_fastAdd' : '__Porffor_object_define') ]
           );
         }
 
@@ -170,11 +169,20 @@ export default function({ builtinFuncs }, Prefs) {
     const prefix = makePrefix(name);
     return builtinFuncKeys.filter(x => x.startsWith(prefix)).map(x => x.slice(prefix.length)).filter(x => !x.startsWith('prototype_'));
   };
-  const autoFuncs = name => props({
-    writable: true,
-    enumerable: false,
-    configurable: true
-  }, autoFuncKeys(name));
+  const autoFuncs = name => ({
+    ...props({
+      writable: true,
+      enumerable: false,
+      configurable: true
+    }, autoFuncKeys(name)),
+    ...(this[`__${name}_prototype`] ? {
+      prototype: {
+        writable: false,
+        enumerable: false,
+        configurable: false
+      }
+    } : {})
+  });
 
   object('Math', {
     ...props({
@@ -248,28 +256,16 @@ export default function({ builtinFuncs }, Prefs) {
       NaN: NaN,
       POSITIVE_INFINITY: Infinity,
       NEGATIVE_INFINITY: -Infinity,
-
       MAX_VALUE: valtype === 'i32' ? 2147483647 : 1.7976931348623157e+308,
       MIN_VALUE: valtype === 'i32' ? -2147483648 : 5e-324,
-
       MAX_SAFE_INTEGER: valtype === 'i32' ? 2147483647 : 9007199254740991,
       MIN_SAFE_INTEGER: valtype === 'i32' ? -2147483648 : -9007199254740991,
-
       EPSILON: 2.220446049250313e-16
     }),
 
     ...autoFuncs('Number')
   });
 
-  object('Reflect', autoFuncs('Reflect'));
-  object('Object', autoFuncs('Object'));
-  object('JSON', autoFuncs('JSON'));
-  object('Promise', autoFuncs('Promise'));
-  object('Array', autoFuncs('Array'));
-  object('Symbol', autoFuncs('Symbol'));
-  object('Date', autoFuncs('Date'));
-  object('Atomics', autoFuncs('Atomics'));
-
   // these technically not spec compliant as it should be classes or non-enumerable but eh
   object('navigator', {
     ...props({
@@ -286,13 +282,15 @@ export default function({ builtinFuncs }, Prefs) {
     'crypto',
     'performance',
   ]) {
-    object(x, {
-      ...props({
-        writable: true,
-        enumerable: true,
-        configurable: true
-      }, autoFuncKeys(x).slice(0, 12))
-    });
+    object(x, props({
+      writable: true,
+      enumerable: true,
+      configurable: true
+    }, autoFuncKeys(x).slice(0, 12)));
+  }
+
+  for (const x of [ 'Array', 'ArrayBuffer', 'Atomics', 'Date', 'Error', 'JSON', 'Object', 'Promise', 'Reflect', 'String', 'Symbol', 'Uint8Array', 'Int8Array', 'Uint8ClampedArray', 'Uint16Array', 'Int16Array', 'Uint32Array', 'Int32Array', 'Float32Array', 'Float64Array', 'BigInt64Array', 'BigUint64Array', 'SharedArrayBuffer', 'BigInt', 'Boolean', 'DataView', 'AggregateError', 'TypeError', 'ReferenceError', 'SyntaxError', 'RangeError', 'EvalError', 'URIError', 'Function', 'Map', 'RegExp', 'Set', 'WeakMap', 'WeakRef', 'WeakSet' ]) {
+    object(x, autoFuncs(x));
   }
 
   const enumerableGlobals = [ 'atob', 'btoa', 'performance', 'crypto', 'navigator' ];
@@ -334,7 +332,6 @@ export default function({ builtinFuncs }, Prefs) {
 
   if (Prefs.logMissingObjects) for (const x of Object.keys(builtinFuncs).concat(Object.keys(this))) {
     if (!x.startsWith('__')) continue;
-
     const name = x.split('_').slice(2, -1).join('_');
 
     let t = globalThis;

package/compiler/builtins_precompiled.js

@@ -133,13 +133,13 @@ locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],loc
 table:1,usesTag:1,
 }
 this.__Porffor_object_setStrict = {
-wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>eval("[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,\"__proto__\",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[252,2],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with no setter of object`),[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[252,2],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]]"),
+wasm:(_,{i32ify,t,makeString,builtin,internalThrow})=>eval("[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,6],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,2],[32,3],[16,builtin('__Porffor_object_hash')],[33,7],[32,0],[32,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[70],[4,64],[32,7],[65,248,187,246,154,2],[70],[4,64],[32,2],[32,3],...i32ify(makeString(_,\"__proto__\",1)),[65,195,1],[16,builtin('__Porffor_strcmp')],[4,64],[32,0],[32,1],[32,4],[252,2],[32,5],[16,builtin('__Porffor_object_setPrototype')],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[34,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,14],[32,11],[33,15],[3,64],[65,1],[4,64],[32,10],[32,11],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_lookup')],[34,8],[65,127],[71],[4,64],[12,1],[26],[11],[32,10],[32,11],[16,builtin('__Porffor_object_getPrototype')],[34,6],[33,11],[33,10],[32,11],[65,7],[71],[4,64],[32,10],[183],[32,11],[16,builtin('__Porffor_object_underlying')],[34,6],[33,11],[33,10],[11],[32,10],[33,12],[32,11],[33,13],[2,127],...t([0,128],()=>[[32,13],[69],[32,13],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,13],[65,7],[70],[4,64],[32,12],[69],[12,1],[11]]),[65,0],[11],[32,10],[32,14],[70],[114],[4,64],[12,1],[26],[11],[32,10],[33,14],[32,11],[33,15],[12,1],[11],[11],[32,8],[65,127],[71],[4,64],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with only getter`),[26],[11],[32,17],[33,20],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,20],[17,12,0],[33,6],[252,2],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,22],[32,0],[32,22],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,22],[65,18],[108],[106],[34,8],[65,1],[32,2],[32,3],[32,7],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,9],[5],[32,8],[47,0,16],[34,16],[65,1],[113],[4,64],[32,8],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,6],[34,17],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with only getter`),[26],[11],[32,17],[33,23],[65,0],[65,128,1],[33,21],[183],[32,21],[32,0],[34,18],[32,1],[34,19],[33,21],[183],[32,21],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,23],[17,12,0],[33,6],[252,2],[26],[32,4],[32,5],[15],[26],[11],[32,16],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,16],[65,255,1],[113],[33,9],[11],[32,8],[32,4],[57,0,8],[32,8],[32,9],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]]"),
 params:[127,127,127,127,124,127],typedParams:1,returns:[124,127],
 locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","hash","entryPtr","flags","proto","proto#type","#logicinner_tmp","#typeswitch_tmp1","lastProto","lastProto#type","tail","set","#call_val","#call_type","#indirect_8_callee","#swap","size","#indirect_9_callee"],
 table:1,usesTag:1,
 }
 this.__Porffor_object_setStrict_withHash = {
-wasm:(_,{t,builtin,internalThrow})=>eval("[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,8],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,9],[65,127],[70],[4,64],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,8],[33,12],[34,11],[33,13],[32,12],[33,14],[2,127],...t([0,128],()=>[[32,14],[69],[32,14],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,14],[65,7],[70],[4,64],[32,13],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,12],[65,7],[71],[4,64],[32,11],[183],[32,12],[16,builtin('__Porffor_object_underlying')],[34,8],[33,12],[33,11],[11],[32,11],[33,15],[32,12],[33,16],[3,64],[65,1],[4,64],[32,11],[32,12],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,9],[65,127],[71],[4,64],[12,1],[26],[11],[32,11],[32,12],[16,builtin('__Porffor_object_getPrototype')],[34,8],[33,12],[33,11],[32,12],[65,7],[71],[4,64],[32,11],[183],[32,12],[16,builtin('__Porffor_object_underlying')],[34,8],[33,12],[33,11],[11],[32,11],[33,13],[32,12],[33,14],[2,127],...t([0,128],()=>[[32,14],[69],[32,14],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,14],[65,7],[70],[4,64],[32,13],[69],[12,1],[11]]),[65,0],[11],[32,11],[32,15],[70],[114],[4,64],[12,1],[26],[11],[32,11],[33,15],[32,12],[33,16],[12,1],[11],[11],[32,9],[65,127],[71],[4,64],[32,9],[47,0,16],[34,17],[65,1],[113],[4,64],[32,9],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,8],[34,18],[69],[4,64],[32,4],[32,5],[15],[26],[11],[32,18],[33,21],[65,0],[65,128,1],[33,22],[183],[32,22],[32,0],[34,19],[32,1],[34,20],[33,22],[183],[32,22],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,21],[17,12,0],[33,8],[252,2],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,23],[32,0],[32,23],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,23],[65,18],[108],[106],[34,9],[65,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,10],[5],[32,9],[47,0,16],[34,17],[65,1],[113],[4,64],[32,9],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,8],[34,18],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with no setter of object`),[26],[11],[32,18],[33,24],[65,0],[65,128,1],[33,22],[183],[32,22],[32,0],[34,19],[32,1],[34,20],[33,22],[183],[32,22],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,24],[17,12,0],[33,8],[252,2],[26],[32,4],[32,5],[15],[26],[11],[32,17],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,17],[65,255,1],[113],[33,10],[11],[32,9],[32,4],[57,0,8],[32,9],[32,10],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]]"),
+wasm:(_,{t,builtin,internalThrow})=>eval("[[32,0],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property of null`),[26],[11],[32,1],[65,7],[71],[4,64],[32,0],[183],[32,1],[16,builtin('__Porffor_object_underlying')],[34,8],[33,1],[33,0],[32,1],[65,7],[71],[4,64],[32,4],[32,5],[15],[26],[11],[11],[32,0],[32,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,9],[65,127],[70],[4,64],[32,0],[32,1],[16,builtin('__Porffor_object_getPrototype')],[34,8],[33,12],[34,11],[33,13],[32,12],[33,14],[2,127],...t([0,128],()=>[[32,14],[69],[32,14],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,14],[65,7],[70],[4,64],[32,13],[69],[12,1],[11]]),[65,0],[11],[69],[4,64],[32,12],[65,7],[71],[4,64],[32,11],[183],[32,12],[16,builtin('__Porffor_object_underlying')],[34,8],[33,12],[33,11],[11],[32,11],[33,15],[32,12],[33,16],[3,64],[65,1],[4,64],[32,11],[32,12],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_lookup')],[34,9],[65,127],[71],[4,64],[12,1],[26],[11],[32,11],[32,12],[16,builtin('__Porffor_object_getPrototype')],[34,8],[33,12],[33,11],[32,12],[65,7],[71],[4,64],[32,11],[183],[32,12],[16,builtin('__Porffor_object_underlying')],[34,8],[33,12],[33,11],[11],[32,11],[33,13],[32,12],[33,14],[2,127],...t([0,128],()=>[[32,14],[69],[32,14],[65,128,1],[70],[114],[4,64],[65,1],[12,1],[11]]),...t([7],()=>[[32,14],[65,7],[70],[4,64],[32,13],[69],[12,1],[11]]),[65,0],[11],[32,11],[32,15],[70],[114],[4,64],[12,1],[26],[11],[32,11],[33,15],[32,12],[33,16],[12,1],[11],[11],[32,9],[65,127],[71],[4,64],[32,9],[47,0,16],[34,17],[65,1],[113],[4,64],[32,9],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,8],[34,18],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with only getter`),[26],[11],[32,18],[33,21],[65,0],[65,128,1],[33,22],[183],[32,22],[32,0],[34,19],[32,1],[34,20],[33,22],[183],[32,22],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,21],[17,12,0],[33,8],[252,2],[26],[32,4],[32,5],[15],[26],[11],[11],[11],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[4,64],...internalThrow(_,'TypeError',`Cannot add property to inextensible object`),[26],[11],[32,0],[47,0,0],[33,23],[32,0],[32,23],[65,1],[106],[59,0,0],[32,0],[65,8],[106],[32,23],[65,18],[108],[106],[34,9],[65,1],[32,2],[32,3],[32,6],[65,1],[16,builtin('__Porffor_object_writeKey')],[65,14],[33,10],[5],[32,9],[47,0,16],[34,17],[65,1],[113],[4,64],[32,9],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,8],[34,18],[69],[4,64],...internalThrow(_,'TypeError',`Cannot set property with only getter`),[26],[11],[32,18],[33,24],[65,0],[65,128,1],[33,22],[183],[32,22],[32,0],[34,19],[32,1],[34,20],[33,22],[183],[32,22],[32,4],[32,5],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[65,0],[183],[65,128,1],[32,24],[17,12,0],[33,8],[252,2],[26],[32,4],[32,5],[15],[26],[11],[32,17],[65,8],[113],[69],[4,64],...internalThrow(_,'TypeError',`Cannot modify read-only property of object`),[26],[11],[32,17],[65,255,1],[113],[33,10],[11],[32,9],[32,4],[57,0,8],[32,9],[32,10],[32,5],[65,8],[116],[106],[59,0,16],[32,4],[32,5],[15]]"),
 params:[127,127,127,127,124,127,127,127],typedParams:1,returns:[124,127],
 locals:[127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","hash","hash#type","#last_type","entryPtr","flags","proto","proto#type","#logicinner_tmp","#typeswitch_tmp1","lastProto","lastProto#type","tail","set","#call_val","#call_type","#indirect_10_callee","#swap","size","#indirect_11_callee"],
 table:1,usesTag:1,
@@ -1631,7 +1631,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__Error_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('Error'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_Error')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1657,7 +1657,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__AggregateError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('AggregateError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_AggregateError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1683,7 +1683,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__TypeError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('TypeError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_TypeError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1709,7 +1709,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__ReferenceError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('ReferenceError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_ReferenceError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1735,7 +1735,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__SyntaxError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('SyntaxError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_SyntaxError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1761,7 +1761,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__RangeError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('RangeError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_RangeError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1787,7 +1787,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__EvalError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('EvalError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_EvalError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }
@@ -1813,7 +1813,7 @@ locals:[127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type"
 constr:1,
 }
 this.__URIError_prototype_constructor$get = {
-wasm:(_,{funcRef})=>eval("[...funcRef('URIError'),[65,6],[15]]"),
+wasm:(_,{builtin})=>eval("[[16,builtin('#get_URIError')],[184],[65,6],[15]]"),
 params:[124,127],typedParams:1,returns:[124,127],
 locals:[],localNames:["_this","_this#type"],
 }

package/compiler/codegen.js

@@ -1294,15 +1294,21 @@ const asmFuncToAsm = (scope, func, extra) => func(scope, {
     scope.initedGlobals ??= new Set();
     if (!scope.initedGlobals.has(name)) {
       scope.initedGlobals.add(name);
-      if (scope.globalInits?.[name]) out.unshift(
-        [ Opcodes.global_get, globals[globalName + '#glbl_inited'].idx ],
-        [ Opcodes.i32_eqz ],
-        [ Opcodes.if, Blocktype.void ],
-        ...asmFuncToAsm(scope, scope.globalInits[name]),
-        number(1, Valtype.i32),
-        [ Opcodes.global_set, globals[globalName + '#glbl_inited'].idx ],
-        [ Opcodes.end ]
-      );
+      if (scope.globalInits?.[name]) {
+        if (typeof scope.globalInits[name] === 'function') {
+          out.unshift(
+            [ Opcodes.global_get, globals[globalName + '#glbl_inited'].idx ],
+            [ Opcodes.i32_eqz ],
+            [ Opcodes.if, Blocktype.void ],
+            ...asmFuncToAsm(scope, scope.globalInits[name]),
+            number(1, Valtype.i32),
+            [ Opcodes.global_set, globals[globalName + '#glbl_inited'].idx ],
+            [ Opcodes.end ]
+          );
+        } else {
+          globals[globalName].init = scope.globalInits[name];
+        }
+      }
     }
 
     return out;
@@ -1332,7 +1338,7 @@ const asmFuncToAsm = (scope, func, extra) => func(scope, {
   allocPage: (scope, name) => allocPage({ scope, pages }, name)
 }, extra);
 
-const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globals: globalTypes = [], globalInits = [], returns = [], returnType, localNames = [], globalNames = [], table = false, constr = false, hasRestArgument = false, usesTag = false, usesImports = false, returnTypes } = {}) => {
+const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globalInits = {}, returns = [], returnType, localNames = [], globalNames = [], table = false, constr = false, hasRestArgument = false, usesTag = false, usesImports = false, returnTypes } = {}) => {
   if (wasm == null) { // called with no built-in
     log.warning('codegen', `${name} has no built-in!`);
     wasm = [];
@@ -1364,28 +1370,8 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
   funcs.push(func);
   funcIndex[name] = func.index;
 
-  if (typeof wasm === 'function') {
-    if (globalThis.precompile) wasm = [];
-      else wasm = asmFuncToAsm(func, wasm);
-  }
-
-  if (globalTypes.length !== 0) {
-    // offset global ops for base global idx
-    let baseGlobalIdx, i = 0;
-    for (const type of globalTypes) {
-      if (baseGlobalIdx === undefined) baseGlobalIdx = globals['#ind'];
-
-      globals[globalNames[i] ?? `${name}_global_${i}`] = { idx: globals['#ind']++, type, init: globalInits[i] ?? 0 };
-      i++;
-    }
-
-    for (let i = 0; i < wasm.length; i++) {
-      const inst = wasm[i];
-      if (inst[0] === Opcodes.global_get || inst[0] === Opcodes.global_set) {
-        inst[1] += baseGlobalIdx;
-      }
-    }
-  }
+  if (globalThis.precompile) wasm = [];
+    else wasm = asmFuncToAsm(func, wasm);
 
   if (table) funcs.table = true;
   if (usesTag) {
@@ -2546,14 +2532,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           [ Opcodes.local_get, calleeLocal ],
           Opcodes.i32_to_u,
           [ Opcodes.call_indirect, args.length + 2, 0 ],
-          ...setLastType(scope),
-          ...(globalThis.precompile && valtypeBinary === Valtype.i32 ? [ Opcodes.i32_trunc_sat_f64_s ] : [])
+          ...setLastType(scope)
         ],
 
-        default: decl.optional ? withType(scope, [ number(UNDEFINED) ], TYPES.undefined)
+        default: decl.optional ? withType(scope, [ number(UNDEFINED, Valtype.f64) ], TYPES.undefined)
           : internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, Valtype.f64)
       }, Valtype.f64),
-      ...(valtypeBinary === Valtype.i32 && scope.returns[0] !== Valtype.f64 ? [ [ Opcodes.f64_convert_i32_s ] ] : [])
+      ...(valtypeBinary === Valtype.i32 ? [ Opcodes.i32_trunc_sat_f64_s ] : [])
     ];
   }
 
@@ -3639,6 +3624,71 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
   const op = decl.operator.slice(0, -1) || '=';
 
+  // short-circuit behavior for logical assignment operators
+  if (op === '||' || op === '&&' || op === '??') {
+    // for logical assignment ops, it is not left @= right -> left = left @ right
+    // instead, left @ (left = right)
+    // eg, x &&= y -> x && (x = y)
+    if (local !== undefined) {
+      // fast path: just assigning to a local
+      setInferred(scope, name, knownType(scope, getNodeType(scope, decl)), isGlobal);
+      return [
+        ...performOp(scope, op, [
+          [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
+        ], [
+          ...generate(scope, decl.right, isGlobal, name),
+          [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+          [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
+        ], getType(scope, name), getNodeType(scope, decl.right)),
+        ...setType(scope, name, getLastType(scope), true)
+      ];
+    } else if (type === 'MemberExpression' && decl.left.computed) {
+      // special path: cache properties for computed members so they are not evaluated twice
+      // eg, x[y] &&= z -> (a = y, x[a] = (x[a] = z))
+      const propTmp = localTmp(scope, '#logical_prop');
+      const propTypeTmp = localTmp(scope, '#logical_prop#type', Valtype.i32);
+
+      const member = {
+        type: 'MemberExpression',
+        object: decl.left.object,
+        property: { type: 'Identifier', name: '#logical_prop' },
+        computed: true
+      };
+
+      return [
+        ...generate(scope, decl.left.property),
+        [ Opcodes.local_set, propTmp ],
+        ...getNodeType(scope, decl.left.property),
+        [ Opcodes.local_set, propTypeTmp ],
+
+        ...generate(scope, {
+          type: 'LogicalExpression',
+          operator: op,
+          left: member,
+          right: {
+            type: 'AssignmentExpression',
+            operator: '=',
+            left: member,
+            right: decl.right
+          }
+        }, _global, _name, valueUnused)
+      ];
+    } else {
+      // other: generate as LogicalExpression
+      return generate(scope, {
+        type: 'LogicalExpression',
+        operator: op,
+        left: decl.left,
+        right: {
+          type: 'AssignmentExpression',
+          operator: '=',
+          left: decl.left,
+          right: decl.right
+        }
+      }, _global, _name, valueUnused);
+    }
+  }
+
   // hack: .length setter
   if (type === 'MemberExpression' && decl.left.property.name === 'length' && !decl._internalAssign) {
     const newValueTmp = !valueUnused && localTmp(scope, '__length_setter_tmp');
@@ -4074,27 +4124,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     return out;
   }
 
-  if (op === '||' || op === '&&' || op === '??') {
-    // todo: is this needed?
-    // for logical assignment ops, it is not left @= right ~= left = left @ right
-    // instead, left @ (left = right)
-    // eg, x &&= y ~= x && (x = y)
-
-    setInferred(scope, name, knownType(scope, getNodeType(scope, decl)), isGlobal);
-
-    return [
-      ...performOp(scope, op, [
-        [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
-      ], [
-        ...generate(scope, decl.right, isGlobal, name),
-        [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-        [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
-      ], getType(scope, name), getNodeType(scope, decl.right)),
-
-      ...setType(scope, name, getLastType(scope), true)
-    ];
-  }
-
   const out = setLocalWithType(
     scope, name, isGlobal,
     performOp(scope, op, [
@@ -7089,7 +7118,7 @@ const internalConstrs = {
   }
 };
 
-let globals, tags, exceptions, funcs, indirectFuncs, funcIndex, currentFuncIndex, depth, pages, data, typeswitchDepth, usedTypes, coctc, globalInfer, builtinFuncs, builtinVars, prototypeFuncs;
+let globals, tags, exceptions, funcs, indirectFuncs, funcIndex, currentFuncIndex, depth, pages, data, typeswitchDepth, usedTypes, coctc, globalInfer, builtinFuncs, builtinVars, prototypeFuncs, lastValtype;
 export default program => {
   globals = { ['#ind']: 0 };
   tags = [];
@@ -7119,12 +7148,16 @@ export default program => {
   Opcodes.load = valtypeBinary === Valtype.i32 ? Opcodes.i32_load : Opcodes.f64_load;
   Opcodes.store = valtypeBinary === Valtype.i32 ? Opcodes.i32_store : Opcodes.f64_store;
 
-  builtinFuncs = new BuiltinFuncs();
-  builtinVars = new BuiltinVars({ builtinFuncs });
-  prototypeFuncs = new PrototypeFuncs();
+  // keep builtins between compiles as much as possible
+  if (lastValtype !== valtypeBinary) {
+    lastValtype = valtypeBinary;
+    builtinFuncs = new BuiltinFuncs();
+    builtinVars = new BuiltinVars({ builtinFuncs });
+    prototypeFuncs = new PrototypeFuncs();
 
-  const getObjectName = x => x.startsWith('__') && x.slice(2, x.indexOf('_', 2));
-  objectHackers = ['assert', 'compareArray', 'Test262Error', ...new Set(Object.keys(builtinFuncs).map(getObjectName).concat(Object.keys(builtinVars).map(getObjectName)).filter(x => x))];
+    const getObjectName = x => x.startsWith('__') && x.slice(2, x.indexOf('_', 2));
+    objectHackers = ['assert', 'compareArray', 'Test262Error', ...new Set(Object.keys(builtinFuncs).map(getObjectName).concat(Object.keys(builtinVars).map(getObjectName)).filter(x => x))];
+  }
 
   const [ main ] = generateFunc({}, {
     type: 'Program',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.57.31",
+  "version": "0.57.33",
   "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.31';
+globalThis.version = '0.57.33';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -68,7 +68,7 @@ if (process.argv.includes('--help') || process.argv.includes('-h')) {
       'exception-mode': 'Exception mode to use (lut|\x1B[1mstack\x1B[0m)',
       'fast-length': 'Non-compliant optimization to make .length faster',
       'profile-compiler': 'Log general compiler performance (on by default when compiling to a file)',
-      prng: 'PRNG algorithm to use (lcg32|xorshift32+|xorshift64+|\x1B[1mxorshift128+\x1B[0m|xoroshiro128+|xoshiro128+)'
+      prng: 'PRNG algorithm to use (xorshift32+|xorshift64+|\x1B[1mxorshift128+\x1B[0m|xoroshiro128+|xoshiro128+)'
     })) {
       flag = '-' + flag;
       if (flag.length > 3) flag = '-' + flag;