watr 4.5.0 → 4.5.3

package/dist/watr.js

@@ -140,16 +140,29 @@ var _f64 = new Float64Array(_buf);
 var _i64 = new BigInt64Array(_buf);
 i64.parse = (n) => {
   n = cleanInt(n);
-  n = n[0] === "-" ? -BigInt(n.slice(1)) : BigInt(n);
-  if (n < -0x8000000000000000n || n > 0xffffffffffffffffn) err(`i64 constant out of range`);
-  _i64[0] = n;
+  const neg = n[0] === "-";
+  const body = neg ? n.slice(1) : n;
+  let max;
+  if (body[0] === "0" && (body[1] === "x" || body[1] === "X")) {
+    const hex = body.slice(2).replace(/^0+/, "") || "0";
+    max = neg ? "8000000000000000" : "ffffffffffffffff";
+    if (hex.length > 16 || hex.length === 16 && hex.toLowerCase() > max) err(`i64 constant out of range`);
+  } else {
+    const dec = body.replace(/^0+/, "") || "0";
+    max = neg ? "9223372036854775808" : "18446744073709551615";
+    if (dec.length > max.length || dec.length === max.length && dec > max) err(`i64 constant out of range`);
+  }
+  let bi = BigInt(body);
+  if (neg) bi = 0n - bi;
+  _i64[0] = bi;
   return _i64[0];
 };
 var F32_SIGN = 2147483648;
 var F32_NAN = 2139095040;
