@markw65/monkeyc-optimizer 1.1.51 → 1.1.53

package/build/{chunk-HKWBVOEL.cjs → chunk-32NRMXAJ.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_HKWBVOEL_exports = {};
-__export(chunk_HKWBVOEL_exports, {
+var chunk_32NRMXAJ_exports = {};
+__export(chunk_32NRMXAJ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_HKWBVOEL_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_HKWBVOEL_exports);
+module.exports = __toCommonJS(chunk_32NRMXAJ_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -5311,26 +5311,35 @@ function parseData(view, symbols) {
   let current = 0;
   while (current < view.byteLength) {
     const code = view.getInt32(current);
-    if (code === -1046127121) {
-      current = skipClassDef(view, current + 4, symbols);
+    if (code === -1046127121 || code === -1029349905) {
+      current = skipClassDef(view, current + 4, symbols, code);
     } else if (view.getUint8(current) === 1) {
       current = symbols.parseSymbol(view, current, current + 1);
+    } else if (view.getUint8(current) === 3) {
+      current += view.getUint32(current + 1) + 6;
     } else {
       throw new Error(`Unknown code: ${code}`);
     }
   }
 }
-function skipClassDef(view, current, symbols) {
-  current += 4;
-  current += 4;
-  current += 4;
-  current += 4;
+function skipClassDef(view, current, symbols, code) {
+  const isVariableSized = code === -1029349905;
+  const flags = isVariableSized ? view.getUint8(current++) : -1;
+  if (flags & 1)
+    current += 4;
+  if (flags & 2)
+    current += 4;
+  if (flags & 4)
+    current += 4;
+  if (flags & 8)
+    current += 4;
   current += 2;
-  let fields = view.getUint8(current++);
+  let fields = isVariableSized ? view.getUint16((current += 2) - 2) : view.getUint8(current++);
   while (fields--) {
     const f1 = view.getUint32((current += 4) - 4);
+    const type = isVariableSized ? view.getUint8(current++) : f1 & 15;
     const addr = view.getUint32((current += 4) - 4);
-    if ((f1 & 15) !== 6)
+    if (type !== 6)
       continue;
     const section = addr >>> 28;
     if (section === 1) {
@@ -5362,26 +5371,35 @@ function fixupData(context, offsetMap) {
   let current = 0;
   while (current < view.byteLength) {
     const code = view.getInt32(current);
-    if (code === -1046127121) {
-      current = fixupClassDef(view, current + 4, offsetMap);
+    if (code === -1046127121 || code === -1029349905) {
+      current = fixupClassDef(view, current + 4, offsetMap, code);
     } else if (view.getUint8(current) === 1) {
       current = symbols.parseSymbol(view, current, current + 1);
+    } else if (view.getUint8(current) === 3) {
+      current += view.getUint32(current + 1) + 6;
     } else {
       throw new Error(`Unknown code: ${code}`);
     }
   }
 }
-function fixupClassDef(view, current, offsetMap) {
-  current += 4;
-  current += 4;
-  current += 4;
-  current += 4;
+function fixupClassDef(view, current, offsetMap, code) {
+  const isVariableSized = code === -1029349905;
+  const flags = isVariableSized ? view.getUint8(current++) : -1;
+  if (flags & 1)
+    current += 4;
+  if (flags & 2)
+    current += 4;
+  if (flags & 4)
+    current += 4;
+  if (flags & 8)
+    current += 4;
   current += 2;
-  let fields = view.getUint8(current++);
+  let fields = isVariableSized ? view.getUint16((current += 2) - 2) : view.getUint8(current++);
   while (fields--) {
     const f1 = view.getUint32((current += 4) - 4);
+    const type = isVariableSized ? view.getUint8(current++) : f1 & 15;
     const addr = view.getUint32((current += 4) - 4);
-    if ((f1 & 15) !== 6)
+    if (type !== 6)
       continue;
     const section = addr >>> 28;
     if (section === 1) {
@@ -16656,7 +16674,11 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     const ret = preEvaluate(istate, node);
     switch (node.type) {
       case "EnumDeclaration":
-        return [];
+        return ["body"];
+      case "EnumStringBody":
+        return ["members"];
+      case "EnumStringMember":
+        return ["init"];
       case "ForStatement": {
         const map2 = topLocals().map;
         if (map2) {
@@ -17083,20 +17105,18 @@ function cleanup(state, node, ast) {
         const name = "name" in m ? m.name : m.id.name;
         return (0, import_chunk_MBTLUWXR.hasProperty)(state.index, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.usedByName, name);
       })) {
-        node.enumType = [
-          ...new Set(
-            node.members.map((m) => {
-              if (!("init" in m))
-                return "Number";
-              const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
-              if (!node2) {
-                throw new Error("Failed to get type for eliminated enum");
-              }
-              return type;
-            })
-          )
-        ].join(" or ");
-        node.members.splice(0);
+        const enumType = new Set(
+          node.members.map((m) => {
+            if (!("init" in m))
+              return "Number";
+            const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
+            return node2 ? type : null;
+          })
+        );
+        if (!enumType.has(null)) {
+          node.enumType = [...enumType].join(" or ");
+          node.members.splice(0);
+        }
       }
       break;
     case "EnumDeclaration":
@@ -18705,17 +18725,16 @@ function stateFuncs() {
                   }
                   const name = m.id.name;
                   const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(m.init);
-                  if (!init) {
-                    throw new Error("Unexpected enum initializer");
-                  }
-                  if (init !== m.init) {
-                    if (m.init.enumType) {
-                      init.enumType = m.init.enumType;
+                  if (init) {
+                    if (init !== m.init) {
+                      if (m.init.enumType) {
+                        init.enumType = m.init.enumType;
+                      }
+                      m.init = init;
+                    }
+                    if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
+                      prev = init.value;
                     }
-                    m.init = init;
-                  }
-                  if (init.type === "Literal" && init.raw && import_prettier_plugin_monkeyc4.LiteralIntegerRe.test(init.raw)) {
-                    prev = init.value;
                   }
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
                     values[name] = [];
@@ -19758,6 +19777,16 @@ function parseCode(view, lineTable) {
       case 47:
       case 10:
       case 11:
+      case 55:
+      case 59:
+      case 60:
+      case 61:
+      case 72:
+      case 62:
+      case 63:
+      case 68:
+      case 73:
+      case 75:
         return { op, offset, size: 1 };
       case 1:
       case 15:
@@ -19766,6 +19795,7 @@ function parseCode(view, lineTable) {
       case 43:
       case 46:
       case 53:
+      case 56:
         return { op, arg: view.getUint8(current++), offset, size: 2 };
       case 25:
       case 35:
@@ -19777,11 +19807,60 @@ function parseCode(view, lineTable) {
           offset,
           size: 3
         };
+      case 57:
+        return {
+          op,
+          arg: view.getInt16((current += 2) - 2),
+          offset,
+          size: 3
+        };
+      case 58:
+        return {
+          op,
+          arg: view.getInt32((current += 3) - 3) >> 8,
+          offset,
+          size: 4
+        };
       case 24:
+      case 64:
+      case 65:
+      case 66:
       case 37:
       case 39:
       case 52:
+      case 71:
+      case 67:
         return { op, arg: view.getInt32((current += 4) - 4), offset, size: 5 };
+      case 69:
+        return {
+          op,
+          arg: {
+            module: view.getInt32((current += 4) - 4),
+            var: view.getInt32((current += 4) - 4)
+          },
+          offset,
+          size: 9
+        };
+      case 70:
+        return {
+          op,
+          arg: {
+            local: view.getUint8(current++),
+            var: view.getInt32((current += 4) - 4)
+          },
+          offset,
+          size: 6
+        };
+      case 74:
+        return {
+          op,
+          arg: {
+            argc: view.getUint8(current++),
+            incsp: view.getUint8(current++)
+          },
+          offset,
+          size: 3
+        };
       case 49:
         return {
           op,
@@ -19857,6 +19936,16 @@ function opcodeSize(op) {
     case 20:
     case 54:
     case 47:
+    case 55:
+    case 59:
+    case 60:
+    case 61:
+    case 72:
+    case 62:
+    case 63:
+    case 68:
+    case 73:
+    case 75:
       return 1;
     case 1:
     case 15:
@@ -19867,20 +19956,33 @@ function opcodeSize(op) {
     case 53:
     case 10:
     case 11:
+    case 56:
       return 2;
     case 25:
     case 35:
     case 40:
     case 41:
+    case 57:
+    case 74:
       return 3;
+    case 58:
+      return 4;
+    case 64:
+    case 65:
+    case 66:
     case 24:
     case 37:
     case 39:
     case 52:
     case 38:
+    case 71:
+    case 67:
       return 5;
+    case 70:
+      return 6;
     case 49:
     case 50:
+    case 69:
       return 9;
     case 36:
       throw new Error(`Unknown opcode ${op}`);
@@ -19908,6 +20010,7 @@ function emitBytecode(bytecode, view, offset, linktable, shift_hack) {
     case 43:
     case 46:
     case 53:
+    case 56:
       view.setUint8(offset++, bytecode.arg);
       break;
     case 25:
@@ -19917,12 +20020,36 @@ function emitBytecode(bytecode, view, offset, linktable, shift_hack) {
       linktable.set(offset, bytecode.arg);
       view.setInt16((offset += 2) - 2, 0);
       break;
+    case 57:
+      view.setInt16((offset += 2) - 2, bytecode.arg);
+      break;
+    case 58:
+      view.setInt32((offset += 3) - 3, bytecode.arg << 8);
+      break;
+    case 64:
+    case 65:
+    case 66:
+    case 67:
+    case 71:
     case 24:
     case 37:
     case 39:
-    case 52:
+    case 52: {
       view.setInt32((offset += 4) - 4, bytecode.arg);
       break;
+    }
+    case 69:
+      view.setInt32((offset += 4) - 4, bytecode.arg.module);
+      view.setInt32((offset += 4) - 4, bytecode.arg.var);
+      break;
+    case 70:
+      view.setUint8(offset++, bytecode.arg.local);
+      view.setInt32((offset += 4) - 4, bytecode.arg.var);
+      break;
+    case 74:
+      view.setUint8(offset++, bytecode.arg.argc);
+      view.setUint8(offset++, bytecode.arg.incsp);
+      break;
     case 49:
       view.setBigInt64((offset += 8) - 8, bytecode.arg);
       break;
@@ -19943,6 +20070,7 @@ function getOpInfo(bytecode) {
     case 23:
     case 1:
     case 53:
+    case 74:
     case 25:
     case 35:
       return { pop: 0, push: 0 };
@@ -19978,27 +20106,49 @@ function getOpInfo(bytecode) {
     case 14:
     case 17:
       return { pop: 3, push: 0 };
+    case 73:
+      return { pop: 3, push: 1 };
     case 21:
     case 32:
+    case 75:
     case 45:
     case 48:
     case 20:
     case 54:
     case 47:
+    case 71:
       return { pop: 1, push: 1 };
+    case 64:
+    case 65:
+    case 66:
+    case 67:
+    case 68:
+    case 69:
+    case 70:
     case 42:
     case 44:
     case 43:
+    case 62:
+    case 63:
     case 18:
     case 46:
     case 24:
     case 37:
+    case 55:
+    case 56:
+    case 57:
+    case 58:
     case 38:
+    case 59:
     case 39:
     case 52:
     case 49:
+    case 60:
     case 50:
+    case 61:
       return { pop: 0, push: 1 };
+    case 72:
+      return { pop: 1, push: 1 };
     case 15:
       return { pop: bytecode.arg + 1, push: 1 };
     case 36:
@@ -20014,15 +20164,27 @@ function getOpEffects(bytecode) {
     case 14:
       return 2;
     case 17:
+    case 73:
       return 4;
     case 21:
       return 2 | 4;
     case 15:
+    case 72:
       return 8 | 2 | 4;
+    case 13:
+    case 67:
+    case 69:
+    case 70:
+    case 71:
+    case 16:
+      return 0;
+    case 18:
+      return 0;
     case 0:
     case 23:
     case 1:
     case 53:
+    case 74:
     case 25:
     case 35:
     case 2:
@@ -20048,9 +20210,9 @@ function getOpEffects(bytecode) {
     case 31:
     case 34:
     case 33:
-    case 13:
-    case 16:
+    case 68:
     case 32:
+    case 75:
     case 45:
     case 48:
     case 20:
@@ -20058,16 +20220,27 @@ function getOpEffects(bytecode) {
     case 47:
     case 42:
     case 44:
+    case 64:
+    case 65:
+    case 66:
     case 43:
-    case 18:
+    case 62:
+    case 63:
     case 46:
     case 24:
     case 37:
+    case 55:
+    case 56:
+    case 57:
+    case 58:
     case 38:
+    case 59:
     case 39:
     case 52:
     case 49:
+    case 60:
     case 50:
+    case 61:
       return 0;
     case 36:
       throw new Error(`Unknown opcode ${bytecode.op}`);
@@ -20075,6 +20248,93 @@ function getOpEffects(bytecode) {
       unhandledType(bytecode);
   }
 }
+function opReadsLocal(bytecode) {
+  switch (bytecode.op) {
+    case 67:
+    case 68:
+    case 42:
+      return 0;
+    case 70:
+      return bytecode.arg.local;
+    case 18:
+      return bytecode.arg;
+    case 19:
+    case 14:
+    case 17:
+    case 73:
+    case 21:
+    case 15:
+    case 72:
+    case 13:
+    case 69:
+    case 71:
+    case 16:
+    case 0:
+    case 23:
+    case 1:
+    case 53:
+    case 74:
+    case 25:
+    case 35:
+    case 2:
+    case 22:
+    case 51:
+    case 40:
+    case 41:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+    case 12:
+    case 26:
+    case 27:
+    case 28:
+    case 29:
+    case 30:
+    case 31:
+    case 34:
+    case 33:
+    case 32:
+    case 75:
+    case 45:
+    case 48:
+    case 20:
+    case 54:
+    case 47:
+    case 44:
+    case 64:
+    case 65:
+    case 66:
+    case 43:
+    case 62:
+    case 63:
+    case 46:
+    case 24:
+    case 37:
+    case 55:
+    case 56:
+    case 57:
+    case 58:
+    case 38:
+    case 59:
+    case 39:
+    case 52:
+    case 49:
+    case 60:
+    case 50:
+    case 61:
+      return null;
+    case 36:
+      throw new Error(`Unknown opcode ${bytecode.op}`);
+    default:
+      unhandledType(bytecode);
+  }
+}
 function isBoolOp(op) {
   switch (op) {
     case 32:
@@ -20159,6 +20419,27 @@ var init_opcodes = (0, import_chunk_ABYVSU2C.__esm)({
       Opcodes2[Opcodes2["cpush"] = 52] = "cpush";
       Opcodes2[Opcodes2["argc"] = 53] = "argc";
       Opcodes2[Opcodes2["newba"] = 54] = "newba";
+      Opcodes2[Opcodes2["ipushz"] = 55] = "ipushz";
+      Opcodes2[Opcodes2["ipush1"] = 56] = "ipush1";
+      Opcodes2[Opcodes2["ipush2"] = 57] = "ipush2";
+      Opcodes2[Opcodes2["ipush3"] = 58] = "ipush3";
+      Opcodes2[Opcodes2["fpushz"] = 59] = "fpushz";
+      Opcodes2[Opcodes2["lpushz"] = 60] = "lpushz";
+      Opcodes2[Opcodes2["dpushz"] = 61] = "dpushz";
+      Opcodes2[Opcodes2["btpush"] = 62] = "btpush";
+      Opcodes2[Opcodes2["bfpush"] = 63] = "bfpush";
+      Opcodes2[Opcodes2["apush"] = 64] = "apush";
+      Opcodes2[Opcodes2["bapush"] = 65] = "bapush";
+      Opcodes2[Opcodes2["hpush"] = 66] = "hpush";
+      Opcodes2[Opcodes2["getselfv"] = 67] = "getselfv";
+      Opcodes2[Opcodes2["getself"] = 68] = "getself";
+      Opcodes2[Opcodes2["getmv"] = 69] = "getmv";
+      Opcodes2[Opcodes2["getlocalv"] = 70] = "getlocalv";
+      Opcodes2[Opcodes2["getsv"] = 71] = "getsv";
+      Opcodes2[Opcodes2["invokemz"] = 72] = "invokemz";
+      Opcodes2[Opcodes2["aputvdup"] = 73] = "aputvdup";
+      Opcodes2[Opcodes2["argcincsp"] = 74] = "argcincsp";
+      Opcodes2[Opcodes2["isnotnull"] = 75] = "isnotnull";
       return Opcodes2;
     })(Opcodes || {});
   }
@@ -20330,7 +20611,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
           i = -1;
           continue;
         }
-        if (top.exsucc && (bc.op === 15 || bc.op === 51)) {
+        if (top.exsucc && (bc.op === 15 || bc.op === 72 || bc.op === 51)) {
           doMerge(top.exsucc, true);
         }
       }
@@ -20616,8 +20897,11 @@ function interpBytecode(bc, localState, context) {
     localState.stack.splice(-2, 2, { type });
   };
   switch (bc.op) {
+    case 68:
     case 18: {
-      let local = localState.locals[bc.arg];
+      const localNum = opReadsLocal(bc);
+      (0, import_node_assert7.default)(localNum != null);
+      let local = localState.locals[localNum];
       if (local) {
         local = { ...local };
         delete local.equivs;
@@ -20628,7 +20912,7 @@ function interpBytecode(bc, localState, context) {
         } };
       }
       localState.stack.push(local);
-      addEquiv2(localState, -localState.stack.length, bc.arg);
+      addEquiv2(localState, -localState.stack.length, localNum);
       break;
     }
     case 46: {
@@ -20676,18 +20960,33 @@ function interpBytecode(bc, localState, context) {
       localState.locals[bc.arg].type = value2.type;
       break;
     }
+    case 55:
+      xpush(8, 0);
+      break;
     case 37:
+    case 56:
+    case 57:
+    case 58:
       xpush(8, bc.arg);
       break;
     case 49:
       xpush(16, bc.arg);
       break;
+    case 60:
+      xpush(16, 0n);
+      break;
     case 38:
       xpush(32, roundToFloat(bc.arg));
       break;
+    case 59:
+      xpush(32, 0);
+      break;
     case 50:
       xpush(64, bc.arg);
       break;
+    case 61:
+      xpush(64, 0);
+      break;
     case 52:
       xpush(128, String.fromCharCode(bc.arg));
       break;
@@ -20697,6 +20996,18 @@ function interpBytecode(bc, localState, context) {
         /* False */
       );
       break;
+    case 62:
+      xpush(
+        4
+        /* True */
+      );
+      break;
+    case 63:
+      xpush(
+        2
+        /* False */
+      );
+      break;
     case 44:
       xpush(
         1
@@ -21150,31 +21461,31 @@ function instForType(type, offset) {
         op: 43,
         arg: type.type === 2 ? 0 : 1,
         offset,
-        size: 1
+        size: 2
       };
     case 8:
-      return { op: 37, arg: type.value, offset, size: 1 };
+      return { op: 37, arg: type.value, offset, size: 5 };
     case 16:
-      return { op: 49, arg: type.value, offset, size: 1 };
+      return { op: 49, arg: type.value, offset, size: 9 };
     case 32:
-      return { op: 38, arg: type.value, offset, size: 1 };
+      return { op: 38, arg: type.value, offset, size: 5 };
     case 64:
-      return { op: 50, arg: type.value, offset, size: 1 };
+      return { op: 50, arg: type.value, offset, size: 9 };
     case 128:
       return {
         op: 52,
         arg: type.value.charCodeAt(0),
         offset,
-        size: 1
+        size: 5
       };
     case 131072: {
       const match = type.value.match(/<(\d+)>$/);
       (0, import_node_assert7.default)(match);
       return {
-        op: 37,
+        op: 39,
         arg: parseInt(match[1], 10),
         offset,
-        size: 1
+        size: 5
       };
     }
   }
@@ -21626,23 +21937,42 @@ function localDCE(func, context) {
           }
           break;
         }
+        case 70:
+        case 68:
+        case 67:
         case 18:
+        case 62:
+        case 63:
+        case 42:
+        case 64:
+        case 65:
+        case 66:
         case 44:
         case 43:
         case 24:
         case 37:
+        case 55:
+        case 56:
+        case 57:
+        case 58:
         case 38:
+        case 59:
         case 39:
         case 52:
         case 49:
-        case 50: {
+        case 60:
+        case 50:
+        case 61: {
           const item = dceInfo.stack.pop();
           if (item?.dead) {
             item.deps.push(i);
             reportNop(item);
             item.deps.forEach((index) => makeNop(block.bytecodes[index]));
-          } else if (bytecode.op === 18) {
-            dceInfo.locals.add(bytecode.arg);
+          } else {
+            const local = opReadsLocal(bytecode);
+            if (local != null) {
+              dceInfo.locals.add(local);
+            }
           }
           break;
         }
@@ -21680,6 +22010,7 @@ function localDCE(func, context) {
         }
         case 21:
         case 32:
+        case 75:
         case 45:
         case 48:
         case 20:
@@ -21698,10 +22029,26 @@ function localDCE(func, context) {
         }
         case 51:
         case 15:
+        case 72:
           if (block.exsucc) {
             liveInLocals.get(block.exsucc)?.forEach((local) => dceInfo.locals.add(local));
           }
-        default: {
+        case 17:
+        case 73:
+        case 53:
+        case 1:
+        case 74:
+        case 41:
+        case 40:
+        case 69:
+        case 71:
+        case 25:
+        case 35:
+        case 0:
+        case 14:
+        case 23:
+        case 22:
+        case 36: {
           let { push, pop } = getOpInfo(bytecode);
           while (push-- > 0) {
             dceInfo.stack.pop();
@@ -21709,7 +22056,10 @@ function localDCE(func, context) {
           while (pop-- > 0) {
             dceInfo.stack.push({ dead: false });
           }
+          break;
         }
+        default:
+          unhandledType(bytecode);
       }
     }
     if (changes) {
@@ -21732,18 +22082,22 @@ function computeLiveLocals(func) {
     (block) => new Set(liveOutLocals.get(block.offset)),
     (block, bc, locals) => {
       switch (bc.op) {
-        case 18:
-          locals.add(bc.arg);
-          break;
         case 19:
           locals.delete(bc.arg);
           break;
         case 51:
         case 15:
+        case 72:
           if (block.exsucc) {
             liveInLocals.get(block.exsucc)?.forEach((local) => locals.add(local));
           }
           break;
+        default: {
+          const local = opReadsLocal(bc);
+          if (local != null) {
+            locals.add(local);
+          }
+        }
       }
     },
     (block, locals) => {
@@ -21767,6 +22121,7 @@ function computeLiveLocals(func) {
 var init_dce = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
+    init_data_flow();
     (0, import_chunk_SG7ODKRM.init_util)();
     init_bytecode();
     init_cflow();
@@ -21796,6 +22151,13 @@ function mergeInto2(from, to) {
   });
   return changed;
 }
+function getLocalNum(key) {
+  if (key.op === 19)
+    return key.arg;
+  const local = opReadsLocal(key);
+  (0, import_node_assert9.default)(local !== null);
+  return local;
+}
 function minimizeLocals2(func, equivSets, context) {
   const splitRanges = computeSplitRanges(func, equivSets);
   const locals = mergeSplitRanges(splitRanges);
@@ -21805,21 +22167,22 @@ function minimizeLocals2(func, equivSets, context) {
   const colors = /* @__PURE__ */ new Map();
   const merge = [];
   locals.forEach((local, key) => {
-    if (key.op === 18 || key.arg === 0) {
-      colors.set(key, key.arg);
-      const merged = merge[key.arg];
-      if (argc == null || key.arg < argc) {
+    const localNum = getLocalNum(key);
+    if (key.op !== 19 || localNum === 0) {
+      colors.set(key, localNum);
+      const merged = merge[localNum];
+      if (argc == null || localNum < argc) {
         if (merged) {
-          (0, import_node_assert9.default)(!key.arg);
+          (0, import_node_assert9.default)(!localNum);
           merged.push(key);
         } else {
-          merge[key.arg] = [key];
+          merge[localNum] = [key];
         }
       }
     }
   });
   locals.forEach((local, key) => {
-    if (key.op === 18)
+    if (key.op !== 19)
       return;
     let inUse = 0n;
     local.conflicts.forEach((conflict) => {
@@ -21846,10 +22209,13 @@ function minimizeLocals2(func, equivSets, context) {
     if (argc != null && i <= argc)
       break;
     const merged = merge[i];
-    if (merged && merged[0].arg < i && (argc == null || merged[0].arg >= argc) && merged.every((elem) => elem.arg === merged[0].arg)) {
-      const j = merged[0].arg;
+    if (!merged)
+      continue;
+    const firstLocal = getLocalNum(merged[0]);
+    if (firstLocal < i && (argc == null || firstLocal >= argc) && merged.every((elem) => getLocalNum(elem) === firstLocal)) {
+      const j = firstLocal;
       const other = merge[j];
-      if (other.every((elem) => elem.arg !== j)) {
+      if (other.every((elem) => getLocalNum(elem) !== j)) {
         merge[i] = other;
         merge[j] = merged;
         merged.forEach((elem) => colors.set(elem, j));
@@ -21904,6 +22270,20 @@ function minimizeLocals2(func, equivSets, context) {
     let filter = false;
     block.bytecodes.forEach((bc) => {
       switch (bc.op) {
+        case 74: {
+          argc = bc.arg.argc;
+          const newinc = merge.length - argc;
+          if (newinc > 0) {
+            bc.arg.incsp = newinc;
+          } else {
+            const argCount = bc;
+            argCount.op = 53;
+            argCount.arg = argc;
+            argCount.size = 2;
+            filter = true;
+          }
+          break;
+        }
         case 53:
           argc = bc.arg;
           break;
@@ -21925,11 +22305,16 @@ function minimizeLocals2(func, equivSets, context) {
           }
           break;
         }
+        case 70:
         case 18:
         case 19: {
           const info = fixupMap.get(bc);
           (0, import_node_assert9.default)(info != null);
-          bc.arg = info.color;
+          if (bc.op === 70) {
+            bc.arg.local = info.color;
+          } else {
+            bc.arg = info.color;
+          }
           if (info.range) {
             bc.range = info.range;
           } else {
@@ -21937,6 +22322,17 @@ function minimizeLocals2(func, equivSets, context) {
           }
           break;
         }
+        case 42:
+        case 68:
+        case 67: {
+          const info = fixupMap.get(bc);
+          if (info) {
+            (0, import_node_assert9.default)(!info.color);
+          }
+          break;
+        }
+        default:
+          (0, import_node_assert9.default)(!fixupMap.get(bc));
       }
     });
     if (filter) {
@@ -21952,43 +22348,34 @@ function computeSplitRanges(func, equivSets) {
   const liveOutLocals = /* @__PURE__ */ new Map();
   const liveInLocals = /* @__PURE__ */ new Map();
   const splitRanges = /* @__PURE__ */ new Map();
-  const recordLgetv = (locals, bc) => {
-    const bcs = locals.get(bc.arg);
+  const recordLocalRead = (locals, bc) => {
+    const localid = opReadsLocal(bc);
+    (0, import_node_assert9.default)(localid != null);
+    const bcs = locals.get(localid);
     if (!bcs) {
-      locals.set(bc.arg, /* @__PURE__ */ new Set([bc]));
+      locals.set(localid, /* @__PURE__ */ new Set([bc]));
     } else {
       bcs.add(bc);
     }
   };
-  const fakeLgetvs = /* @__PURE__ */ new Map();
   postOrderPropagate(
     func,
     (block) => cloneLive(liveOutLocals.get(block.offset)),
     (block, bc, locals) => {
       switch (bc.op) {
-        case 42: {
-          let fakeLgetv = fakeLgetvs.get(bc);
-          if (!fakeLgetv) {
-            fakeLgetv = {
-              op: 18,
-              arg: 0,
-              size: 2,
-              offset: bc.offset
-            };
-            fakeLgetvs.set(bc, fakeLgetv);
-          }
-          recordLgetv(locals, fakeLgetv);
-          break;
-        }
+        case 68:
+        case 67:
+        case 70:
+        case 42:
         case 18:
-          recordLgetv(locals, bc);
+          recordLocalRead(locals, bc);
           break;
         case 19: {
           let bcs = locals.get(bc.arg);
           if (!bcs) {
             bcs = /* @__PURE__ */ new Set();
           }
-          let ranges = splitRanges.get(bc.arg);
+          const ranges = splitRanges.get(bc.arg);
           const equiv = equivSets.get(bc);
           const conflicts = /* @__PURE__ */ new Set();
           locals.forEach((liveBcs, local) => {
@@ -21999,10 +22386,7 @@ function computeSplitRanges(func, equivSets) {
             liveBcs.forEach((lbc) => conflicts.add(lbc));
           });
           if (!ranges) {
-            splitRanges.set(
-              bc.arg,
-              ranges = /* @__PURE__ */ new Map([[bc, { live: bcs, conflicts }]])
-            );
+            splitRanges.set(bc.arg, /* @__PURE__ */ new Map([[bc, { live: bcs, conflicts }]]));
           } else {
             ranges.set(bc, { live: bcs, conflicts });
           }
@@ -22011,6 +22395,7 @@ function computeSplitRanges(func, equivSets) {
         }
         case 51:
         case 15:
+        case 72:
           if (block.exsucc) {
             const from = liveInLocals.get(block.exsucc);
             if (from) {
@@ -22018,6 +22403,8 @@ function computeSplitRanges(func, equivSets) {
             }
           }
           break;
+        default:
+          (0, import_node_assert9.default)(opReadsLocal(bc) == null);
       }
     },
     (block, locals) => {
@@ -22080,7 +22467,7 @@ function mergeSplitRanges(splitRanges) {
       let lputv = null;
       let singleRange = null;
       pvSet.forEach((pv) => {
-        if (!lputv || pv.op === 18)
+        if (!lputv || pv.op !== 19)
           lputv = pv;
       });
       pvSet.forEach((pv) => {
@@ -22109,6 +22496,7 @@ function mergeSplitRanges(splitRanges) {
       v.conflicts = new Set(
         Array.from(v.conflicts).flatMap((bc) => {
           const r = bcToLiveRange.get(bc);
+          (0, import_node_assert9.default)(r);
           if (!r) {
             (0, import_node_assert9.default)(bc.arg === 0);
             return [];
@@ -22262,7 +22650,7 @@ function sizeBasedPRE2(func, context) {
     const bcs = canonicalMap.get(key);
     (0, import_node_assert10.default)(bcs);
     let index = block.bytecodes.findIndex(
-      (bc2) => bcs.has(bc2) || block.exsucc && (bc2.op === 15 || bc2.op === 51)
+      (bc2) => bcs.has(bc2) || block.exsucc && (bc2.op === 15 || bc2.op === 72 || bc2.op === 51)
     );
     if (index < 0) {
       if (block.next && !block.taken) {
@@ -23177,6 +23565,7 @@ function getLocalsInfo(func) {
           break;
         case 51:
         case 15:
+        case 72:
           if (block.exsucc) {
             const from = liveInLocals.get(block.exsucc);
             if (from) {
@@ -23270,8 +23659,11 @@ var init_exceptions = (0, import_chunk_ABYVSU2C.__esm)({
 });
 function parseHeader(view) {
   let offset = 0;
-  const ciqVersion = view.getUint32((offset += 4) - 4);
+  const word = view.getUint32((offset += 4) - 4);
+  const ciqVersion = word & 16777215;
+  const headerVersion = word >>> 24;
   const header = {
+    headerVersion,
     ciqVersion,
     backgroundOffsets: { data: 0, code: 0 },
     appLock: false,
@@ -23296,10 +23688,13 @@ function parseHeader(view) {
   return header;
 }
 function fixupHeader(context, updateInfo) {
-  const view = context.sections[
+  const view = (context.sections[
     -805253120
     /* HEADER */
-  ].view;
+  ] ?? context.sections[
+    -805253107
+    /* HEADER_VERSIONED */
+  ]).view;
   if (context.header.backgroundOffsets.code !== 0) {
     const offset = updateInfo.offsetMap.get(
       context.header.backgroundOffsets.code
@@ -23716,6 +24111,16 @@ function lineInfoToString(lineInfo, context) {
 }
 function bytecodeToString(bytecode, symbolTable) {
   let arg = null;
+  const symbol = (arg2) => {
+    const argSym = symbolTable?.symbolToLabelMap.get(arg2);
+    if (argSym) {
+      const symbol2 = symbolTable?.symbols.get(argSym);
+      if (symbol2) {
+        return `${symbol2.str} (${arg2})`;
+      }
+    }
+    return arg2.toString();
+  };
   switch (bytecode.op) {
     case 18:
     case 19:
@@ -23723,30 +24128,31 @@ function bytecodeToString(bytecode, symbolTable) {
         arg = `${bytecode.range.name} ${bytecode.arg}${bytecode.range.isParam ? " (param)" : ""}`;
       }
       break;
-    case 39: {
-      const argSym = symbolTable?.symbolToLabelMap.get(bytecode.arg);
-      if (argSym) {
-        const symbol = symbolTable?.symbols.get(argSym);
-        if (symbol) {
-          arg = `${symbol.str} (${bytecode.arg})`;
-        }
-      }
+    case 39:
+      arg = symbol(bytecode.arg);
       break;
-    }
     case 24: {
-      const symbol = symbolTable?.symbols.get(bytecode.arg);
-      if (symbol) {
-        arg = `${JSON.stringify(symbol.str)} (${bytecode.arg})`;
+      const symbol2 = symbolTable?.symbols.get(bytecode.arg);
+      if (symbol2) {
+        arg = `${JSON.stringify(symbol2.str)} (${bytecode.arg})`;
       }
       break;
     }
     case 40:
     case 41:
     case 25:
-    case 35: {
+    case 35:
       arg = offsetToString(bytecode.arg);
       break;
-    }
+    case 70:
+      arg = `${bytecode.range ? `${bytecode.range.name} ${bytecode.arg}${bytecode.range.isParam ? " (param)" : ""}` : bytecode.arg.local} ${symbol(bytecode.arg.var)}`;
+      break;
+    case 69:
+      arg = `${symbol(bytecode.arg.module)} ${symbol(bytecode.arg.var)}`;
+      break;
+    case 74:
+      arg = `${bytecode.arg.argc} ${bytecode.arg.incsp}`;
+      break;
   }
   if (arg == null && (0, import_chunk_MBTLUWXR.hasProperty)(bytecode, "arg")) {
     arg = `${bytecode.arg}`;
@@ -23801,6 +24207,7 @@ function findFunctions({
         next = void 0;
         break;
       case 15:
+      case 72:
         mayThrow2 = true;
         break;
       case 22:
@@ -23989,8 +24396,8 @@ function splitBlock(func, block, offset) {
   const fixEx = (block2, isNew) => {
     if (block2.exsucc) {
       if (!block2.bytecodes.some(
-        (bc) => bc.op === 51 || bc.op === 15
-        /* invokem */
+        (bc) => bc.op === 51 || bc.op === 15 || bc.op === 72
+        /* invokemz */
       )) {
         if (!isNew) {
           removePred(func, block2.exsucc, block2.offset);
@@ -24084,6 +24491,7 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
     init_optimize2();
     SectionKinds = /* @__PURE__ */ ((SectionKinds2) => {
       SectionKinds2[SectionKinds2["HEADER"] = -805253120] = "HEADER";
+      SectionKinds2[SectionKinds2["HEADER_VERSIONED"] = -805253107] = "HEADER_VERSIONED";
       SectionKinds2[SectionKinds2["TEXT"] = -1059145026] = "TEXT";
       SectionKinds2[SectionKinds2["DATA"] = -629491010] = "DATA";
       SectionKinds2[SectionKinds2["SYMBOLS"] = 1461170197] = "SYMBOLS";
@@ -28181,12 +28589,13 @@ async function generateOptimizedProject(options) {
   );
   await createLocalBarrels(targets, config);
   const buildConfigs = {};
-  let pick_one = config.products ? config.products.indexOf("pick-one") : -1;
+  const pick_one = config.products ? config.products.indexOf("pick-one") : -1;
+  if (pick_one >= 0) {
+    let preferredProduct = 0;
+    options.products = [...options.products];
+    options.products[pick_one] = targets[preferredProduct].product;
+  }
   if (config.skipOptimization) {
-    if (pick_one >= 0) {
-      options.products = [...options.products];
-      options.products[pick_one] = targets[0].product;
-    }
     return {
       jungleFiles: config.jungleFiles,
       xml,
@@ -28209,12 +28618,7 @@ async function generateOptimizedProject(options) {
       }
       buildConfigs[key] = null;
     }
-    if (pick_one >= 0 || !options.products || options.products.includes(p.product) || p.shape && options.products.includes(p.shape)) {
-      if (pick_one >= 0) {
-        options.products = [...options.products];
-        options.products[pick_one] = p.product;
-        pick_one = -1;
-      }
+    if (!options.products || options.products.includes(p.product) || p.shape && options.products.includes(p.shape)) {
       if (!buildConfigs[key]) {
         buildConfigs[key] = p.group.optimizerConfig;
         configsToBuild++;
@@ -28565,7 +28969,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1711474096407 < opt_time) {
+      if (source_time < opt_time && 1712549362694 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28604,7 +29008,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.51",
+            optimizerVersion: "1.1.53",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29063,10 +29467,15 @@ function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, confi
   if (apiDebugXml) {
     symbolTable.parseXml(apiDebugXml);
   }
-  const header = parseHeader(sections[
-    -805253120
-    /* HEADER */
-  ].view);
+  const header = parseHeader(
+    (sections[
+      -805253120
+      /* HEADER */
+    ] ?? sections[
+      -805253107
+      /* HEADER_VERSIONED */
+    ]).view
+  );
   parseData(sections[
     -629491010
     /* DATA */
@@ -29370,9 +29779,10 @@ async function getDeviceInfo() {
             (part) => part.languages.map((lang) => [lang.code, true])
           ).flat(1)
         );
+        const ciqVersions = partNumbers.map((part) => part.connectIQVersion);
         return [
           deviceId,
-          { appTypes, deviceFamily, displayName, languages }
+          { appTypes, deviceFamily, displayName, languages, ciqVersions }
         ];
       });
     })