porffor 0.37.17 → 0.37.19

package/compiler/builtins/_internal_object.ts

@@ -489,36 +489,37 @@ export const __Porffor_object_define = (obj: any, key: any, value: any, flags: i
 
     if ((tail & 0b0010) == 0) {
       // not already configurable, check to see if we can redefine
-      if ((tail & 0b1111) != flags) {
-        // flags have changed, perform checks
-        let err: boolean = false;
-
-        // descriptor type (accessor/data) and/or flags (other than writable) have changed
-        if ((tail & 0b0111) != flags) err = true;
-          else if (!(tail & 0b0001) && !(tail & 0b1000)) {
-          // data descriptor and already non-writable only checks
-          // trying to change writable false -> true
-          if (flags & 0b1000) {
-            err = true;
-          } else {
-            // if already non-writable, check value isn't being changed
-            Porffor.wasm`
+      let err: boolean = false;
+
+      // descriptor type (accessor/data) and/or flags (other than writable) have changed
+      if ((tail & 0b0111) != (flags & 0b0111)) err = true;
+
+      if (!err && (tail & 0b1001) == 0) {
+        // data descriptor and already non-writable only checks
+        // trying to change writable false -> true
+        if (flags & 0b1000) {
+          err = true;
+        } else {
+          // if already non-writable, check value isn't being changed
+          Porffor.wasm`
 local.get ${entryPtr}
 f64.load 0 4
-local.get ${value}
-f64.ne
-
 local.get ${entryPtr}
 i32.load8_u 0 13
+
+local.get ${value}
 local.get ${value+1}
-i32.ne
-i32.or
+
+call __Object_is
+drop
+
+i32.trunc_sat_f64_u
+i32.eqz
 local.set ${err}`;
-          }
         }
-
-        if (err) throw new TypeError('Cannot redefine property');
       }
+
+      if (err) throw new TypeError('Cannot redefine property');
     }
   }
 

package/compiler/builtins_precompiled.js

@@ -91,7 +91,7 @@ params:[127,127,127,127,124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[127,127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","entryPtr","flags","#logicinner_tmp","#typeswitch_tmp1","size","tail","set","funcFlags"],
 };
 this.__Porffor_object_define = {
-wasm:(_,{t,builtin,internalThrow})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_makeObject')],[33,8],[252,2],[34,0],[32,8],[33,1],[26],[32,1],[65,7],[71],[4,64],[65,0],[65,128,1],[15],[11],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[33,8],[34,9],[65,127],[70],[4,64],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[33,8],[33,10],[32,8],[33,11],[2,127],...t([67,195],()=>[[32,11],[65,195,0],[70],[32,11],[65,195,1],[70],[114],[4,64],[32,10],[40,1,0],[12,1],[11]]),[32,10],[11],[4,64],...internalThrow(_,'TypeError',`Cannot define property, object is inextensible`),[11],[32,0],[40,0,0],[33,12],[32,0],[32,12],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,12],[65,14],[108],[106],[34,9],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,8],[26],[5],[32,9],[47,0,12],[34,13],[65,2],[113],[69],[4,64],[32,13],[65,15],[113],[32,6],[71],[4,64],[65,0],[33,14],[32,13],[65,7],[113],[32,6],[71],[4,64],[65,1],[33,14],[5],[32,13],[65,1],[113],[69],[34,15],[4,127],[32,13],[65,8],[113],[69],[65,2],[33,8],[5],[32,15],[65,2],[33,8],[11],[33,10],[32,8],[33,11],[2,127],...t([67,195],()=>[[32,11],[65,195,0],[70],[32,11],[65,195,1],[70],[114],[4,64],[32,10],[40,1,0],[12,1],[11]]),[32,10],[11],[4,64],[32,6],[65,8],[113],[4,64],[65,1],[33,14],[5],[32,9],[43,0,4],[32,4],[98],[32,9],[45,0,13],[32,5],[71],[114],[33,14],[11],[11],[11],[32,14],[4,64],...internalThrow(_,'TypeError',`Cannot redefine property`),[11],[11],[11],[11],[32,9],[32,4],[57,0,4],[32,9],[32,6],[32,5],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
+wasm:(_,{t,builtin,internalThrow})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_makeObject')],[33,8],[252,2],[34,0],[32,8],[33,1],[26],[32,1],[65,7],[71],[4,64],[65,0],[65,128,1],[15],[11],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[33,8],[34,9],[65,127],[70],[4,64],[32,0],[32,1],[16,builtin('__Porffor_object_isInextensible')],[33,8],[33,10],[32,8],[33,11],[2,127],...t([67,195],()=>[[32,11],[65,195,0],[70],[32,11],[65,195,1],[70],[114],[4,64],[32,10],[40,1,0],[12,1],[11]]),[32,10],[11],[4,64],...internalThrow(_,'TypeError',`Cannot define property, object is inextensible`),[11],[32,0],[40,0,0],[33,12],[32,0],[32,12],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,12],[65,14],[108],[106],[34,9],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,8],[26],[5],[32,9],[47,0,12],[34,13],[65,2],[113],[69],[4,64],[65,0],[33,14],[32,13],[65,7],[113],[32,6],[65,7],[113],[71],[4,64],[65,1],[33,14],[11],[32,14],[69],[34,15],[4,127],[32,13],[65,9],[113],[69],[65,2],[33,8],[5],[32,15],[65,2],[33,8],[11],[33,10],[32,8],[33,11],[2,127],...t([67,195],()=>[[32,11],[65,195,0],[70],[32,11],[65,195,1],[70],[114],[4,64],[32,10],[40,1,0],[12,1],[11]]),[32,10],[11],[4,64],[32,6],[65,8],[113],[4,64],[65,1],[33,14],[5],[32,9],[43,0,4],[32,9],[45,0,13],[32,4],[32,5],[16,builtin('__Object_is')],[26],[252,3],[69],[33,14],[11],[11],[32,14],[4,64],...internalThrow(_,'TypeError',`Cannot redefine property`),[11],[11],[11],[32,9],[32,4],[57,0,4],[32,9],[32,6],[32,5],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
 params:[127,127,127,127,124,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127,127,127,127,127,127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","flags","flags#type","#last_type","entryPtr","#logicinner_tmp","#typeswitch_tmp1","size","tail","err","logictmp"],
 };

package/compiler/codegen.js

@@ -2955,12 +2955,12 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       let symbols = {};
 
       for (const x of init.arguments[1].properties) {
-        const name = x.key.name;
+        const name = x.key.name || x.key.value;
         if (!usedNames.includes(name)) continue;
 
         let parameters, result;
         for (const y of x.value.properties) {
-          switch (y.key.name) {
+          switch (y.key.name || y.key.value) {
             case 'parameters':
               parameters = y.value.elements.map(z => z.value);
               break;
@@ -6399,4 +6399,4 @@ export default program => {
   // console.log([...usedTypes].map(x => TYPE_NAMES[x]));
 
   return { funcs, globals, tags, exceptions, pages, data };
-};
+};

package/compiler/pgo.js

@@ -197,7 +197,7 @@ export const run = obj => {
       }
     }
 
-    log += `  ${func.name}: identified ${counts[2]}/${total} local non-consistent domains${Prefs.verbosePgo ? ':' : ''}\n`;
+    log += `  ${func.name}: identified ${counts[2]}/${total} non-consistent locals domains${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
       for (let j = func.params.length; j < localData[i].length; j++) {
         if (domains[j] === false) continue;

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.17+5b3ce1ba8",
+  "version": "0.37.19+c791e7a87",
   "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.17+5b3ce1ba8';
+globalThis.version = '0.37.19+c791e7a87';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {