porffor 0.47.6 → 0.47.7

package/compiler/codegen.js

@@ -8,8 +8,8 @@ import { TYPES, TYPE_FLAGS, TYPE_NAMES, typeHasFlag } from './types.js';
 import * as Rhemyn from '../rhemyn/compile.js';
 import parse from './parse.js';
 import { log } from './log.js';
-import {} from './prefs.js';
-import makeAllocator from './allocators.js';
+import './prefs.js';
+import { allocPage as _allocPage, allocBytes, allocStr, nameToReason } from './allocator.js';
 
 let globals = {};
 let tags = [];
@@ -18,7 +18,6 @@ let exceptions = [];
 let funcIndex = {};
 let currentFuncIndex = importedFuncs.length;
 let builtinFuncs = {}, builtinVars = {}, prototypeFuncs = {};
-let allocator;
 
 class TodoError extends Error {
   constructor(message) {
@@ -191,6 +190,7 @@ const forceDuoValtype = (scope, wasm, forceValtype) => [
 ];
 
 const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
+  if (valueUnused && !Prefs.optUnused) valueUnused = false;
   if (astCache.has(decl)) return astCache.get(decl);
 
   switch (decl.type) {
@@ -240,7 +240,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateVar(scope, decl));
 
     case 'AssignmentExpression':
-      return cacheAst(decl, generateAssign(scope, decl));
+      return cacheAst(decl, generateAssign(scope, decl, global, name, valueUnused));
 
     case 'UnaryExpression':
       return cacheAst(decl, generateUnary(scope, decl));
@@ -297,7 +297,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, [[ Opcodes.call, importedFuncs.debugger ]]);
 
     case 'ArrayExpression':
-      return cacheAst(decl, generateArray(scope, decl, global, name));
+      return cacheAst(decl, generateArray(scope, decl, global, name, globalThis.precompile));
 
     case 'ObjectExpression':
       return cacheAst(decl, generateObject(scope, decl, global, name));
@@ -348,10 +348,12 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
         return cacheAst(decl, []);
       }
 
-      return cacheAst(decl, todo(scope, `no generation for ${decl.type}!`));
+      return cacheAst(decl, todo(scope, `no generation for ${decl.type}!`, !decl.type.endsWith('Statement') && !decl.type.endsWith('Declaration')));
   }
 };
 
+const optional = (op, clause = op.at(-1)) => clause || clause === 0 ? (Array.isArray(op[0]) ? op : [ op ]) : [];
+
 const lookupName = (scope, name) => {
   if (Object.hasOwn(scope.locals, name)) return [ scope.locals[name], false ];
   if (Object.hasOwn(globals, name)) return [ globals[name], true ];
@@ -363,7 +365,7 @@ const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysV
   ...generate(scope, {
     type: 'ThrowStatement',
     argument: {
-      type: 'NewExpression',
+      type: 'CallExpression',
       callee: {
         type: 'Identifier',
         name: constructor
@@ -415,7 +417,7 @@ const generateIdent = (scope, decl) => {
 
         return generateArray(scope, {
           elements: names.map(x => ({ type: 'Identifier', name: x }))
-        }, false, '#arguments');
+        }, false, '#arguments', true);
       }
 
       // no local var with name
@@ -1124,7 +1126,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
 
 const asmFuncToAsm = (scope, func) => {
   return func(scope, {
-    Valtype, Opcodes, TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage, internalThrow,
+    Valtype, Opcodes, TYPES, TYPE_NAMES, typeSwitch, makeString, allocPage, internalThrow,
     getNodeType, generate, generateIdent,
     builtin: (n, offset = false) => {
       let idx = funcIndex[n] ?? importedFuncs[n];
@@ -1197,6 +1199,10 @@ const asmFuncToAsm = (scope, func) => {
           return [];
         }, 0 ] ];
       }
+    },
+    i32ify: wasm => {
+      wasm.push(Opcodes.i32_to_u);
+      return wasm;
     }
   });
 };
@@ -1219,6 +1225,7 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
   }
 
   for (const x in _data) {
+    if (data.find(y => y.page === x)) return;
     data.push({ page: x, bytes: _data[x] });
   }
 
@@ -1628,7 +1635,7 @@ const generateLiteral = (scope, decl, global, name) => {
       return number(decl.value ? 1 : 0);
 
     case 'string':
-      return makeString(scope, decl.value, global, name);
+      return makeString(scope, decl.value);
 
     default:
       return todo(scope, `cannot generate literal of type ${typeof decl.value}`, true);
@@ -1653,14 +1660,17 @@ const countLeftover = wasm => {
     if (inst[0] === Opcodes.end) depth--;
 
     if (depth === 0)
-      if ([Opcodes.throw, Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
+      if ([Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
         else if ([Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.f32_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x04)) {}
         else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const, Opcodes.memory_size].includes(inst[0])) count++;
         else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.f32_store, Opcodes.i32_store16, Opcodes.i32_store8, Opcodes.select].includes(inst[0])) count -= 2;
         else if (inst[0] === Opcodes.memory_copy[0] && (inst[1] === Opcodes.memory_copy[1] || inst[1] === Opcodes.memory_init[1])) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
         else if (inst[0] === Opcodes.catch) count += 2;
-        else if (inst[0] === Opcodes.call) {
+        else if (inst[0] === Opcodes.throw) {
+          count--;
+          if ((Prefs.exceptionMode ?? 'stack') === 'stack' || (globalThis.precompile && inst[1] === 1)) count--;
+        } else if (inst[0] === Opcodes.call) {
           if (inst[1] < importedFuncs.length) {
             const func = importedFuncs[inst[1]];
             count = count - func.params + func.returns;
@@ -1674,7 +1684,7 @@ const countLeftover = wasm => {
           count += 2; // fixed return (value, type)
         } else count--;
 
-    // console.log(count, depth, decompile([ inst ]).slice(0, -1));
+    // console.log(count, depth, decompile([ inst ], undefined, undefined, undefined, undefined, undefined, funcs).slice(0, -1));
   }
 
   return count;
@@ -1694,7 +1704,7 @@ const generateExp = (scope, decl) => {
     }
   }
 
-  const out = generate(scope, expression, undefined, undefined, Prefs.optUnused);
+  const out = generate(scope, expression, undefined, undefined, !scope.inEval);
   disposeLeftover(out);
 
   return out;
@@ -1716,33 +1726,7 @@ const generateChain = (scope, decl) => {
   return generate(scope, decl.expression);
 };
 
-const CTArrayUtil = {
-  getLengthI32: pointer => [
-    ...number(0, Valtype.i32),
-    [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ]
-  ],
-
-  getLength: pointer => [
-    ...number(0, Valtype.i32),
-    [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ],
-    Opcodes.i32_from_u
-  ],
-
-  setLengthI32: (pointer, value) => [
-    ...number(0, Valtype.i32),
-    ...value,
-    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ]
-  ],
-
-  setLength: (pointer, value) => [
-    ...number(0, Valtype.i32),
-    ...value,
-    Opcodes.i32_to_u,
-    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ]
-  ]
-};
-
-const RTArrayUtil = {
+const ArrayUtil = {
   getLengthI32: pointer => [
     ...pointer,
     [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ]
@@ -1969,10 +1953,12 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       throw e;
     }
 
+    scope.inEval = true;
     const out = generate(scope, {
       type: 'BlockStatement',
       body: parsed.body
     });
+    scope.inEval = false;
 
     const lastInst = out[out.length - 1];
     if (lastInst && lastInst[0] === Opcodes.drop) {
@@ -1985,12 +1971,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       out.push(...setLastType(scope, TYPES.undefined));
     }
 
-    // if (lastInst && lastInst[0] === Opcodes.drop) {
-    //   out.splice(out.length - 1, 1);
-    // } else if (countLeftover(out) === 0) {
-    //   out.push(...number(UNDEFINED));
-    // }
-
     return out;
   }
 
@@ -2200,7 +2180,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         const protoFunc = protoCands[x];
         if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
           protoBC[x] = [
-            ...RTArrayUtil.getLength(getPointer),
+            ...ArrayUtil.getLength(getPointer),
             ...setLastType(scope, TYPES.number)
           ];
           continue;
@@ -2214,19 +2194,15 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           const protoOut = protoFunc(getPointer, {
             getCachedI32: () => [ [ Opcodes.local_get, lengthLocal ] ],
             setCachedI32: () => [ [ Opcodes.local_set, lengthLocal ] ],
-            get: () => RTArrayUtil.getLength(getPointer),
-            getI32: () => RTArrayUtil.getLengthI32(getPointer),
-            set: value => RTArrayUtil.setLength(getPointer, value),
-            setI32: value => RTArrayUtil.setLengthI32(getPointer, value)
+            get: () => ArrayUtil.getLength(getPointer),
+            getI32: () => ArrayUtil.getLengthI32(getPointer),
+            set: value => ArrayUtil.setLength(getPointer, value),
+            setI32: value => ArrayUtil.setLengthI32(getPointer, value)
           },
           generate(scope, decl.arguments[0] ?? DEFAULT_VALUE()),
           getNodeType(scope, decl.arguments[0] ?? DEFAULT_VALUE()),
           protoLocal, protoLocal2,
-          (length, itemType) => {
-            return makeArray(scope, {
-              rawElements: new Array(length)
-            }, _global, _name, true, itemType, true);
-          },
+          () => [ [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ] ],
           () => {
             optUnused = true;
             return unusedValue;
@@ -2252,7 +2228,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ] : []),
 
         ...(useLengthCache ? [
-          ...RTArrayUtil.getLengthI32(getPointer),
+          ...ArrayUtil.getLengthI32(getPointer),
           [ Opcodes.local_set, lengthLocal ],
         ] : []),
 
@@ -3335,7 +3311,6 @@ const isIdentAssignable = (scope, name, op = '=') => {
   return false;
 };
 
-// todo: optimize this func for valueUnused
 const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
   const [ local, isGlobal ] = lookupName(scope, name);
@@ -3361,8 +3336,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
   // hack: .length setter
   if (type === 'MemberExpression' && decl.left.property.name === 'length' && !decl._internalAssign) {
-    const newValueTmp = localTmp(scope, '__length_setter_tmp');
-    const pointerTmp = localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
+    const newValueTmp = !valueUnused && localTmp(scope, '__length_setter_tmp');
+    let pointerTmp = op !== '=' && localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
 
     const out = [
       ...generate(scope, decl.left.object),
@@ -3375,23 +3350,32 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
         [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
         Opcodes.i32_from_u
       ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right))),
-      [ Opcodes.local_tee, newValueTmp ],
+      ...optional([ Opcodes.local_tee, newValueTmp ]),
 
       Opcodes.i32_to_u,
       [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ],
 
-      [ Opcodes.local_get, newValueTmp ]
+      ...optional([ Opcodes.local_get, newValueTmp ])
     ];
 
     const type = getNodeType(scope, decl.left.object);
     const known = knownType(scope, type);
     if (known != null && typeHasFlag(known, TYPE_FLAGS.length)) return [
       ...out,
-      ...(!pointerTmp ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
+      ...optional([ Opcodes.local_tee, pointerTmp ]),
 
-      ...lengthTypeWasm
+      ...lengthTypeWasm,
+      ...optional(number(UNDEFINED), valueUnused)
     ];
 
+    pointerTmp ||= localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
+
+    const slow = generate(scope, {
+      ...decl,
+      _internalAssign: true
+    });
+    if (valueUnused) disposeLeftover(slow);
+
     return [
       ...out,
       [ Opcodes.local_set, pointerTmp ],
@@ -3399,33 +3383,31 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
       ...type,
       ...number(TYPE_FLAGS.length, Valtype.i32),
       [ Opcodes.i32_and ],
-      [ Opcodes.if, valtypeBinary ],
+      [ Opcodes.if, valueUnused ? Blocktype.void : valtypeBinary ],
         [ Opcodes.local_get, pointerTmp ],
         ...lengthTypeWasm,
       [ Opcodes.else ],
-        ...generate(scope, {
-          ...decl,
-          _internalAssign: true
-        }),
-      [ Opcodes.end ]
+        ...slow,
+      [ Opcodes.end ],
+      ...optional(number(UNDEFINED), valueUnused)
     ];
   }
 
   // arr[i]
   if (type === 'MemberExpression') {
-    const newValueTmp = localTmp(scope, '#member_setter_val_tmp');
+    const newValueTmp = !valueUnused && localTmp(scope, '#member_setter_val_tmp');
     const pointerTmp = localTmp(scope, '#member_setter_ptr_tmp', Valtype.i32);
 
     const object = decl.left.object;
     const property = getProperty(decl.left);
 
     // todo/perf: use i32 object (and prop?) locals
-    const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj') ] ];
+    const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj_assign') ] ];
     const propertyWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_prop_assign') ] ];
 
     return [
       ...generate(scope, object),
-      [ Opcodes.local_set, localTmp(scope, '#member_obj') ],
+      [ Opcodes.local_set, objectWasm[0][1] ],
 
       ...generate(scope, property, false, '#member_prop_assign'),
       [ Opcodes.local_set, localTmp(scope, '#member_prop_assign') ],
@@ -3454,14 +3436,14 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
               [ Opcodes.local_get, pointerTmp ],
               [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
             ], getNodeType(scope, decl.right), false, name, true)),
-            [ Opcodes.local_tee, newValueTmp ],
+            ...optional([ Opcodes.local_tee, newValueTmp ]),
             [ Opcodes.store, 0, ValtypeSize.i32 ],
 
             [ Opcodes.local_get, pointerTmp ],
             ...getNodeType(scope, decl),
             [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
 
-            [ Opcodes.local_get, newValueTmp ]
+            ...optional([ Opcodes.local_get, newValueTmp ])
           ],
 
           ...wrapBC({
@@ -3474,7 +3456,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load8_u, 0, 4 ],
                 Opcodes.i32_from_u
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to_u,
               [ Opcodes.i32_store8, 0, 4 ]
@@ -3488,7 +3470,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load8_u, 0, 4 ],
                 Opcodes.i32_from_u
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               ...number(0),
               [ Opcodes.f64_max ],
@@ -3506,7 +3488,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load8_s, 0, 4 ],
                 Opcodes.i32_from
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to,
               [ Opcodes.i32_store8, 0, 4 ]
@@ -3522,7 +3504,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load16_u, 0, 4 ],
                 Opcodes.i32_from_u
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to_u,
               [ Opcodes.i32_store16, 0, 4 ]
@@ -3538,7 +3520,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load16_s, 0, 4 ],
                 Opcodes.i32_from
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to,
               [ Opcodes.i32_store16, 0, 4 ]
@@ -3554,7 +3536,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load, 0, 4 ],
                 Opcodes.i32_from_u
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to_u,
               [ Opcodes.i32_store, 0, 4 ]
@@ -3570,7 +3552,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.i32_load, 0, 4 ],
                 Opcodes.i32_from
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               Opcodes.i32_to,
               [ Opcodes.i32_store, 0, 4 ]
@@ -3586,7 +3568,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.f32_load, 0, 4 ],
                 [ Opcodes.f64_promote_f32 ]
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               [ Opcodes.f32_demote_f64 ],
               [ Opcodes.f32_store, 0, 4 ]
@@ -3601,7 +3583,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
                 [ Opcodes.local_get, pointerTmp ],
                 [ Opcodes.f64_load, 0, 4 ]
               ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right), false, name, true)),
-              [ Opcodes.local_tee, newValueTmp ],
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
 
               [ Opcodes.f64_store, 0, 4 ]
             ],
@@ -3616,12 +3598,12 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
             ],
             postlude: [
               // setLastType(scope, TYPES.number)
-              [ Opcodes.local_get, newValueTmp ]
+              ...optional([ Opcodes.local_get, newValueTmp ])
             ]
           }),
         } : {}),
 
-        [TYPES.undefined]: internalThrow(scope, 'TypeError', 'Cannot set property of undefined', true),
+        [TYPES.undefined]: internalThrow(scope, 'TypeError', 'Cannot set property of undefined', !valueUnused),
 
         // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
         default: () => [
@@ -3652,9 +3634,11 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
           [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
           [ Opcodes.drop ],
+          ...(valueUnused ? [ [ Opcodes.drop ] ] : [])
           // ...setLastType(scope, getNodeType(scope, decl)),
         ]
-      }, valtypeBinary)
+      }, valueUnused ? Blocktype.void : valtypeBinary),
+      ...optional(number(UNDEFINED), valueUnused)
     ];
   }
 
@@ -3682,7 +3666,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     // set global and return (eg a = 2)
     return [
       ...generateVarDstr(scope, 'var', name, decl.right, undefined, true),
-      ...generate(scope, decl.left)
+      ...optional(generate(scope, decl.left), !valueUnused),
+      ...optional(number(UNDEFINED), valueUnused)
     ];
   }
 
@@ -3690,7 +3675,10 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   if (local.metadata?.kind === 'const') return internalThrow(scope, 'TypeError', `Cannot assign to constant variable ${name}`, true);
 
   if (op === '=') {
-    return setLocalWithType(scope, name, isGlobal, decl.right, true);
+    const out = setLocalWithType(scope, name, isGlobal, decl.right, !valueUnused);
+
+    if (valueUnused) out.push(...number(UNDEFINED));
+    return out;
   }
 
   if (op === '||' || op === '&&' || op === '??') {
@@ -3713,12 +3701,15 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     ];
   }
 
-  return setLocalWithType(
+  const out = setLocalWithType(
     scope, name, isGlobal,
     performOp(scope, op, [ [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ] ], generate(scope, decl.right), getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
-    true,
+    !valueUnused,
     getNodeType(scope, decl)
   );
+
+  if (valueUnused) out.push(...number(UNDEFINED));
+  return out;
 };
 
 const ifIdentifierErrors = (scope, decl) => {
@@ -3859,15 +3850,15 @@ const generateUnary = (scope, decl) => {
       disposeLeftover(out);
 
       out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), [
-        [ TYPES.number, () => makeString(scope, 'number', false, '#typeof_result') ],
-        [ TYPES.boolean, () => makeString(scope, 'boolean', false, '#typeof_result') ],
-        [ [ TYPES.string, TYPES.bytestring ], () => makeString(scope, 'string', false, '#typeof_result') ],
-        [ [ TYPES.undefined, TYPES.empty ], () => makeString(scope, 'undefined', false, '#typeof_result') ],
-        [ TYPES.function, () => makeString(scope, 'function', false, '#typeof_result') ],
-        [ TYPES.symbol, () => makeString(scope, 'symbol', false, '#typeof_result') ],
+        [ TYPES.number, () => makeString(scope, 'number') ],
+        [ TYPES.boolean, () => makeString(scope, 'boolean') ],
+        [ [ TYPES.string, TYPES.bytestring ], () => makeString(scope, 'string') ],
+        [ [ TYPES.undefined, TYPES.empty ], () => makeString(scope, 'undefined') ],
+        [ TYPES.function, () => makeString(scope, 'function') ],
+        [ TYPES.symbol, () => makeString(scope, 'symbol') ],
 
         // object and internal types
-        [ 'default', () => makeString(scope, 'object', false, '#typeof_result') ],
+        [ 'default', () => makeString(scope, 'object') ],
       ]));
 
       return out;
@@ -3903,6 +3894,7 @@ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
     out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
     if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
 
+    if (valueUnused) out.push(...number(UNDEFINED));
     return out;
   }
 
@@ -3920,7 +3912,7 @@ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
       prefix: true,
       argument: decl.argument
     }),
-    [ decl.prefix ? Opcodes.local_set : Opcodes.local_tee, tmp ],
+    [ decl.prefix || valueUnused ? Opcodes.local_set : Opcodes.local_tee, tmp ],
 
     // x = tmp + 1
     ...generate(scope, {
@@ -3933,8 +3925,9 @@ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
         left: { type: 'Identifier', name: '#updatetmp' },
         right: { type: 'Literal', value: 1 }
       }
-    }),
-    ...(decl.prefix ? [] : [ [ Opcodes.drop ] ])
+    }, _global, _name, valueUnused),
+    ...(decl.prefix || valueUnused ? [] : [ [ Opcodes.drop ] ]),
+    ...optional(number(UNDEFINED), valueUnused)
   ];
 };
 
@@ -4897,18 +4890,7 @@ const generateMeta = (scope, decl) => {
 };
 
 let pages = new Map();
