porffor 0.37.14 → 0.37.16

package/compiler/builtins/__internal_string.ts

@@ -17,8 +17,10 @@ export const __Porffor_strcmp = (a: any, b: any): boolean => {
       // bytestring, bytestring
       // this path is hyper-optimized as it is by far the most common and (perf) important
 
-      let ap: i32 = a - 28;
-      let bp: i32 = b - 28;
+      let ap32: i32 = a - 28;
+      let bp32: i32 = b - 28;
+      let ap8: i32 = a - 4;
+      let bp8: i32 = b - 4;
       Porffor.wasm`
 ;; load in 2 i64x2 chunks while length >= 32
 local.get ${al}
@@ -26,29 +28,28 @@ i32.const 32
 i32.ge_s
 if 64
   loop 64
-    local.get ${ap}
+    local.get ${ap32}
     local.get ${al}
     i32.add
     v128.load 0 0
 
-    local.get ${bp}
+    local.get ${bp32}
     local.get ${al}
     i32.add
     v128.load 0 0
-
     v128.xor
 
-    local.get ${ap}
+    local.get ${ap32}
     local.get ${al}
     i32.add
     v128.load 0 16
 
-    local.get ${bp}
+    local.get ${bp32}
     local.get ${al}
     i32.add
     v128.load 0 16
-
     v128.xor
+
     v128.or
     v128.any_true
     if 64
@@ -73,15 +74,15 @@ i32.const 8
 i32.ge_s
 if 64
   loop 64
-    local.get ${ap}
+    local.get ${ap8}
     local.get ${al}
     i32.add
-    i64.load 0 24
+    i64.load 0 0
 
-    local.get ${bp}
+    local.get ${bp8}
     local.get ${al}
     i32.add
-    i64.load 0 24
+    i64.load 0 0
 
     i64.ne
     if 64

package/compiler/builtins_precompiled.js

@@ -17,9 +17,9 @@ usedTypes:[80,7,195],
 globalInits:{underlyingKeys:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: __internal_object.ts/underlyingKeys','f64'),124),...glbl(36,'underlyingKeys',124),...glbl(35,'underlyingKeys',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]],underlyingVals:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: __internal_object.ts/underlyingVals','f64'),124),...glbl(36,'underlyingVals',124),...glbl(35,'underlyingVals',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]]},data:{"bytestring: __Porffor_object_makeObject/key1":[9,0,0,0,112,114,111,116,111,116,121,112,101],"bytestring: __Porffor_object_makeObject/key2":[11,0,0,0,99,111,110,115,116,114,117,99,116,111,114]},
 };
 this.__Porffor_strcmp = {
-wasm:()=>[[32,0],[32,2],[70],[4,64],[65,1],[65,2],[15],[11],[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,4],[32,5],[71],[4,64],[65,0],[65,2],[15],[11],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[32,0],[65,28],[107],[33,6],[32,2],[65,28],[107],[33,7],[32,4],[65,32],[78],[4,64],[3,64],[32,6],[32,4],[106],[253,0,0,0],[32,7],[32,4],[106],[253,0,0,0],[253,81],[32,6],[32,4],[106],[253,0,0,16],[32,7],[32,4],[106],[253,0,0,16],[253,81],[253,80],[253,83],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,32],[107],[34,4],[65,32],[78],[13,0],[11],[11],[32,4],[65,8],[78],[4,64],[3,64],[32,6],[32,4],[106],[41,0,24],[32,7],[32,4],[106],[41,0,24],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,8],[107],[34,4],[65,8],[78],[13,0],[11],[11],[32,4],[65,2],[78],[4,64],[3,64],[32,0],[32,4],[106],[47,0,2],[32,2],[32,4],[106],[47,0,2],[71],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,2],[107],[34,4],[65,2],[78],[13,0],[11],[11],[32,4],[65,1],[70],[4,64],[32,0],[45,0,4],[32,2],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[106],[45,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[5],[32,0],[65,4],[107],[33,6],[32,2],[65,4],[107],[33,7],[3,64],[32,6],[32,4],[65,2],[108],[106],[41,0,0],[32,7],[32,4],[65,2],[108],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,4],[107],[34,4],[65,4],[78],[13,0],[11],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[11],[65,0],[65,128,1],[15]],
+wasm:()=>[[32,0],[32,2],[70],[4,64],[65,1],[65,2],[15],[11],[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,4],[32,5],[71],[4,64],[65,0],[65,2],[15],[11],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[32,0],[65,28],[107],[33,6],[32,2],[65,28],[107],[33,7],[32,0],[65,4],[107],[33,8],[32,2],[65,4],[107],[33,9],[32,4],[65,32],[78],[4,64],[3,64],[32,6],[32,4],[106],[253,0,0,0],[32,7],[32,4],[106],[253,0,0,0],[253,81],[32,6],[32,4],[106],[253,0,0,16],[32,7],[32,4],[106],[253,0,0,16],[253,81],[253,80],[253,83],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,32],[107],[34,4],[65,32],[78],[13,0],[11],[11],[32,4],[65,8],[78],[4,64],[3,64],[32,8],[32,4],[106],[41,0,0],[32,9],[32,4],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,8],[107],[34,4],[65,8],[78],[13,0],[11],[11],[32,4],[65,2],[78],[4,64],[3,64],[32,0],[32,4],[106],[47,0,2],[32,2],[32,4],[106],[47,0,2],[71],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,2],[107],[34,4],[65,2],[78],[13,0],[11],[11],[32,4],[65,1],[70],[4,64],[32,0],[45,0,4],[32,2],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,10],[3,64],[32,10],[32,4],[72],[4,64],[32,0],[32,10],[106],[45,0,4],[32,2],[32,10],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,10],[65,1],[106],[33,10],[12,1],[11],[11],[65,1],[65,2],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,0],[33,10],[3,64],[32,10],[32,4],[72],[4,64],[32,0],[32,10],[65,2],[108],[106],[47,0,4],[32,2],[32,10],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,10],[65,1],[106],[33,10],[12,1],[11],[11],[65,1],[65,2],[15],[5],[32,0],[65,4],[107],[33,11],[32,2],[65,4],[107],[33,12],[3,64],[32,11],[32,4],[65,2],[108],[106],[41,0,0],[32,12],[32,4],[65,2],[108],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,4],[107],[34,4],[65,4],[78],[13,0],[11],[65,0],[33,10],[3,64],[32,10],[32,4],[72],[4,64],[32,0],[32,10],[65,2],[108],[106],[47,0,4],[32,2],[32,10],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,10],[65,1],[106],[33,10],[12,1],[11],[11],[65,1],[65,2],[15],[11],[11],[65,0],[65,128,1],[15]],
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127,127,127],localNames:["a","a#type","b","b#type","al","bl","ap","bp","i"],
+locals:[127,127,127,127,127,127,127,127,127],localNames:["a","a#type","b","b#type","al","bl","ap32","bp32","ap8","bp8","i","ap","bp"],
 };
 this.__Porffor_strcat = {
 wasm:(_,{builtin})=>[[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[65,4],[32,4],[106],[32,5],[106],[16,builtin('__Porffor_allocateBytes')],[34,6],[32,4],[32,5],[106],[54,0,0],[32,6],[65,4],[106],[32,0],[65,4],[106],[32,4],[252,10,0,0],[32,6],[65,4],[106],[32,4],[106],[32,2],[65,4],[106],[32,5],[252,10,0,0],[32,6],[65,195,1],[15],[5],[65,4],[32,4],[32,5],[106],[65,2],[108],[106],[16,builtin('__Porffor_allocateBytes')],[34,6],[32,4],[32,5],[106],[54,0,0],[65,0],[33,7],[3,64],[32,7],[32,4],[72],[4,64],[32,6],[32,7],[65,2],[108],[106],[32,0],[32,7],[106],[45,0,4],[59,0,4],[32,7],[65,1],[106],[33,7],[12,1],[11],[11],[32,6],[65,4],[106],[32,4],[65,2],[108],[106],[32,2],[65,4],[106],[32,5],[65,2],[108],[252,10,0,0],[32,6],[65,195,0],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,4],[32,4],[32,5],[106],[65,2],[108],[106],[16,builtin('__Porffor_allocateBytes')],[34,6],[32,4],[32,5],[106],[54,0,0],[32,6],[65,4],[106],[32,0],[65,4],[106],[32,4],[65,2],[108],[252,10,0,0],[32,6],[32,4],[65,2],[108],[106],[33,8],[65,0],[33,7],[3,64],[32,7],[32,5],[72],[4,64],[32,8],[32,7],[65,2],[108],[106],[32,2],[32,7],[106],[45,0,4],[59,0,4],[32,7],[65,1],[106],[33,7],[12,1],[11],[11],[32,6],[65,195,0],[15],[5],[65,4],[32,4],[32,5],[106],[65,2],[108],[106],[16,builtin('__Porffor_allocateBytes')],[34,6],[32,4],[32,5],[106],[54,0,0],[32,6],[65,4],[106],[32,0],[65,4],[106],[32,4],[65,2],[108],[252,10,0,0],[32,6],[65,4],[106],[32,4],[65,2],[108],[106],[32,2],[65,4],[106],[32,5],[65,2],[108],[252,10,0,0],[32,6],[65,195,0],[15],[11],[11],[65,0],[65,128,1],[15]],

package/compiler/codegen.js

@@ -1170,7 +1170,15 @@ const setType = (scope, _name, type) => {
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
   if (Object.hasOwn(scope.locals, name)) {
-    if (scope.locals[name]?.metadata?.type != null) return [];
+    if (scope.locals[name]?.metadata?.type != null) {
+      const metadata = scope.locals[name].metadata;
+      if (metadata.inferredType && knownType(scope, type) !== metadata.type) {
+        delete metadata.type;
+        delete metadata.inferredType;
+      }
+
+      return [];
+    }
 
     const typeLocal = scope.locals[name + '#type'];
     if (typeLocal) return [
@@ -1183,7 +1191,15 @@ const setType = (scope, _name, type) => {
   }
 
   if (Object.hasOwn(globals, name)) {
-    if (globals[name]?.metadata?.type != null) return [];
+    if (globals[name]?.metadata?.type != null) {
+      const metadata = globals[name].metadata;
+      if (metadata.inferredType && knownType(scope, type) !== metadata.type) {
+        delete metadata.type;
+        delete metadata.inferredType;
+      }
+
+      return [];
+    }
 
     const typeLocal = globals[name + '#type'];
     if (typeLocal) return [
@@ -2599,15 +2615,12 @@ const knownType = (scope, type) => {
     return read_signedLEB128(type[0].slice(1));
   }
 
-  if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
+  if (type.length === 1 && type[0][0] === Opcodes.local_get) {
     const idx = type[0][1];
 
     // type idx = var idx + 1
     const name = Object.values(scope.locals).find(x => x.idx === idx)?.name;
-    if (name) {
-      const local = scope.locals[name];
-      if (local.metadata?.type != null) return v.metadata.type;
-    }
+    if (scope.locals[name]?.metadata?.type != null) return v.metadata.type;
   }
 
   return null;
@@ -2962,14 +2975,25 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     // let generated;
     // if (init) generated = generate(scope, init, global, name);
 
-    const typed = typedInput && pattern.typeAnnotation;
-    let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(pattern).type != null));
-    addVarMetadata(scope, name, global, { kind });
+    const typed = typedInput && pattern.typeAnnotation && extractTypeAnnotation(pattern);
+    let idx = allocVar(scope, name, global, !(typed && typed.type != null));
 
+    let metadata = { kind };
     if (typed) {
-      addVarMetadata(scope, name, global, extractTypeAnnotation(pattern));
+      metadata = {
+        ...metadata,
+        ...typed
+      };
+    } else if (init) {
+      const knownInit = knownType(scope, getNodeType(scope, init));
+      if (knownInit != null) {
+        metadata.type = knownInit;
+        metadata.inferredType = true;
+      }
     }
 
+    addVarMetadata(scope, name, global, metadata);
+
     if (init) {
       const alreadyArray = scope.arrays?.get(name) != null;
 
@@ -3502,7 +3526,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
         [TYPES.undefined]: internalThrow(scope, 'TypeError', 'Cannot set property of undefined', true),
 
         // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
-        default: [
+        default: () => [
           ...objectWasm,
           Opcodes.i32_to_u,
           ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),

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.14+ebe5bcdbc",
+  "version": "0.37.16+2b7968825",
   "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.14+ebe5bcdbc';
+globalThis.version = '0.37.16+2b7968825';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {