@markw65/monkeyc-optimizer 1.1.92 → 1.1.94

package/build/api.cjs

@@ -18,52 +18,52 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_VAV4N2CL.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_VAV4N2CL.clearDiagnostics,
-  collectNamespaces: () => import_chunk_VAV4N2CL.collectNamespaces,
-  createDocumentationMap: () => import_chunk_VAV4N2CL.createDocumentationMap,
-  declKey: () => import_chunk_VAV4N2CL.declKey,
-  diagnostic: () => import_chunk_VAV4N2CL.diagnostic,
-  diagnosticHelper: () => import_chunk_VAV4N2CL.diagnosticHelper,
-  findNamesInScope: () => import_chunk_VAV4N2CL.findNamesInScope,
-  findUsingForNode: () => import_chunk_VAV4N2CL.findUsingForNode,
-  formatAst: () => import_chunk_VAV4N2CL.formatAst,
-  formatAstLongLines: () => import_chunk_VAV4N2CL.formatAstLongLines,
-  formatScopedName: () => import_chunk_VAV4N2CL.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_VAV4N2CL.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_VAV4N2CL.getApiMapping,
-  getSuperClasses: () => import_chunk_VAV4N2CL.getSuperClasses,
-  handleImportUsing: () => import_chunk_VAV4N2CL.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_5SB3QASN.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_5SB3QASN.clearDiagnostics,
+  collectNamespaces: () => import_chunk_5SB3QASN.collectNamespaces,
+  createDocumentationMap: () => import_chunk_5SB3QASN.createDocumentationMap,
+  declKey: () => import_chunk_5SB3QASN.declKey,
+  diagnostic: () => import_chunk_5SB3QASN.diagnostic,
+  diagnosticHelper: () => import_chunk_5SB3QASN.diagnosticHelper,
+  findNamesInScope: () => import_chunk_5SB3QASN.findNamesInScope,
+  findUsingForNode: () => import_chunk_5SB3QASN.findUsingForNode,
+  formatAst: () => import_chunk_5SB3QASN.formatAst,
+  formatAstLongLines: () => import_chunk_5SB3QASN.formatAstLongLines,
+  formatScopedName: () => import_chunk_5SB3QASN.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_5SB3QASN.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_5SB3QASN.getApiMapping,
+  getSuperClasses: () => import_chunk_5SB3QASN.getSuperClasses,
+  handleImportUsing: () => import_chunk_5SB3QASN.handleImportUsing,
   hasProperty: () => import_chunk_UBAYZSM3.hasProperty,
-  isClassVariable: () => import_chunk_VAV4N2CL.isClassVariable,
-  isLocal: () => import_chunk_VAV4N2CL.isLocal,
-  isLookupCandidate: () => import_chunk_VAV4N2CL.isLookupCandidate,
-  isStateNode: () => import_chunk_VAV4N2CL.isStateNode,
-  lookupByFullName: () => import_chunk_VAV4N2CL.lookupByFullName,
-  lookupNext: () => import_chunk_VAV4N2CL.lookupNext,
-  lookupResultContains: () => import_chunk_VAV4N2CL.lookupResultContains,
-  lookupWithType: () => import_chunk_VAV4N2CL.lookupWithType,
-  makeToyboxLink: () => import_chunk_VAV4N2CL.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_VAV4N2CL.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_VAV4N2CL.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_VAV4N2CL.parseSdkVersion,
-  popRootNode: () => import_chunk_VAV4N2CL.popRootNode,
-  pushRootNode: () => import_chunk_VAV4N2CL.pushRootNode,
-  resolveDiagnostics: () => import_chunk_VAV4N2CL.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_VAV4N2CL.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_VAV4N2CL.sameLookupResult,
+  isClassVariable: () => import_chunk_5SB3QASN.isClassVariable,
+  isLocal: () => import_chunk_5SB3QASN.isLocal,
+  isLookupCandidate: () => import_chunk_5SB3QASN.isLookupCandidate,
+  isStateNode: () => import_chunk_5SB3QASN.isStateNode,
+  lookupByFullName: () => import_chunk_5SB3QASN.lookupByFullName,
+  lookupNext: () => import_chunk_5SB3QASN.lookupNext,
+  lookupResultContains: () => import_chunk_5SB3QASN.lookupResultContains,
+  lookupWithType: () => import_chunk_5SB3QASN.lookupWithType,
+  makeToyboxLink: () => import_chunk_5SB3QASN.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_5SB3QASN.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_5SB3QASN.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_5SB3QASN.parseSdkVersion,
+  popRootNode: () => import_chunk_5SB3QASN.popRootNode,
+  pushRootNode: () => import_chunk_5SB3QASN.pushRootNode,
+  resolveDiagnostics: () => import_chunk_5SB3QASN.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_5SB3QASN.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_5SB3QASN.sameLookupResult,
   traverseAst: () => import_chunk_UBAYZSM3.traverseAst,
-  variableDeclarationName: () => import_chunk_VAV4N2CL.variableDeclarationName,
-  visitReferences: () => import_chunk_VAV4N2CL.visitReferences,
-  visit_resources: () => import_chunk_VAV4N2CL.visit_resources,
-  visitorNode: () => import_chunk_VAV4N2CL.visitorNode
+  variableDeclarationName: () => import_chunk_5SB3QASN.variableDeclarationName,
+  visitReferences: () => import_chunk_5SB3QASN.visitReferences,
+  visit_resources: () => import_chunk_5SB3QASN.visit_resources,
+  visitorNode: () => import_chunk_5SB3QASN.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_VAV4N2CL = require("./chunk-VAV4N2CL.cjs");
+var import_chunk_5SB3QASN = require("./chunk-5SB3QASN.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_VAV4N2CL.init_api)();
+(0, import_chunk_5SB3QASN.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-VAV4N2CL.cjs → chunk-5SB3QASN.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_VAV4N2CL_exports = {};
-__export(chunk_VAV4N2CL_exports, {
+var chunk_5SB3QASN_exports = {};
+__export(chunk_5SB3QASN_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_VAV4N2CL_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_VAV4N2CL_exports);
+module.exports = __toCommonJS(chunk_5SB3QASN_exports);
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
@@ -3392,9 +3392,8 @@ function skipClassDef(view, current, symbols, code) {
     const type = isVariableSized ? view.getUint8(current++) : f1 & 15;
     const addr = view.getUint32((current += 4) - 4);
     if (type !== 6) continue;
-    const section = addr >>> 28;
-    if (section === 1) {
-      const pc = addr & 16777215;
+    if ((addr & SECTION_PC_MASK) === TEXT_SECTION_PC) {
+      const pc = addr & PC_OFFSET_MASK;
       const method = symbols.methods.get(pc);
       if (method) {
         if (method.id != null) {
@@ -3447,9 +3446,8 @@ function fixupClassDef(view, current, offsetMap, code) {
     const type = isVariableSized ? view.getUint8(current++) : f1 & 15;
     const addr = view.getUint32((current += 4) - 4);
     if (type !== 6) continue;
-    const section = addr >>> 28;
-    if (section === 1) {
-      const pc = addr & 16777215;
+    if ((addr & SECTION_PC_MASK) === TEXT_SECTION_PC) {
+      const pc = addr & PC_OFFSET_MASK;
       const newPc = offsetMap.get(pc);
       (0, import_node_assert.default)(newPc != null);
       view.setUint32(current - 4, addr - pc + newPc);
@@ -3508,7 +3506,7 @@ function recordCalledFunc(func, callee) {
   return null;
 }
 function recordCalledFuncs(func, callees) {
-  callees.forEach((callee) => {
+  (0, import_chunk_IJS7AYMN.forEach)(callees, (callee) => {
     recordCalledFunc(func, callee);
   });
 }
@@ -3596,6 +3594,7 @@ var init_function_info = (0, import_chunk_VS2QQHAK.__esm)({
   "src/function-info.ts"() {
     "use strict";
     (0, import_chunk_UBAYZSM3.init_ast)();
+    (0, import_chunk_IJS7AYMN.init_util)();
   }
 });
 var buildConfigDescription;
@@ -11655,6 +11654,10 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
 function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
+  const rootFunc = root.type === "FunctionDeclaration" ? root : null;
+  if (rootFunc) {
+    delete rootFunc.next_info;
+  }
   const isStatic = !!(root.attributes & 8);
   const klass = root.stack?.[root.stack?.length - 1].sn;
   const selfClassDecl = klass && klass.type === "ClassDeclaration" ? klass : null;
@@ -12031,10 +12034,32 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     root,
     dependencies
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_IJS7AYMN.some)(
-    decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_IJS7AYMN.some)(callees, (callee) => functionMayModify(state, callee, decl)))
-  );
+  const modifiableDecl = (decls, callees, node) => {
+    if (!callees) {
+      const lv = node.type === "AssignmentExpression" ? node.left : node.type === "UpdateExpression" ? node.argument : null;
+      if (!lv) return true;
+      if (lv.type === "MemberExpression") {
+        if (lv.computed) {
+          if (lv.property.type === "Literal") {
+            return false;
+          }
+          if ((lv.property.type !== "UnaryExpression" || lv.property.operator !== ":") && !couldBe(
+            {
+              type: 131072
+              /* Symbol */
+            },
+            evaluate(istate, lv.property).value
+          )) {
+            return false;
+          }
+        }
+      }
+    }
+    return (0, import_chunk_IJS7AYMN.some)(
+      decls,
+      (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (0, import_chunk_IJS7AYMN.some)(callees, (callee) => functionMayModify(state, callee, decl))
+    );
+  };
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
       if (succ.order == null) {
@@ -12459,6 +12484,13 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           (0, import_chunk_IJS7AYMN.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
+          if (rootFunc) {
+            if (callees) {
+              recordCalledFuncs(rootFunc, callees);
+            } else {
+              recordModifiedUnknown(rootFunc);
+            }
+          }
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
           if (calleeObj) {
             const objType = getStateType(curState, calleeObj);
@@ -12487,7 +12519,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
             if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_IJS7AYMN.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
-            if (modifiableDecl(decl, callees)) {
+            if (modifiableDecl(decl, callees, event.node)) {
               if (tsv.equivSet) {
                 removeEquiv(curState.map, decl);
               }
@@ -12521,6 +12553,26 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         break;
       }
       case "def": {
+        if (rootFunc) {
+          (0, import_chunk_IJS7AYMN.forEach)(event.decl, (decl) => {
+            if (decl.type === "VariableDeclarator") {
+              if (decl.node.kind !== "var") return;
+              if (isLocal(decl)) return;
+              recordModifiedDecl(rootFunc, decl);
+              return;
+            }
+            if (decl.type === "MemberDecl") {
+              const name = isLookupCandidate(decl.node);
+              if (name) {
+                recordModifiedName(rootFunc, name.name);
+                return;
+              }
+            } else if (decl.type !== "Unknown") {
+              return;
+            }
+            recordModifiedUnknown(rootFunc);
+          });
+        }
         const lval = event.node.type === "UpdateExpression" ? event.node.argument : event.node.type === "AssignmentExpression" ? event.node.left : null;
         if (lval) {
           if (nodeCopyProp.size && lval.type === "MemberExpression") {
@@ -13091,6 +13143,9 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       }
     );
   }
+  if (rootFunc) {
+    rootFunc.info = rootFunc.next_info ?? false;
+  }
   return {
     istate,
     nodeEquivs,
@@ -15321,7 +15376,6 @@ function getFileASTs(fnMap) {
         try {
           value2.ast = import_prettier_plugin_monkeyc2.default.parsers.monkeyc.parse(
             value2.monkeyCSource,
-            null,
             options
           );
         } catch (e) {
@@ -16675,7 +16729,7 @@ function visit_resource_refs(state, doc, e, barrelNames) {
     }
     const startPos = (0, import_chunk_UBAYZSM3.adjustLoc)(loc, -1, 0).start;
     try {
-      const expr = import_prettier_plugin_monkeyc3.default.parsers.monkeyc.parse(`(${name})`, null, {
+      const expr = import_prettier_plugin_monkeyc3.default.parsers.monkeyc.parse(`(${name})`, {
         filepath: loc.source || void 0,
         singleExpression: true
       });
@@ -16720,30 +16774,33 @@ function visit_resource_refs(state, doc, e, barrelNames) {
     }
     if (id === "personality") {
       const elems = dotted.match(/\s+|\S+/g);
-      elems?.reduce((loc, name) => {
-        if (/\s/.test(name)) {
-          const newLines = name.match(/\r\n|[\r\n]/g);
-          if (newLines?.length) {
-            loc.start.line += newLines.length;
-            loc.start.column = 1;
-            loc.start.offset += name.length;
-            name = name.replace(/^.*(\r\n|[\r\n])(.*)$/, "$2");
-            loc.start.offset -= name.length;
+      elems?.reduce(
+        (loc, name) => {
+          if (/\s/.test(name)) {
+            const newLines = name.match(/\r\n|[\r\n]/g);
+            if (newLines?.length) {
+              loc.start.line += newLines.length;
+              loc.start.column = 1;
+              loc.start.offset += name.length;
+              name = name.replace(/^.*(\r\n|[\r\n])(.*)$/, "$2");
+              loc.start.offset -= name.length;
+            }
+          } else {
+            const colonPos = name.indexOf(":");
+            const barrel = colonPos < 0 ? "" : name.slice(0, colonPos) + ".";
+            name = name.slice(colonPos + 1);
+            const base = (0, import_chunk_UBAYZSM3.makeScopedName)(`${barrel}Rez.Styles`);
+            const idLoc = (0, import_chunk_UBAYZSM3.adjustLoc)(loc, colonPos + 1, 0);
+            idLoc.end = { ...idLoc.start };
+            idLoc.end.column += name.length;
+            idLoc.end.offset += name.length;
+            const id2 = (0, import_chunk_UBAYZSM3.makeIdentifier)(name, idLoc);
+            result.push((0, import_chunk_UBAYZSM3.makeMemberExpression)((0, import_chunk_UBAYZSM3.withLoc)(base, id2, false), id2));
           }
-        } else {
-          const colonPos = name.indexOf(":");
-          const barrel = colonPos < 0 ? "" : name.slice(0, colonPos) + ".";
-          name = name.slice(colonPos + 1);
-          const base = (0, import_chunk_UBAYZSM3.makeScopedName)(`${barrel}Rez.Styles`);
-          const idLoc = (0, import_chunk_UBAYZSM3.adjustLoc)(loc, colonPos + 1, 0);
-          idLoc.end = { ...idLoc.start };
-          idLoc.end.column += name.length;
-          idLoc.end.offset += name.length;
-          const id2 = (0, import_chunk_UBAYZSM3.makeIdentifier)(name, idLoc);
-          result.push((0, import_chunk_UBAYZSM3.makeMemberExpression)((0, import_chunk_UBAYZSM3.withLoc)(base, id2, false), id2));
-        }
-        return (0, import_chunk_UBAYZSM3.adjustLoc)(loc, name.length, 0);
-      }, (0, import_chunk_UBAYZSM3.adjustLoc)(l, 0, 0));
+          return (0, import_chunk_UBAYZSM3.adjustLoc)(loc, name.length, 0);
+        },
+        (0, import_chunk_UBAYZSM3.adjustLoc)(l, 0, 0)
+      );
       return;
     }
     if (/^\s*(true|false|null|NaN|(0x|#)[0-9a-f]+|[-+]?\d+%?)\s*$/i.test(dotted)) {
@@ -17286,9 +17343,7 @@ function checkCompilerVersion(version, sdkVer) {
 }
 function pushRootNode(state, stack, root) {
   if (root.type === "Program") return;
-  const sn = root.stack?.at(-1)?.sn?.decls?.[root.name]?.find(
-    (sn2) => sn2.type === root.type && (root.nodes != null || sn2.node === root.node)
-  ) ?? state.nestedClasses[root.name]?.find((d) => d.node === root.node);
+  const sn = root.stack?.at(-1)?.sn?.decls?.[root.name]?.find((sn2) => sn2.type === root.type && (root.nodes != null || sn2.node === root.node)) ?? state.nestedClasses[root.name]?.find((d) => d.node === root.node);
   if (!sn) {
     throw new Error(`Invalid stack for node ${root.fullName}`);
   }
@@ -17315,7 +17370,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
     }
   }
   const api = (await fs2.readFile(`${sdk}bin/api.mir`)).toString().replace(/\r\n/g, "\n").replace(/^(\s*static)?\s*<init>\s*\{\s*\}\s*?\n/gm, "").replace(/^(\s*type)\s/gm, "$1def ");
-  const ast = parser.parse(api, null, {
+  const ast = parser.parse(api, {
     filepath: "api.mir"
   });
   if (resourcesMap) {
@@ -18697,6 +18752,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
   };
   const findDecl = (node) => {
     const path8 = [];
+    const root2 = node;
     while (node.type === "MemberExpression" && (wantsAllRefs || !node.computed)) {
       path8.unshift(node);
       node = node.object;
@@ -18726,7 +18782,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
       )) {
         return {
           type: "MemberDecl",
-          node,
+          node: root2,
           base: decl,
           path: path8
         };
@@ -19263,7 +19319,7 @@ function parseCode(view, lineTable) {
   const results = [];
   while (current < view.byteLength) {
     const nextOp = parseOne();
-    const lineNum = lineTable.get(nextOp.offset | 268435456);
+    const lineNum = lineTable.get(nextOp.offset | TEXT_SECTION_PC);
     if (lineNum) {
       nextOp.lineNum = lineNum;
     }
@@ -19737,6 +19793,7 @@ var init_opcodes = (0, import_chunk_VS2QQHAK.__esm)({
   "src/readprg/opcodes.ts"() {
     "use strict";
     init_data_flow();
+    init_bytecode();
     Opcodes = /* @__PURE__ */ ((Opcodes2) => {
       Opcodes2[Opcodes2["nop"] = 0] = "nop";
       Opcodes2[Opcodes2["incsp"] = 1] = "incsp";
@@ -22736,7 +22793,7 @@ function emitFunc(func, view, start, updateInfo, context) {
       if (bytecode.lineNum) {
         if (!lineNum || !compareLineInfo(lineNum, bytecode.lineNum)) {
           lineNum = { ...bytecode.lineNum };
-          lineNum.pc = offset | 268435456;
+          lineNum.pc = offset | TEXT_SECTION_PC;
           updateInfo.lineMap.push(lineNum);
         }
       }
@@ -22946,6 +23003,7 @@ var init_emit = (0, import_chunk_VS2QQHAK.__esm)({
   "src/readprg/emit.ts"() {
     "use strict";
     (0, import_chunk_UBAYZSM3.init_ast)();
+    init_bytecode();
     init_cflow();
     init_opcodes();
     init_optimize2();
@@ -23110,7 +23168,14 @@ function parseLineNum(view, debugXml) {
   return results;
 }
 function fixupLineNum(context, updateInfo) {
-  const symLineTable = updateInfo.lineMap.filter(
+  const newLineTable = updateInfo.lineMap.concat(
+    Array.from(context.lineTable.values()).filter(
+      (lineNum) => (lineNum.pc & SECTION_PC_MASK) !== TEXT_SECTION_PC
+    )
+  );
+  newLineTable.sort((a, b) => a.pc - b.pc);
+  context.lineTable = new Map(newLineTable.map((l) => [l.pc, l]));
+  const symLineTable = newLineTable.filter(
     (lineNum) => lineNum.file != null
   );
   const sectionLength = 2 + symLineTable.length * 16;
@@ -23142,7 +23207,7 @@ function fixupLineNum(context, updateInfo) {
     8,
     sectionLength
   );
-  const strLineTable = updateInfo.lineMap.filter(
+  const strLineTable = newLineTable.filter(
     (lineNum) => lineNum.fileStr != null
   );
   if (context.debugXml.body instanceof Error) return;
@@ -23198,8 +23263,8 @@ function markLocals(context) {
   context.debugXml.body.children("localVars").children("entry").elements.forEach((entry) => {
     const { startPc, endPc, stackId, name, arg } = entry.attr;
     (0, import_node_assert16.default)(startPc && endPc && stackId && name);
-    const spc = Number(startPc.value.value) & 16777215;
-    const epc = (Number(endPc.value.value) & 16777215) + 1;
+    const spc = Number(startPc.value.value) & PC_OFFSET_MASK;
+    const epc = (Number(endPc.value.value) & PC_OFFSET_MASK) + 1;
     const sid = Number(stackId.value.value);
     let locals = localMap.get(spc);
     if (!locals) {
@@ -23332,7 +23397,7 @@ function optimizeBytecode(context) {
   funcArray.push({ offset: code.byteLength, blocks: /* @__PURE__ */ new Map() });
   const funcIndex = (pc) => {
     let lo = 0, hi = funcArray.length;
-    pc = pc & 16777215;
+    pc = pc & PC_OFFSET_MASK;
     while (hi - lo > 1) {
       const mid = hi + lo >>> 1;
       if (funcArray[mid].offset > pc) {
@@ -23346,29 +23411,33 @@ function optimizeBytecode(context) {
   const funcRange = (pc) => {
     const index = funcIndex(pc);
     (0, import_node_assert16.default)(
-      funcArray[index].offset <= (pc & 16777215) && funcArray[index + 1].offset > (pc & 16777215)
+      funcArray[index].offset <= (pc & PC_OFFSET_MASK) && funcArray[index + 1].offset > (pc & PC_OFFSET_MASK)
     );
     const s = offsetMap.get(funcArray[index].offset);
     const e = offsetMap.get(funcArray[index + 1].offset);
     if (s == null || e == null) {
       (0, import_node_assert16.default)(s != null && e != null);
     }
-    return [s + 268435456, e + 268435456];
+    return [s + TEXT_SECTION_PC, e + TEXT_SECTION_PC];
   };
   const localVars = context.debugXml.body.children("localVars");
   const addAttr = (element, attrName, attrValue) => {
     element.attr[attrName] = xml_util_exports.makeAttribute(attrName, attrValue);
   };
   localVars.elements.forEach((element, i) => {
+    const original = element.children;
     delete element.children;
     if (i) return;
-    element.children = [];
-    const children = element.children;
+    const children = original?.filter((elt) => {
+      if (elt.type !== "element") return false;
+      if (!elt.attr?.startPc) return false;
+      const spc = Number(elt.attr.startPc.value.value);
+      return (spc & SECTION_PC_MASK) !== TEXT_SECTION_PC;
+    }) ?? [];
     updateInfo.localRanges.forEach((localRange) => {
       if (localRange.endPc === localRange.startPc) {
         return;
       }
-      children.push({ type: "chardata", value: "\n" });
       const element2 = {
         type: "element",
         name: "entry",
@@ -23378,18 +23447,34 @@ function optimizeBytecode(context) {
       if (localRange.isParam) {
         addAttr(element2, "arg", "true");
       }
-      addAttr(element2, "startPc", (localRange.startPc + 268435456).toString());
-      addAttr(element2, "endPc", (localRange.endPc + 268435456).toString());
+      addAttr(
+        element2,
+        "startPc",
+        (localRange.startPc + TEXT_SECTION_PC).toString()
+      );
+      addAttr(
+        element2,
+        "endPc",
+        (localRange.endPc + TEXT_SECTION_PC).toString()
+      );
       addAttr(element2, "stackId", localRange.slot.toString());
       children.push(element2);
     });
-    children.push({ type: "chardata", value: "\n" });
+    element.children = children.sort(
+      (a, b) => Number(a.attr.startPc?.value.value ?? 0) - Number(b.attr.startPc?.value.value ?? 0)
+    ).flatMap((e) => [{ type: "chardata", value: "\n" }, e]);
+    element.children.push({ type: "chardata", value: "\n" });
   });
   context.debugXml.body.children("functions").children("functionEntry").elements.forEach((entry) => {
     const { startPc, endPc } = entry.attr;
     if (!startPc || !endPc) return;
-    const range = funcRange(Number(startPc.value.value));
-    (0, import_node_assert16.default)(funcRange(Number(endPc.value.value))[0] === range[0]);
+    const spc = Number(startPc.value.value);
+    const epc = Number(endPc.value.value);
+    if ((spc & SECTION_PC_MASK) !== TEXT_SECTION_PC) {
+      return;
+    }
+    const range = funcRange(spc);
+    (0, import_node_assert16.default)(funcRange(epc)[0] === range[0]);
     startPc.value.value = range[0].toString();
     endPc.value.value = (range[1] - 1).toString();
   });
@@ -23823,7 +23908,7 @@ function countFallthroughPreds(func, block) {
     return count;
   }, 0);
 }
-var SectionKinds;
+var SectionKinds, TEXT_SECTION_PC, SECTION_PC_MASK, PC_OFFSET_MASK;
 var init_bytecode = (0, import_chunk_VS2QQHAK.__esm)({
   "src/readprg/bytecode.ts"() {
     "use strict";
@@ -23841,6 +23926,7 @@ var init_bytecode = (0, import_chunk_VS2QQHAK.__esm)({
       SectionKinds2[SectionKinds2["HEADER"] = -805253120] = "HEADER";
       SectionKinds2[SectionKinds2["HEADER_VERSIONED"] = -805253107] = "HEADER_VERSIONED";
       SectionKinds2[SectionKinds2["TEXT"] = -1059145026] = "TEXT";
+      SectionKinds2[SectionKinds2["EXTENDED"] = -1059188563] = "EXTENDED";
       SectionKinds2[SectionKinds2["DATA"] = -629491010] = "DATA";
       SectionKinds2[SectionKinds2["SYMBOLS"] = 1461170197] = "SYMBOLS";
       SectionKinds2[SectionKinds2["LINENUM"] = -1059161423] = "LINENUM";
@@ -23849,6 +23935,9 @@ var init_bytecode = (0, import_chunk_VS2QQHAK.__esm)({
       SectionKinds2[SectionKinds2["STORE_SIG"] = 20833] = "STORE_SIG";
       return SectionKinds2;
     })(SectionKinds || {});
+    TEXT_SECTION_PC = 268435456;
+    SECTION_PC_MASK = 4026531840;
+    PC_OFFSET_MASK = 16777215;
   }
 });
 function getPrgSignature(context) {
@@ -23969,6 +24058,7 @@ var SymbolTable;
 var init_symbols = (0, import_chunk_VS2QQHAK.__esm)({
   "src/readprg/symbols.ts"() {
     "use strict";
+    init_bytecode();
     SymbolTable = class {
       // given a symbol id, symbolToLabelMap.get(id) gives the
       // label offset, then symbols.get(label) gives us the symbol
@@ -23999,7 +24089,7 @@ var init_symbols = (0, import_chunk_VS2QQHAK.__esm)({
           const { startPc, name, parent } = functionEntry.attr;
           if (!startPc || !name) return;
           const fullPc = Number(startPc.value.value);
-          if (fullPc >>> 28 !== 1) {
+          if ((fullPc & SECTION_PC_MASK) !== TEXT_SECTION_PC) {
             return;
           }
           const pc = fullPc & 16777215;
@@ -27355,7 +27445,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_IJS7AYMN.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1767144581089 < opt_time) {
+      if (source_time < opt_time && 1769823563413 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -27393,7 +27483,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.92",
+            optimizerVersion: "1.1.94",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_VAV4N2CL.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_VAV4N2CL.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_VAV4N2CL.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_5SB3QASN.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_5SB3QASN.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_5SB3QASN.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_VAV4N2CL.defaultConfig,
-  display: () => import_chunk_VAV4N2CL.display,
-  generateOneConfig: () => import_chunk_VAV4N2CL.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_VAV4N2CL.generateOptimizedProject,
-  getConfig: () => import_chunk_VAV4N2CL.getConfig,
-  getFnMapAnalysis: () => import_chunk_VAV4N2CL.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_VAV4N2CL.getProjectAnalysis,
-  get_jungle: () => import_chunk_VAV4N2CL.get_jungle,
-  isErrorWithLocation: () => import_chunk_VAV4N2CL.isErrorWithLocation,
-  launchSimulator: () => import_chunk_VAV4N2CL.launchSimulator,
-  manifestProducts: () => import_chunk_VAV4N2CL.manifestProducts,
-  mctree: () => import_chunk_VAV4N2CL.mctree,
-  simulateProgram: () => import_chunk_VAV4N2CL.simulateProgram
+  defaultConfig: () => import_chunk_5SB3QASN.defaultConfig,
+  display: () => import_chunk_5SB3QASN.display,
+  generateOneConfig: () => import_chunk_5SB3QASN.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_5SB3QASN.generateOptimizedProject,
+  getConfig: () => import_chunk_5SB3QASN.getConfig,
+  getFnMapAnalysis: () => import_chunk_5SB3QASN.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_5SB3QASN.getProjectAnalysis,
+  get_jungle: () => import_chunk_5SB3QASN.get_jungle,
+  isErrorWithLocation: () => import_chunk_5SB3QASN.isErrorWithLocation,
+  launchSimulator: () => import_chunk_5SB3QASN.launchSimulator,
+  manifestProducts: () => import_chunk_5SB3QASN.manifestProducts,
+  mctree: () => import_chunk_5SB3QASN.mctree,
+  simulateProgram: () => import_chunk_5SB3QASN.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_VAV4N2CL = require("./chunk-VAV4N2CL.cjs");
+var import_chunk_5SB3QASN = require("./chunk-5SB3QASN.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_VAV4N2CL.init_optimizer)();
+(0, import_chunk_5SB3QASN.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,