-const allocPage = (scope, reason, type) => {
-  const ptr = i => i === 0 ? 16 : (i * pageSize);
-  if (pages.has(reason)) return ptr(pages.get(reason).ind);
-
-  const ind = pages.size;
-  pages.set(reason, { ind, type });
-
-  scope.pages ??= new Map();
-  scope.pages.set(reason, { ind, type });
-
-  return ptr(ind);
-};
+const allocPage = (scope, name) => _allocPage({ scope, pages }, name);
 
 const itemTypeToValtype = {
   i32: 'i32',
@@ -4942,18 +4924,23 @@ const compileBytes = (val, itemType) => {
   }
 };
 
-const makeData = (scope, elements, page = null, itemType, initEmpty) => {
+const makeData = (scope, elements, page = null, itemType = 'i8') => {
+  // if data for page already exists, abort
+  if (page && data.find(x => x.page === page)) return;
+
   const length = elements.length;
 
   // if length is 0 memory/data will just be 0000... anyway
   if (length === 0) return false;
 
   let bytes = compileBytes(length, 'i32');
-
-  if (!initEmpty) for (let i = 0; i < length; i++) {
-    if (elements[i] == null) continue;
-
-    bytes.push(...compileBytes(elements[i], itemType));
+  if (itemType === 'i8') {
+    bytes = bytes.concat(elements);
+  } else {
+    for (let i = 0; i < length; i++) {
+      if (elements[i] == null) continue;
+      bytes.push(...compileBytes(elements[i], itemType));
+    }
   }
 
   const obj = { bytes, page };
@@ -4981,169 +4968,6 @@ const printStaticStr = str => {
   return out;
 };
 
-const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype, intOut = false, typed = false) => {
-  const out = [];
-
-  const uniqueName = name === '$undeclared' ? name + uniqId() : name;
-
-  const useRawElements = !!decl.rawElements;
-  const elements = useRawElements ? decl.rawElements : decl.elements;
-
-  const valtype = itemTypeToValtype[itemType];
-  const length = elements.length;
-
-  const allocated = allocator.alloc({ scope, pages, globals, asmFunc, funcIndex }, uniqueName, { itemType });
-
-  let pointer = allocated;
-  if (allocator.constructor.name !== 'StaticAllocator') {
-    // const tmp = localTmp(scope, '#makearray_pointer' + uniqueName, Valtype.i32);
-    const tmp = localTmp(scope, '#makearray_pointer' + name, Valtype.i32);
-    out.push(
-      ...allocated,
-      [ Opcodes.local_set, tmp ]
-    );
-
-    if (Prefs.runtimeAllocLog) out.push(
-      ...printStaticStr(`${name}: `),
-
-      [ Opcodes.local_get, tmp ],
-      Opcodes.i32_from_u,
-      [ Opcodes.call, 0 ],
-
-      ...number(10),
-      [ Opcodes.call, 1 ]
-    );
-
-    pointer = [ [ Opcodes.local_get, tmp ] ];
-
-    if (Prefs.data && useRawElements) {
-      const data = makeData(scope, elements, null, itemType, initEmpty);
-      if (data) {
-        // init data
-        out.push(
-          ...pointer,
-          ...number(0, Valtype.i32),
-          ...number(data.size, Valtype.i32),
-          [ ...Opcodes.memory_init, ...unsignedLEB128(data.idx), 0 ]
-        );
-      }
-
-      // return pointer in out
-      out.push(
-        ...pointer,
-        ...(!intOut ? [ Opcodes.i32_from_u ] : [])
-      );
-
-      return [ out, pointer ];
-    }
-  } else {
-    const rawPtr = allocator.lastPtr;
-
-    scope.arrays ??= new Map();
-    const firstAssign = !scope.arrays.has(uniqueName);
-    if (firstAssign) scope.arrays.set(uniqueName, rawPtr);
-
-    const local = global ? globals[name] : scope.locals?.[name];
-    if (
-      Prefs.data && useRawElements &&
-      name !== '#member_prop' && name !== '#member_prop_assign' &&
-      (!globalThis.precompile || !global)
-    ) {
-      if (Prefs.activeData && firstAssign) {
-        makeData(scope, elements, allocator.lastName, itemType, initEmpty);
-
-        // local value as pointer
-        return [ number(rawPtr, intOut ? Valtype.i32 : valtypeBinary), pointer ];
-      }
-
-      if (Prefs.passiveData) {
-        const data = makeData(scope, elements, null, itemType, initEmpty);
-        if (data) {
-          // init data
-          out.push(
-            ...pointer,
-            ...number(0, Valtype.i32),
-            ...number(data.size, Valtype.i32),
-            [ ...Opcodes.memory_init, ...unsignedLEB128(data.idx), 0 ]
-          );
-        }
-
-        // return pointer in out
-        out.push(...number(rawPtr, intOut ? Valtype.i32 : valtypeBinary));
-
-        return [ out, pointer ];
-      }
-    }
-
-    if (local != null) {
-      // hack: handle allocation for #member_prop's here instead of in several places /shrug
-      let shouldGet = true;
-      if (name === '#member_prop') {
-        out.push(...number(rawPtr));
-        shouldGet = false;
-      }
-
-      if (name === '#member_prop_assign') {
-        out.push(
-          [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
-          Opcodes.i32_from_u
-        );
-        shouldGet = false;
-      }
-
-      const pointerTmp = localTmp(scope, '#makearray_pointer_tmp', Valtype.i32);
-      out.push(
-        ...(shouldGet ? [
-          [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-          Opcodes.i32_to_u
-        ] : [
-          // hack: make precompile realise we are allocating
-          ...(globalThis.precompile ? [
-            [ global ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-            [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-          ] : []),
-          Opcodes.i32_to_u
-        ]),
-        [ Opcodes.local_set, pointerTmp ]
-      );
-
-      pointer = [ [ Opcodes.local_get, pointerTmp ] ];
-    }
-  }
-
-
-  // store length
-  out.push(
-    ...pointer,
-    ...number(length, Valtype.i32),
-    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ]
-  );
-
-  const storeOp = StoreOps[itemType];
-  const sizePerEl = ValtypeSize[itemType] + (typed ? 1 : 0);
-  if (!initEmpty) for (let i = 0; i < length; i++) {
-    if (elements[i] == null) continue;
-
-    const offset = ValtypeSize.i32 + i * sizePerEl;
-    out.push(
-      ...pointer,
-      ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
-      [ storeOp, 0, ...unsignedLEB128(offset) ],
-      ...(!typed ? [] : [ // typed presumes !useRawElements
-        ...pointer,
-        ...getNodeType(scope, elements[i]),
-        [ Opcodes.i32_store8, 0, ...unsignedLEB128(offset + ValtypeSize[itemType]) ]
-      ])
-    );
-  }
-
-  // local value as pointer
-  out.push(...pointer);
-  if (!intOut) out.push(Opcodes.i32_from_u);
-
-  return [ out, pointer ];
-};
-
 const storeArray = (scope, array, index, element) => {
   if (!Array.isArray(element)) element = generate(scope, element);
   if (typeof index === 'number') index = number(index);
@@ -5209,25 +5033,83 @@ const byteStringable = str => {
   return true;
 };
 
-const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
-  const rawElements = new Array(str.length);
-  let byteStringable = true;
+const makeString = (scope, str, forceBytestring = undefined) => {
+  if (str.length === 0) return number(0);
+
+  const elements = new Array(str.length);
+  let bytestring = forceBytestring !== false;
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i);
-    rawElements[i] = c;
+    elements[i] = c;
 
-    if (byteStringable && c > 0xFF) byteStringable = false;
+    if (bytestring && c > 0xFF) bytestring = false;
   }
 
-  if (byteStringable && forceBytestring === false) byteStringable = false;
+  if (globalThis.precompile) return [
+    [ Opcodes.const, 'str', str, forceBytestring ]
+  ];
+
+  const ptr = allocStr({ scope, pages }, str, bytestring);
+  makeData(scope, elements, str, bytestring ? 'i8' : 'i16');
 
-  return makeArray(scope, {
-    rawElements
-  }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
+  return number(ptr);
 };
 
-const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
-  return makeArray(scope, decl, global, name, initEmpty, valtype, false, true)[0];
+const generateArray = (scope, decl, global = false, name = '$undeclared', staticAlloc = false) => {
+  const elements = decl.elements;
+  const length = elements.length;
+
+  const out = [];
+  let pointer;
+
+  if (staticAlloc) {
+    const uniqueName = name === '$undeclared' ? name + uniqId() : name;
+
+    const ptr = allocPage(scope, uniqueName);
+    pointer = number(ptr, Valtype.i32)[0];
+
+    scope.arrays ??= new Map();
+    scope.arrays.set(uniqueName, ptr);
+  } else {
+    const tmp = localTmp(scope, '#create_array' + uniqId(), Valtype.i32);
+    out.push(
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
+      [ Opcodes.local_set, tmp ]
+    );
+
+    pointer = [ Opcodes.local_get, tmp ];
+  }
+
+  // store length
+  if (length !== 0) out.push(
+    pointer,
+    ...number(length, Valtype.i32),
+    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ]
+  );
+
+  // todo: rewrite below to support RestElement (holdover from makeArray)
+  for (let i = 0; i < length; i++) {
+    if (elements[i] == null) continue;
+
+    const offset = ValtypeSize.i32 + i * (ValtypeSize[valtype] + 1);
+    out.push(
+      pointer,
+      ...generate(scope, elements[i]),
+      [ Opcodes.store, 0, ...unsignedLEB128(offset) ],
+
+      pointer,
+      ...getNodeType(scope, elements[i]),
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(offset + ValtypeSize[valtype]) ]
+    );
+  }
+
+  // return array pointer
+  out.push(
+    pointer,
+    Opcodes.i32_from_u
+  );
+
+  return out;
 };
 
 // opt: do not call ToPropertyKey for non-computed properties as unneeded
@@ -5380,7 +5262,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
     if (name.startsWith('__')) name = name.split('_').pop();
     if (name.startsWith('#')) name = '';
 
-    return withType(scope, makeString(scope, name, _global, _name, true), TYPES.bytestring);
+    return withType(scope, makeString(scope, name, true), TYPES.bytestring);
   }
 
   const object = decl.object;
@@ -5982,8 +5864,8 @@ const generateTaggedTemplate = (scope, decl, global = false, name = undefined) =
       return out;
     },
 
-    __Porffor_bs: str => makeString(scope, str, global, name, true),
-    __Porffor_s: str => makeString(scope, str, global, name, false)
+    __Porffor_bs: str => makeString(scope, str, true),
+    __Porffor_s: str => makeString(scope, str, false)
   };
 
   const { quasis, expressions } = decl.quasi;
