@markw65/monkeyc-optimizer 1.1.58 → 1.1.60

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.60
+
+- Disable the "remove argc" optimization, as it's going to start breaking verification in the app store.
+
+### 1.1.59
+
+- Getv and Putv can directly access local 0 (Fixes #34)
+
 ### 1.1.58
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.57](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1057)

package/build/api.cjs

@@ -18,47 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_XC5IVRTO.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_XC5IVRTO.collectNamespaces,
-  createDocumentationMap: () => import_chunk_XC5IVRTO.createDocumentationMap,
-  diagnostic: () => import_chunk_XC5IVRTO.diagnostic,
-  diagnosticHelper: () => import_chunk_XC5IVRTO.diagnosticHelper,
-  findNamesInScope: () => import_chunk_XC5IVRTO.findNamesInScope,
-  findUsingForNode: () => import_chunk_XC5IVRTO.findUsingForNode,
-  formatAst: () => import_chunk_XC5IVRTO.formatAst,
-  formatAstLongLines: () => import_chunk_XC5IVRTO.formatAstLongLines,
-  formatScopedName: () => import_chunk_XC5IVRTO.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_XC5IVRTO.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_XC5IVRTO.getApiMapping,
-  getSuperClasses: () => import_chunk_XC5IVRTO.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_X2C4HXXZ.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_X2C4HXXZ.collectNamespaces,
+  createDocumentationMap: () => import_chunk_X2C4HXXZ.createDocumentationMap,
+  diagnostic: () => import_chunk_X2C4HXXZ.diagnostic,
+  diagnosticHelper: () => import_chunk_X2C4HXXZ.diagnosticHelper,
+  findNamesInScope: () => import_chunk_X2C4HXXZ.findNamesInScope,
+  findUsingForNode: () => import_chunk_X2C4HXXZ.findUsingForNode,
+  formatAst: () => import_chunk_X2C4HXXZ.formatAst,
+  formatAstLongLines: () => import_chunk_X2C4HXXZ.formatAstLongLines,
+  formatScopedName: () => import_chunk_X2C4HXXZ.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_X2C4HXXZ.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_X2C4HXXZ.getApiMapping,
+  getSuperClasses: () => import_chunk_X2C4HXXZ.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_XC5IVRTO.isClassVariable,
-  isLocal: () => import_chunk_XC5IVRTO.isLocal,
-  isLookupCandidate: () => import_chunk_XC5IVRTO.isLookupCandidate,
-  isStateNode: () => import_chunk_XC5IVRTO.isStateNode,
-  lookupByFullName: () => import_chunk_XC5IVRTO.lookupByFullName,
-  lookupNext: () => import_chunk_XC5IVRTO.lookupNext,
-  lookupResultContains: () => import_chunk_XC5IVRTO.lookupResultContains,
-  lookupWithType: () => import_chunk_XC5IVRTO.lookupWithType,
-  makeToyboxLink: () => import_chunk_XC5IVRTO.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_XC5IVRTO.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_XC5IVRTO.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_XC5IVRTO.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_XC5IVRTO.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_XC5IVRTO.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_XC5IVRTO.sameLookupResult,
+  isClassVariable: () => import_chunk_X2C4HXXZ.isClassVariable,
+  isLocal: () => import_chunk_X2C4HXXZ.isLocal,
+  isLookupCandidate: () => import_chunk_X2C4HXXZ.isLookupCandidate,
+  isStateNode: () => import_chunk_X2C4HXXZ.isStateNode,
+  lookupByFullName: () => import_chunk_X2C4HXXZ.lookupByFullName,
+  lookupNext: () => import_chunk_X2C4HXXZ.lookupNext,
+  lookupResultContains: () => import_chunk_X2C4HXXZ.lookupResultContains,
+  lookupWithType: () => import_chunk_X2C4HXXZ.lookupWithType,
+  makeToyboxLink: () => import_chunk_X2C4HXXZ.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_X2C4HXXZ.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_X2C4HXXZ.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_X2C4HXXZ.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_X2C4HXXZ.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_X2C4HXXZ.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_X2C4HXXZ.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_XC5IVRTO.variableDeclarationName,
-  visitReferences: () => import_chunk_XC5IVRTO.visitReferences,
-  visit_resources: () => import_chunk_XC5IVRTO.visit_resources,
-  visitorNode: () => import_chunk_XC5IVRTO.visitorNode
+  variableDeclarationName: () => import_chunk_X2C4HXXZ.variableDeclarationName,
+  visitReferences: () => import_chunk_X2C4HXXZ.visitReferences,
+  visit_resources: () => import_chunk_X2C4HXXZ.visit_resources,
+  visitorNode: () => import_chunk_X2C4HXXZ.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.cjs");
+var import_chunk_X2C4HXXZ = require("./chunk-X2C4HXXZ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XC5IVRTO.init_api)();
+(0, import_chunk_X2C4HXXZ.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-XC5IVRTO.cjs → chunk-X2C4HXXZ.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_XC5IVRTO_exports = {};
-__export(chunk_XC5IVRTO_exports, {
+var chunk_X2C4HXXZ_exports = {};
+__export(chunk_X2C4HXXZ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_XC5IVRTO_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_XC5IVRTO_exports);
+module.exports = __toCommonJS(chunk_X2C4HXXZ_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");
@@ -20420,19 +20420,19 @@ function opReadsLocal(bytecode) {
     case 67:
     case 68:
     case 42:
+    case 13:
+    case 14:
       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:
@@ -22079,11 +22079,11 @@ function localDCE(func, context) {
             dceInfo.stack.push({ dead: false });
           }
           dceInfo.locals.delete(bytecode.arg);
-          break;
+          continue;
         }
         case 2:
           dceInfo.stack.push({ dead: true, deps: [i] });
-          break;
+          continue;
         case 46: {
           const item = dceInfo.stack.pop();
           if (item?.dead) {
@@ -22095,7 +22095,7 @@ function localDCE(func, context) {
               dceInfo.stack[dceInfo.stack.length - 1 - bytecode.arg].dead = false;
             }
           }
-          break;
+          continue;
         }
         case 70:
         case 68:
@@ -22128,11 +22128,7 @@ function localDCE(func, context) {
             item.deps.push(i);
             reportNop(item);
             item.deps.forEach((index) => makeNop(block.bytecodes[index]));
-          } else {
-            const local = opReadsLocal(bytecode);
-            if (local != null) {
-              dceInfo.locals.add(local);
-            }
+            continue;
           }
           break;
         }
@@ -22162,10 +22158,10 @@ function localDCE(func, context) {
             makePopv(bytecode);
             dceInfo.stack.push({ dead: true, deps: item.deps.slice() });
             dceInfo.stack.push({ dead: true, deps: [i] });
-          } else {
-            dceInfo.stack.push({ dead: false });
-            dceInfo.stack.push({ dead: false });
+            continue;
           }
+          dceInfo.stack.push({ dead: false });
+          dceInfo.stack.push({ dead: false });
           break;
         }
         case 21:
@@ -22182,16 +22178,16 @@ function localDCE(func, context) {
             makePopv(bytecode);
             item.deps.forEach((index) => makeNop(block.bytecodes[index]));
             dceInfo.stack.push({ dead: true, deps: [i] });
-          } else {
-            dceInfo.stack.push({ dead: false });
+            continue;
           }
+          dceInfo.stack.push({ dead: false });
           break;
         }
         case 51:
         case 15:
         case 72:
           if (block.exsucc) {
-            liveInLocals.get(block.exsucc)?.forEach((local) => dceInfo.locals.add(local));
+            liveInLocals.get(block.exsucc)?.forEach((local2) => dceInfo.locals.add(local2));
           }
         case 17:
         case 73:
@@ -22221,6 +22217,10 @@ function localDCE(func, context) {
         default:
           unhandledType(bytecode);
       }
+      const local = opReadsLocal(bytecode);
+      if (local != null) {
+        dceInfo.locals.add(local);
+      }
     }
     if (changes) {
       anyChanges = true;
@@ -22480,6 +22480,8 @@ function minimizeLocals2(func, equivSets, context) {
           }
           break;
         }
+        case 14:
+        case 13:
         case 42:
         case 68:
         case 67: {
@@ -22526,6 +22528,8 @@ function computeSplitRanges(func, equivSets) {
         case 70:
         case 42:
         case 18:
+        case 13:
+        case 14:
           recordLocalRead(locals, bc);
           break;
         case 19: {
@@ -23153,13 +23157,13 @@ function doArrayInits(func, liveInState, context) {
   );
   return changes;
 }
-function simpleOpts(func, context) {
+function simpleOpts(func, _context) {
   const equalsSym = 8388787;
   const logging3 = (0, import_chunk_SG7ODKRM.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
-      if (cur.op === 0 || cur.op === 1 && cur.arg === 0 || context.config.removeArgc && cur.op === 53) {
+      if (cur.op === 0 || cur.op === 1 && cur.arg === 0) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
@@ -29142,7 +29146,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 && 1713815963058 < opt_time) {
+      if (source_time < opt_time && 1715292882674 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29181,7 +29185,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.58",
+            optimizerVersion: "1.1.60",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_XC5IVRTO.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_XC5IVRTO.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_X2C4HXXZ.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_X2C4HXXZ.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_XC5IVRTO.defaultConfig,
-  display: () => import_chunk_XC5IVRTO.display,
-  generateOneConfig: () => import_chunk_XC5IVRTO.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_XC5IVRTO.generateOptimizedProject,
-  getConfig: () => import_chunk_XC5IVRTO.getConfig,
-  getProjectAnalysis: () => import_chunk_XC5IVRTO.getProjectAnalysis,
-  get_jungle: () => import_chunk_XC5IVRTO.get_jungle,
-  isErrorWithLocation: () => import_chunk_XC5IVRTO.isErrorWithLocation,
-  launchSimulator: () => import_chunk_XC5IVRTO.launchSimulator,
-  manifestProducts: () => import_chunk_XC5IVRTO.manifestProducts,
-  mctree: () => import_chunk_XC5IVRTO.mctree,
-  simulateProgram: () => import_chunk_XC5IVRTO.simulateProgram
+  defaultConfig: () => import_chunk_X2C4HXXZ.defaultConfig,
+  display: () => import_chunk_X2C4HXXZ.display,
+  generateOneConfig: () => import_chunk_X2C4HXXZ.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_X2C4HXXZ.generateOptimizedProject,
+  getConfig: () => import_chunk_X2C4HXXZ.getConfig,
+  getProjectAnalysis: () => import_chunk_X2C4HXXZ.getProjectAnalysis,
+  get_jungle: () => import_chunk_X2C4HXXZ.get_jungle,
+  isErrorWithLocation: () => import_chunk_X2C4HXXZ.isErrorWithLocation,
+  launchSimulator: () => import_chunk_X2C4HXXZ.launchSimulator,
+  manifestProducts: () => import_chunk_X2C4HXXZ.manifestProducts,
+  mctree: () => import_chunk_X2C4HXXZ.mctree,
+  simulateProgram: () => import_chunk_X2C4HXXZ.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.cjs");
+var import_chunk_X2C4HXXZ = require("./chunk-X2C4HXXZ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XC5IVRTO.init_optimizer)();
+(0, import_chunk_X2C4HXXZ.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_XC5IVRTO.SectionKinds,
-  appSupport: () => import_chunk_XC5IVRTO.appSupport,
-  connectiq: () => import_chunk_XC5IVRTO.connectiq,
-  getDeviceInfo: () => import_chunk_XC5IVRTO.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_XC5IVRTO.getFunctionDocumentation,
-  getLanguages: () => import_chunk_XC5IVRTO.getLanguages,
-  getSdkPath: () => import_chunk_XC5IVRTO.getSdkPath,
-  isWin: () => import_chunk_XC5IVRTO.isWin,
-  optimizeProgram: () => import_chunk_XC5IVRTO.optimizeProgram,
-  readPrg: () => import_chunk_XC5IVRTO.readPrg,
-  readPrgWithOffsets: () => import_chunk_XC5IVRTO.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_XC5IVRTO.xml_util_exports
+  SectionKinds: () => import_chunk_X2C4HXXZ.SectionKinds,
+  appSupport: () => import_chunk_X2C4HXXZ.appSupport,
+  connectiq: () => import_chunk_X2C4HXXZ.connectiq,
+  getDeviceInfo: () => import_chunk_X2C4HXXZ.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_X2C4HXXZ.getFunctionDocumentation,
+  getLanguages: () => import_chunk_X2C4HXXZ.getLanguages,
+  getSdkPath: () => import_chunk_X2C4HXXZ.getSdkPath,
+  isWin: () => import_chunk_X2C4HXXZ.isWin,
+  optimizeProgram: () => import_chunk_X2C4HXXZ.optimizeProgram,
+  readPrg: () => import_chunk_X2C4HXXZ.readPrg,
+  readPrgWithOffsets: () => import_chunk_X2C4HXXZ.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_X2C4HXXZ.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.cjs");
+var import_chunk_X2C4HXXZ = require("./chunk-X2C4HXXZ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_XC5IVRTO.init_sdk_util)();
+(0, import_chunk_X2C4HXXZ.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_XC5IVRTO = require("./chunk-XC5IVRTO.cjs");
+var import_chunk_X2C4HXXZ = require("./chunk-X2C4HXXZ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_XC5IVRTO.init_worker_task)();
+    (0, import_chunk_X2C4HXXZ.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_XC5IVRTO.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_X2C4HXXZ.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",