+var F32_QUIET = 4194304;
 function f32(input, value, idx) {
-  if (typeof input === "string" && ~(idx = input.indexOf("nan:"))) {
-    value = i32.parse(input.slice(idx + 4));
+  if (typeof input === "string" && (idx = input.indexOf("nan")) >= 0) {
+    value = input[idx + 3] === ":" ? i32.parse(input.slice(idx + 4)) : F32_QUIET;
     value |= F32_NAN;
     if (input[0] === "-") value |= F32_SIGN;
     _i32[0] = value;
@@ -161,9 +174,10 @@ function f32(input, value, idx) {
 }
 var F64_SIGN = 0x8000000000000000n;
 var F64_NAN = 0x7ff0000000000000n;
+var F64_QUIET = 0x8000000000000n;
 function f64(input, value, idx) {
-  if (typeof input === "string" && ~(idx = input.indexOf("nan:"))) {
-    value = i64.parse(input.slice(idx + 4));
+  if (typeof input === "string" && (idx = input.indexOf("nan")) >= 0) {
+    value = input[idx + 3] === ":" ? i64.parse(input.slice(idx + 4)) : F64_QUIET;
     value |= F64_NAN;
     if (input[0] === "-") value |= F64_SIGN;
     _i64[0] = value;
@@ -182,8 +196,11 @@ f64.parse = (input, max = Number.MAX_VALUE) => {
     let [sig, exp = "0"] = input.split(/p/i);
     let [int, fract = ""] = sig.split(".");
     let flen = fract.length ?? 0;
-    let intVal = parseInt(int);
-    isNaN(intVal) && err();
+    let intVal = 0;
+    for (let i = int.length - 1; i >= 2; i--) {
+      let digit = parseInt(int[i], 16);
+      intVal += digit * 16 ** (int.length - 1 - i);
+    }
     let fractVal = fract ? parseInt("0x" + fract) / 16 ** flen : 0;
     exp = parseInt(exp, 10);
     let value = sign * (intVal + fractVal) * 2 ** exp;
@@ -497,9 +514,9 @@ var INSTR = [
     "array.init_data typeidx_dataidx",
     "array.init_elem typeidx_elemidx",
     "ref.test reftype",
-    "",
+    "ref.test_null reftype",
     "ref.cast reftype",
-    "",
+    "ref.cast_null reftype",
     "br_on_cast reftype2",
     "br_on_cast_fail reftype2",
     "any.convert_extern",
@@ -1244,6 +1261,7 @@ var TYPE = {
   i31: 108,
   struct: 107,
   array: 106,
+  data: 107,
   cont: 104,
   nocont: 117,
   // stack switching (Phase 3)
@@ -1441,10 +1459,10 @@ function compile(nodes) {
     if (imported) ctx.import.push([...imported, [kind, ...node]]), node = null;
     items.push(node);
   });
-  const bin = (kind, count = true) => {
+  const bin = (kind, count2 = true) => {
     const items = ctx[kind].filter(Boolean).map((item) => build[kind](item, ctx)).filter(Boolean);
     if (kind === SECTION.custom) return items.flatMap((content) => [kind, ...vec(content)]);
-    return !items.length ? [] : [kind, ...vec(count ? vec(items) : items.flat())];
+    return !items.length ? [] : [kind, ...vec(count2 ? vec(items) : items.flat())];
   };
   const binMeta = () => {
     const sections = [];
@@ -1522,7 +1540,7 @@ function normalize(nodes, ctx) {
         ctx.datacount && (ctx.datacount[0] = true);
       } else if ((node.startsWith("memory.") || node.endsWith("load") || node.endsWith("store")) && isIdx(nodes[0])) out.push(nodes.shift());
     } else if (Array.isArray(node)) {
-      const op = node[0];
+      let op = node[0];
       node.loc != null && (err.loc = node.loc);
       if (op?.startsWith?.("@metadata.code.")) {
         let type = op.slice(15);
@@ -1556,6 +1574,12 @@ function normalize(nodes, ctx) {
           out.push(parts.shift());
         }
         out.push(...normalize(parts, ctx), "end");
+      } else if (op === "ref.test" || op === "ref.cast") {
+        const type = parts[0];
+        const isNullable = !Array.isArray(type) || type[1] === "null" || type[0] !== "ref";
+        if (isNullable) op += "_null";
+        out.push(...normalize(parts.slice(1), ctx), op, type);
+        nodes.unshift(...out.splice(out.length - 2));
       } else {
         const imm = [];
         while (parts.length && (!Array.isArray(parts[0]) || parts[0].valueOf !== Array.prototype.valueOf || "type,param,result,ref,exact,on".includes(parts[0][0]))) imm.push(parts.shift());
@@ -1845,16 +1869,16 @@ var IMM = {
     isId(n[0]) && (c.block[n.shift()] = c.block.length + 1);
     let blocktype2 = n.shift();
     let result = !blocktype2 ? [TYPE.void] : blocktype2[0] === "result" ? reftype(blocktype2[1], c) : uleb(id(blocktype2[1], c.type));
-    let catches = [], count = 0;
+    let catches = [], count2 = 0;
     while (n[0]?.[0] === "catch" || n[0]?.[0] === "catch_ref" || n[0]?.[0] === "catch_all" || n[0]?.[0] === "catch_all_ref") {
       let clause = n.shift();
       let kind = clause[0] === "catch" ? 0 : clause[0] === "catch_ref" ? 1 : clause[0] === "catch_all" ? 2 : 3;
       if (kind <= 1) catches.push(kind, ...uleb(id(clause[1], c.tag)), ...uleb(blockid(clause[2], c.block)));
       else catches.push(kind, ...uleb(blockid(clause[1], c.block)));
-      count++;
+      count2++;
     }
     c.block.push(1);
-    return [...result, ...uleb(count), ...catches];
+    return [...result, ...uleb(count2), ...catches];
   },
   end: (_n, c) => (c.block.pop(), []),
   call_indirect: (n, c) => {
@@ -1862,9 +1886,9 @@ var IMM = {
     return [...uleb(id(idx, c.type)), ...uleb(id(t, c.table))];
   },
   br_table: (n, c) => {
-    let labels = [], count = 0;
-    while (n[0] && (!isNaN(n[0]) || isId(n[0]))) labels.push(...uleb(blockid(n.shift(), c.block))), count++;
-    return [...uleb(count - 1), ...labels];
+    let labels = [], count2 = 0;
+    while (n[0] && (!isNaN(n[0]) || isId(n[0]))) labels.push(...uleb(blockid(n.shift(), c.block))), count2++;
+    return [...uleb(count2 - 1), ...labels];
   },
   select: (n, c) => {
     let r = n.shift() || [];
@@ -2006,7 +2030,7 @@ var instr = (nodes, ctx) => {
     let [...bytes] = INSTR[op] || err(`Unknown instruction ${op}`);
     if (HANDLER[op]) {
       if (op === "select" && nodes[0]?.length) bytes[0]++;
-      else if (HANDLER[op] === IMM.reftype && (nodes[0][1] === "null" || nodes[0][0] !== "ref")) {
+      else if (HANDLER[op] === IMM.reftype && !op.endsWith("_null") && (nodes[0][1] === "null" || nodes[0][0] !== "ref")) {
         bytes[bytes.length - 1]++;
       }
       bytes.push(...HANDLER[op](nodes, ctx, op));
@@ -3040,10 +3064,10 @@ var OPTS = {
   // strength reduction (x * 2 → x << 1)
   branch: true,
   // simplify constant branches
-  propagate: true,
-  // constant propagation through locals
-  inline: true,
-  // inline tiny functions
+  propagate: false,
+  // constant propagation — can duplicate expressions
+  inline: false,
+  // inline tiny functions — can duplicate bodies
   vacuum: true,
   // remove nops, drop-of-pure, empty branches
   peephole: true,
@@ -3058,14 +3082,12 @@ var OPTS = {
   // strip mut from never-written globals
   brif: true,
   // if-then-br → br_if
-  foldarms: true,
-  // merge identical trailing if arms
-  // minify: true,    // NOTE: disabled — renaming $ids has no binary-size effect
-  // without a names section, and risks local-name collisions.
+  foldarms: false,
+  // merge identical trailing if arms — can add block wrapper
   dedupe: true,
   // eliminate duplicate functions
-  reorder: true,
-  // put hot functions first for smaller LEBs
+  reorder: false,
+  // put hot functions first — no AST reduction
   dedupTypes: true,
   // merge identical type definitions
   packData: true,
@@ -3074,6 +3096,12 @@ var OPTS = {
   // shorten import names — enable only when you control the host
 };
 var ALL2 = Object.keys(OPTS);
+var count = (node) => {
+  if (!Array.isArray(node)) return 1;
+  let n = 1;
+  for (let i = 0; i < node.length; i++) n += count(node[i]);
+  return n;
+};
 var equal = (a, b) => {
   if (a === b) return true;
   if (typeof a !== typeof b) return false;
@@ -3088,10 +3116,8 @@ var normalize3 = (opts) => {
   if (opts === false) return {};
   if (typeof opts === "string") {
     const set = new Set(opts.split(/\s+/).filter(Boolean));
-    if (set.size === 1 && ALL2.includes([...set][0])) {
-      return Object.fromEntries(ALL2.map((f) => [f, set.has(f)]));
-    }
-    return Object.fromEntries(ALL2.map((f) => [f, set.has(f) || set.has("all")]));
+    if (set.has("all")) return Object.fromEntries(ALL2.map((f) => [f, true]));
+    return Object.fromEntries(ALL2.map((f) => [f, set.has(f)]));
   }
   return { ...OPTS, ...opts };
 };
@@ -3401,7 +3427,7 @@ var makeConst = (type, value) => {
   return null;
 };
 var fold = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const entry = FOLDABLE[node[0]];
     if (!entry) return;
@@ -3464,7 +3490,7 @@ var IDENTITIES = {
   // f * 1 → x (careful with NaN, skip for floats)
 };
 var identity = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const fn = IDENTITIES[node[0]];
     if (!fn) return;
@@ -3474,7 +3500,7 @@ var identity = (ast) => {
   });
 };
 var strength = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const [op, a, b] = node;
     if (op === "i32.mul") {
@@ -3530,7 +3556,7 @@ var strength = (ast) => {
   });
 };
 var branch = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "if") {
@@ -3562,8 +3588,7 @@ var branch = (ast) => {
 };
 var TERMINATORS = /* @__PURE__ */ new Set(["unreachable", "return", "br", "br_table"]);
 var deadcode = (ast) => {
-  const result = clone2(ast);
-  walk2(result, (node) => {
+  walk2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const kind = node[0];
     if (kind === "func" || kind === "block" || kind === "loop") {
@@ -3577,7 +3602,7 @@ var deadcode = (ast) => {
       }
     }
   });
-  return result;
+  return ast;
 };
 var eliminateDeadInBlock = (block) => {
   let terminated = false;
@@ -3609,8 +3634,7 @@ var eliminateDeadInBlock = (block) => {
   }
 };
 var localReuse = (ast) => {
-  const result = clone2(ast);
-  walk2(result, (node) => {
+  walk2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "func") return;
     const localDecls = [];
     const localTypes = /* @__PURE__ */ new Map();
@@ -3647,7 +3671,7 @@ var localReuse = (ast) => {
       }
     }
   });
-  return result;
+  return ast;
 };
 var IMPURE_OPS = /* @__PURE__ */ new Set([
   "call",
@@ -3727,7 +3751,7 @@ var forwardPropagate = (funcNode, params, useCounts) => {
     if (!Array.isArray(instr2)) continue;
     const op = instr2[0];
     if (op === "param" || op === "result" || op === "local" || op === "type" || op === "export") continue;
-    if (op === "local.set" && instr2.length === 3 && typeof instr2[1] === "string") {
+    if ((op === "local.set" || op === "local.tee") && instr2.length === 3 && typeof instr2[1] === "string") {
       substGets(instr2[2], known);
       const uses = getUseCount(instr2[1]);
       known.set(instr2[1], {
@@ -3755,6 +3779,10 @@ var forwardPropagate = (funcNode, params, useCounts) => {
       const prev = clone2(instr2);
       substGets(instr2, known);
       if (!equal(prev, instr2)) changed = true;
+      walk2(instr2, (n) => {
+        if (Array.isArray(n) && (n[0] === "local.set" || n[0] === "local.tee") && typeof n[1] === "string")
+          known.delete(n[1]);
+      });
     }
   }
   return changed;
@@ -3813,8 +3841,7 @@ var eliminateDeadStores = (funcNode, params, useCounts) => {
   return changed;
 };
 var propagate = (ast) => {
-  const result = clone2(ast);
-  walk2(result, (funcNode) => {
+  walk2(ast, (funcNode) => {
     if (!Array.isArray(funcNode) || funcNode[0] !== "func") return;
     const params = /* @__PURE__ */ new Set();
     for (const sub of funcNode)
@@ -3828,13 +3855,12 @@ var propagate = (ast) => {
       if (!changed) break;
     }
   });
-  return result;
+  return ast;
 };
 var inline = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const inlinable = /* @__PURE__ */ new Map();
-  for (const node of result.slice(1)) {
+  for (const node of ast.slice(1)) {
     if (!Array.isArray(node) || node[0] !== "func") continue;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2) continue;
@@ -3863,19 +3889,23 @@ var inline = (ast) => {
     if (params && !hasLocals && !hasExport && params.length <= 4 && body.length === 1) {
       const paramNames = new Set(params.map((p) => p.name));
       let mutatesParam = false;
+      let hasReturn = false;
       walk2(body[0], (n) => {
         if (!Array.isArray(n)) return;
         if ((n[0] === "local.set" || n[0] === "local.tee") && paramNames.has(n[1])) {
           mutatesParam = true;
         }
+        if (n[0] === "return" || n[0] === "return_call" || n[0] === "return_call_indirect") {
+          hasReturn = true;
+        }
       });
-      if (!mutatesParam) {
+      if (!mutatesParam && !hasReturn) {
         inlinable.set(name2, { body: body[0], params });
       }
     }
   }
-  if (inlinable.size === 0) return result;
-  walkPost2(result, (node) => {
+  if (inlinable.size === 0) return ast;
+  walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "call") return;
     const fname = node[1];
     if (!inlinable.has(fname)) return;
@@ -3895,10 +3925,10 @@ var inline = (ast) => {
     });
     return substituted;
   });
-  return result;
+  return ast;
 };
 var vacuum = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "nop") return ["nop"];
@@ -3997,7 +4027,7 @@ var PEEPHOLE = {
   "local.set": (a, b) => Array.isArray(b) && b[0] === "local.get" && b[1] === a ? ["nop"] : null
 };
 var peephole = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node.length !== 3) return;
     const fn = PEEPHOLE[node[0]];
     if (!fn) return;
@@ -4007,10 +4037,9 @@ var peephole = (ast) => {
 };
 var globals = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const constGlobals = /* @__PURE__ */ new Map();
   const mutableGlobals = /* @__PURE__ */ new Set();
-  for (const node of result.slice(1)) {
+  for (const node of ast.slice(1)) {
     if (!Array.isArray(node) || node[0] !== "global") continue;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2) continue;
@@ -4021,21 +4050,21 @@ var globals = (ast) => {
     const init = node[initIdx];
     if (getConst(init)) constGlobals.set(name2, init);
   }
-  walk2(result, (n) => {
+  walk2(ast, (n) => {
     if (!Array.isArray(n) || n[0] !== "global.set") return;
     const ref = n[1];
     if (typeof ref === "string" && ref[0] === "$") mutableGlobals.add(ref);
   });
   for (const name2 of mutableGlobals) constGlobals.delete(name2);
-  if (constGlobals.size === 0) return result;
-  return walkPost2(result, (node) => {
+  if (constGlobals.size === 0) return ast;
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "global.get" || node.length !== 2) return;
     const ref = node[1];
     if (constGlobals.has(ref)) return clone2(constGlobals.get(ref));
   });
 };
 var offset = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (typeof op !== "string" || !op.endsWith("load") && !op.endsWith("store")) return;
@@ -4086,8 +4115,7 @@ var offset = (ast) => {
   });
 };
 var unbranch = (ast) => {
-  const result = clone2(ast);
-  walk2(result, (node) => {
+  walk2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op !== "block") return;
@@ -4116,16 +4144,15 @@ var unbranch = (ast) => {
       node.splice(lastIdx, 1);
     }
   });
-  return result;
+  return ast;
 };
 var stripmut = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const written = /* @__PURE__ */ new Set();
-  walk2(result, (n) => {
+  walk2(ast, (n) => {
     if (Array.isArray(n) && n[0] === "global.set" && typeof n[1] === "string") written.add(n[1]);
   });
-  return walkPost2(result, (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "global") return;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2 || written.has(name2)) return;
@@ -4139,7 +4166,7 @@ var stripmut = (ast) => {
   });
 };
 var brif = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "if") return;
     const { cond, thenBranch, elseBranch } = parseIf(node);
     const thenEmpty = !thenBranch || thenBranch.length <= 1;
@@ -4155,7 +4182,7 @@ var brif = (ast) => {
   });
 };
 var foldarms = (ast) => {
-  return walkPost2(clone2(ast), (node) => {
+  return walkPost2(ast, (node) => {
     if (!Array.isArray(node) || node[0] !== "if") return;
     const { thenBranch, elseBranch } = parseIf(node);
     if (!thenBranch || !elseBranch) return;
@@ -4220,10 +4247,9 @@ var hashFunc = (node, localNames) => {
 };
 var dedupe = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const signatures = /* @__PURE__ */ new Map();
   const redirects = /* @__PURE__ */ new Map();
-  for (const node of result.slice(1)) {
+  for (const node of ast.slice(1)) {
     if (!Array.isArray(node) || node[0] !== "func") continue;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2) continue;
@@ -4243,8 +4269,8 @@ var dedupe = (ast) => {
       signatures.set(hash, name2);
     }
   }
-  if (redirects.size === 0) return result;
-  walkPost2(result, (node) => {
+  if (redirects.size === 0) return ast;
+  walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if ((op === "call" || op === "return_call") && redirects.has(node[1])) {
@@ -4266,14 +4292,13 @@ var dedupe = (ast) => {
       }
     }
   });
-  return result;
+  return ast;
 };
 var dedupTypes = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const signatures = /* @__PURE__ */ new Map();
   const redirects = /* @__PURE__ */ new Map();
-  for (const node of result.slice(1)) {
+  for (const node of ast.slice(1)) {
     if (!Array.isArray(node) || node[0] !== "type") continue;
     const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
     if (!name2) continue;
@@ -4284,15 +4309,15 @@ var dedupTypes = (ast) => {
       signatures.set(hash, name2);
     }
   }
-  if (redirects.size === 0) return result;
-  for (let i = result.length - 1; i >= 0; i--) {
-    const node = result[i];
+  if (redirects.size === 0) return ast;
+  for (let i = ast.length - 1; i >= 0; i--) {
+    const node = ast[i];
     if (Array.isArray(node) && node[0] === "type") {
       const name2 = typeof node[1] === "string" && node[1][0] === "$" ? node[1] : null;
-      if (name2 && redirects.has(name2)) result.splice(i, 1);
+      if (name2 && redirects.has(name2)) ast.splice(i, 1);
     }
   }
-  walkPost2(result, (node) => {
+  walkPost2(ast, (node) => {
     if (!Array.isArray(node)) return;
     const op = node[0];
     if (op === "func") {
@@ -4325,7 +4350,7 @@ var dedupTypes = (ast) => {
       }
     }
   });
-  return result;
+  return ast;
 };
 var parseDataString = (str2) => {
   if (typeof str2 !== "string" || str2.length < 2 || str2[0] !== '"') return new Uint8Array();
@@ -4440,8 +4465,7 @@ var mergeDataSegments = (a, b) => {
 };
 var packData = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  let result = clone2(ast);
-  for (const node of result) {
+  for (const node of ast) {
     if (!Array.isArray(node) || node[0] !== "data") continue;
     let contentStart = 1;
     if (typeof node[1] === "string" && node[1][0] === "$") contentStart = 2;
@@ -4457,8 +4481,8 @@ var packData = (ast) => {
     }
   }
   const dataNodes = [];
-  for (let i = 0; i < result.length; i++) {
-    const node = result[i];
+  for (let i = 0; i < ast.length; i++) {
+    const node = ast[i];
     if (Array.isArray(node) && node[0] === "data") {
       const info = getDataOffset(node);
       if (info) {
@@ -4484,9 +4508,9 @@ var packData = (ast) => {
     }
   }
   if (toRemove.size > 0) {
-    result = result.filter((_, i) => !toRemove.has(i));
+    ast = ast.filter((_, i) => !toRemove.has(i));
   }
-  return result;
+  return ast;
 };
 var makeShortener = () => {
   const map = /* @__PURE__ */ new Map();
@@ -4505,10 +4529,9 @@ var makeShortener = () => {
 };
 var minifyImports = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
-  const result = clone2(ast);
   const shortMod = makeShortener();
   const shortField = makeShortener();
-  for (const node of result) {
+  for (const node of ast) {
     if (!Array.isArray(node) || node[0] !== "import") continue;
     if (typeof node[1] === "string" && node[1][0] === '"') {
       node[1] = '"' + shortMod(node[1].slice(1, -1)) + '"';
@@ -4517,7 +4540,7 @@ var minifyImports = (ast) => {
       node[2] = '"' + shortField(node[2].slice(1, -1)) + '"';
     }
   }
-  return result;
+  return ast;
 };
 var reorderSafe = (ast) => {
   let safe = true;
@@ -4545,16 +4568,15 @@ var reorderSafe = (ast) => {
 var reorder = (ast) => {
   if (!Array.isArray(ast) || ast[0] !== "module") return ast;
   if (!reorderSafe(ast)) return ast;
-  const result = clone2(ast);
   const callCounts = /* @__PURE__ */ new Map();
-  walk2(result, (n) => {
+  walk2(ast, (n) => {
     if (!Array.isArray(n)) return;
     if (n[0] === "call" || n[0] === "return_call") {
       callCounts.set(n[1], (callCounts.get(n[1]) || 0) + 1);
     }
   });
   const imports = [], funcs = [], others = [];
-  for (const node of result.slice(1)) {
+  for (const node of ast.slice(1)) {
     if (!Array.isArray(node)) {
       others.push(node);
       continue;
@@ -4568,10 +4590,16 @@ var reorder = (ast) => {
 };
 function optimize(ast, opts = true) {
   if (typeof ast === "string") ast = parse_default(ast);
-  ast = clone2(ast);
+  const strictGuard = opts === true;
   opts = normalize3(opts);
-  for (let round = 0; round < 6; round++) {
-    const before = ast;
+  const log = opts.log ? (msg, delta) => opts.log(msg, delta) : () => {
+  };
+  const verbose = opts.verbose || opts.log;
+  ast = clone2(ast);
+  let beforeRound = null;
+  for (let round = 0; round < 3; round++) {
+    beforeRound = clone2(ast);
+    const sizeBefore = count(ast);
     if (opts.stripmut) ast = stripmut(ast);
     if (opts.globals) ast = globals(ast);
     if (opts.fold) ast = fold(ast);
@@ -4594,7 +4622,18 @@ function optimize(ast, opts = true) {
     if (opts.reorder) ast = reorder(ast);
     if (opts.treeshake) ast = treeshake(ast);
     if (opts.minifyImports) ast = minifyImports(ast);
-    if (equal(before, ast)) break;
+    const sizeAfter = count(ast);
+    const delta = sizeAfter - sizeBefore;
+    if (verbose || delta !== 0) {
+      log(`  round ${round + 1}: ${delta > 0 ? "+" : ""}${delta} nodes`, delta);
+    }
+    const tolerance = strictGuard ? 0 : 5;
+    if (delta > tolerance) {
+      if (verbose) log(`  \u26A0 round ${round + 1} inflated by ${delta}, reverting`, delta);
+      ast = beforeRound;
+      break;
+    }
+    if (equal(beforeRound, ast)) break;
   }
   return ast;
 }