@@ -6171,7 +6053,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
             }
 
             if ([
-              TYPES.date, TYPES.number, TYPES.promise, TYPES.symbol,
+              TYPES.date, TYPES.number, TYPES.promise, TYPES.symbol, TYPES.function,
               TYPES.set, TYPES.map,
               TYPES.weakref, TYPES.weakset, TYPES.weakmap,
               TYPES.arraybuffer, TYPES.sharedarraybuffer, TYPES.dataview
@@ -6288,13 +6170,12 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
       if (name === 'main') {
         func.gotLastType = true;
         func.export = true;
-        func.returns = [ valtypeBinary, Valtype.i32 ];
 
         let finalStatement = decl.body.body[decl.body.body.length - 1];
         if (finalStatement?.type === 'EmptyStatement') finalStatement = decl.body.body[decl.body.body.length - 2];
 
         const lastInst = wasm[wasm.length - 1] ?? [ Opcodes.end ];
-        if (lastInst[0] === Opcodes.drop) {
+        if (lastInst[0] === Opcodes.drop || lastInst[0] === Opcodes.f64_const) {
           if (finalStatement.type.endsWith('Declaration')) {
             // final statement is decl, force undefined
             disposeLeftover(wasm);
@@ -6332,7 +6213,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         }
       } else {
         // add end return if not found
-        if (wasm[wasm.length - 1]?.[0] !== Opcodes.return && countLeftover(wasm) === 0) {
+        if (wasm[wasm.length - 1]?.[0] !== Opcodes.return && countLeftover(wasm) < func.returns.length) {
           wasm.push(...generateReturn(func, {}));
         }
       }
@@ -6572,7 +6453,6 @@ export default program => {
   builtinFuncs = new BuiltinFuncs();
   builtinVars = new BuiltinVars({ builtinFuncs });
   prototypeFuncs = new PrototypeFuncs();
-  allocator = makeAllocator(Prefs.allocator ?? 'static');
 
   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))];