porffor 0.24.13 → 0.24.14

package/compiler/assemble.js

@@ -168,8 +168,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       let name = func.name;
 
       let argc = func.params.length;
-      if (func.newTarget) argc -= 2;
-      if (func.usesThis) argc -= 2;
+      if (func.constr) argc -= 4;
       if (!func.internal || func.typedParams) argc = Math.floor(argc / 2);
 
       // hack: argc-- for prototype methods to remove _this hack from count
@@ -178,10 +177,8 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       bytes.push(argc % 256, (argc / 256 | 0) % 256);
 
       let flags = 0b00000000; // 8 flag bits
-      if (func.returnType != null) flags |= 0b1;
+      if (func.returnType != null) flags |= 0b01;
       if (func.constr) flags |= 0b10;
-      if (func.newTarget) flags |= 0b100;
-      if (func.usesThis) flags |= 0b1000;
       bytes.push(flags);
 
       // eg: __String_prototype_toLowerCase -> toLowerCase

package/compiler/builtins/_internal_object.ts

@@ -198,10 +198,24 @@ i32.const 128
 return`;
     }
 
-    Porffor.wasm`
+    const funcFlags: i32 = Porffor.funcLut.flags(get);
+    if (funcFlags & 0b10) {
+      // constructor func, add new.target, this args
+      Porffor.wasm`
+f64.const 0
+i32.const 0
+local.get ${_this}
+f64.convert_i32_u
+local.get ${_this+1}
+local.get ${get}
+call_indirect 2 0
+return`;
+    } else {
+      Porffor.wasm`
 local.get ${get}
 call_indirect 0 0
 return`;
+    }
   }
 
   // data descriptor
@@ -262,11 +276,26 @@ export const __Porffor_object_set = (_this: object, key: any, value: any): any =
         return value;
       }
 
+      const funcFlags: i32 = Porffor.funcLut.flags(set);
+    if (funcFlags & 0b10) {
+      // constructor func, add new.target, this args
+      Porffor.wasm`
+f64.const 0
+i32.const 0
+local.get ${_this}
+f64.convert_i32_u
+i32.const 7
+local.get ${value}
+local.get ${value+1}
+local.get ${set}
+call_indirect 3 0`;
+    } else {
       Porffor.wasm`
 local.get ${value}
 local.get ${value+1}
 local.get ${set}
 call_indirect 1 0`;
+    }
 
       return value;
     }

package/compiler/builtins.js

@@ -1056,6 +1056,21 @@ export const BuiltinFuncs = function() {
     ]
   };
 
+  this.__Porffor_funcLut_flags = {
+    params: [ Valtype.i32 ],
+    returns: [ Valtype.i32 ],
+    returnType: TYPES.number,
+    wasm: (scope, { allocPage }) => [
+      [ Opcodes.local_get, 0 ],
+      ...number(128, Valtype.i32),
+      [ Opcodes.i32_mul ],
+      ...number(2, Valtype.i32),
+      [ Opcodes.i32_add ],
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
+    ],
+    table: true
+  };
+
   this.__Porffor_funcLut_length = {
     params: [ Valtype.i32 ],
     returns: [ Valtype.i32 ],