porffor 0.57.27 → 0.57.28

package/compiler/codegen.js

@@ -1255,28 +1255,16 @@ const generateBinaryExp = (scope, decl) => {
 const asmFuncToAsm = (scope, func, extra) => func(scope, {
   Valtype, Opcodes, TYPES, TYPE_NAMES, usedTypes, typeSwitch, makeString, internalThrow,
   getNodeType, generate, generateIdent,
-  builtin: (n, offset = false) => {
-    let idx = importedFuncs[n] ?? funcIndex[n];
-    if (idx == null && Object.hasOwn(builtinFuncs, n)) {
-      includeBuiltin(scope, n);
-      idx = funcIndex[n];
-    }
-
-    scope.includes ??= new Set();
-    scope.includes.add(n);
-
-    if (idx == null) throw new Error(`builtin('${n}') failed: could not find func (from ${scope.name})`);
+  builtin: (name, offset = false) => {
+    let idx = importedFuncs[name] ?? includeBuiltin(scope, name)?.index;
+    if (idx == null) throw new Error(`builtin('${name}') failed: could not find func (from ${scope.name})`);
     if (offset) idx -= importedFuncs.length;
 
     return idx;
   },
   hasFunc: x => funcIndex[x] != null,
   funcRef: name => {
-    if (funcIndex[name] == null && Object.hasOwn(builtinFuncs, name)) {
-      includeBuiltin(scope, name);
-    }
-
-    const func = funcByName(name);
+    const func = includeBuiltin(scope, name);
     return funcRef(func);
   },
   glbl: (opcode, name, type) => {
@@ -1340,7 +1328,7 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
     wasm = [];
   }
 
-  const existing = funcByName(name);
+  const existing = builtinFuncByName(name);
   if (existing) return existing;
 
   const allLocals = params.concat(localTypes);
@@ -2498,20 +2486,24 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           [ Opcodes.local_get, thisLocal ],
           [ Opcodes.local_get, thisLocalType ]
         ];
-        getCallee = [
-          ...generate(scope, object),
-          [ Opcodes.local_set, thisLocal ],
-          ...getNodeType(scope, object),
-          [ Opcodes.local_set, thisLocalType ],
-
-          ...generate(scope, {
-            type: 'MemberExpression',
-            object: { type: 'Identifier', name: tmpName + 'caller' },
-            property,
-            computed,
-            optional
-          })
-        ];
+        getCallee = generate(scope, {
+          type: 'MemberExpression',
+          object: {
+            type: 'Wasm',
+            wasm: () => [
+              ...generate(scope, object),
+              [ Opcodes.local_tee, thisLocal ],
+              ...getNodeType(scope, object),
+              [ Opcodes.local_set, thisLocalType ]
+            ],
+            _type: [
+              [ Opcodes.local_get, thisLocalType ]
+            ]
+          },
+          property,
+          computed,
+          optional
+        });
       }
     }
 
@@ -6539,6 +6531,13 @@ const funcByIndex = idx => {
 };
 const funcByName = name => funcByIndex(funcIndex[name]);
 
+const builtinFuncByName = name => {
+  const normal = funcByName(name);
+  if (!normal || normal.internal) return normal;
+
+  return funcs.find(x => x.name === name && x.internal);
+};
+
 const generateFunc = (scope, decl, forceNoExpr = false) => {
   doNotMarkFuncRef = false;
 

package/foo.js

@@ -0,0 +1,8 @@
+const a = {
+  b: {
+    c: () => {}
+  },
+  c: () => {}
+};
+
+a.c();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.57.27",
+  "version": "0.57.28",
   "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.27';
+globalThis.version = '0.57.28';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {