@markw65/monkeyc-optimizer 1.1.49 → 1.1.51

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.51
+
+- Fix a bug where a call with mismatched arguments could be marked as side-effect free, and then removed.
+- Don't inline functions with mis-matched arguments, and issue a diagnostic.
+
+### 1.1.50
+
+- Add a diagnostic when an inline function doesn't get removed
+- No diagnostics for String + Symbol, or String + Method, or String + Object, or String + Enum (Fixes #9)
+- Fix a bug in minimizeLocals (Fixes #15)
+
 ### 1.1.49
 
 - Fix a bug in cleanupUnusedVars that could cause the wrong variable to be removed

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_DZ7YMTUE.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_DZ7YMTUE.collectNamespaces,
-  createDocumentationMap: () => import_chunk_DZ7YMTUE.createDocumentationMap,
-  diagnostic: () => import_chunk_DZ7YMTUE.diagnostic,
-  diagnosticHelper: () => import_chunk_DZ7YMTUE.diagnosticHelper,
-  findNamesInScope: () => import_chunk_DZ7YMTUE.findNamesInScope,
-  findUsingForNode: () => import_chunk_DZ7YMTUE.findUsingForNode,
-  formatAst: () => import_chunk_DZ7YMTUE.formatAst,
-  formatAstLongLines: () => import_chunk_DZ7YMTUE.formatAstLongLines,
-  formatScopedName: () => import_chunk_DZ7YMTUE.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_DZ7YMTUE.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_DZ7YMTUE.getApiMapping,
-  getSuperClasses: () => import_chunk_DZ7YMTUE.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_HKWBVOEL.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_HKWBVOEL.collectNamespaces,
+  createDocumentationMap: () => import_chunk_HKWBVOEL.createDocumentationMap,
+  diagnostic: () => import_chunk_HKWBVOEL.diagnostic,
+  diagnosticHelper: () => import_chunk_HKWBVOEL.diagnosticHelper,
+  findNamesInScope: () => import_chunk_HKWBVOEL.findNamesInScope,
+  findUsingForNode: () => import_chunk_HKWBVOEL.findUsingForNode,
+  formatAst: () => import_chunk_HKWBVOEL.formatAst,
+  formatAstLongLines: () => import_chunk_HKWBVOEL.formatAstLongLines,
+  formatScopedName: () => import_chunk_HKWBVOEL.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_HKWBVOEL.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_HKWBVOEL.getApiMapping,
+  getSuperClasses: () => import_chunk_HKWBVOEL.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_DZ7YMTUE.isClassVariable,
-  isLocal: () => import_chunk_DZ7YMTUE.isLocal,
-  isLookupCandidate: () => import_chunk_DZ7YMTUE.isLookupCandidate,
-  isStateNode: () => import_chunk_DZ7YMTUE.isStateNode,
-  lookupByFullName: () => import_chunk_DZ7YMTUE.lookupByFullName,
-  lookupNext: () => import_chunk_DZ7YMTUE.lookupNext,
-  lookupResultContains: () => import_chunk_DZ7YMTUE.lookupResultContains,
-  lookupWithType: () => import_chunk_DZ7YMTUE.lookupWithType,
-  makeToyboxLink: () => import_chunk_DZ7YMTUE.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_DZ7YMTUE.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_DZ7YMTUE.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_DZ7YMTUE.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_DZ7YMTUE.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_DZ7YMTUE.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_DZ7YMTUE.sameLookupResult,
+  isClassVariable: () => import_chunk_HKWBVOEL.isClassVariable,
+  isLocal: () => import_chunk_HKWBVOEL.isLocal,
+  isLookupCandidate: () => import_chunk_HKWBVOEL.isLookupCandidate,
+  isStateNode: () => import_chunk_HKWBVOEL.isStateNode,
+  lookupByFullName: () => import_chunk_HKWBVOEL.lookupByFullName,
+  lookupNext: () => import_chunk_HKWBVOEL.lookupNext,
+  lookupResultContains: () => import_chunk_HKWBVOEL.lookupResultContains,
+  lookupWithType: () => import_chunk_HKWBVOEL.lookupWithType,
+  makeToyboxLink: () => import_chunk_HKWBVOEL.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_HKWBVOEL.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_HKWBVOEL.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_HKWBVOEL.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_HKWBVOEL.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_HKWBVOEL.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_HKWBVOEL.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_DZ7YMTUE.variableDeclarationName,
-  visitReferences: () => import_chunk_DZ7YMTUE.visitReferences,
-  visit_resources: () => import_chunk_DZ7YMTUE.visit_resources,
-  visitorNode: () => import_chunk_DZ7YMTUE.visitorNode
+  variableDeclarationName: () => import_chunk_HKWBVOEL.variableDeclarationName,
+  visitReferences: () => import_chunk_HKWBVOEL.visitReferences,
+  visit_resources: () => import_chunk_HKWBVOEL.visit_resources,
+  visitorNode: () => import_chunk_HKWBVOEL.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_DZ7YMTUE = require("./chunk-DZ7YMTUE.cjs");
+var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.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_DZ7YMTUE.init_api)();
+(0, import_chunk_HKWBVOEL.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-DZ7YMTUE.cjs → chunk-HKWBVOEL.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_DZ7YMTUE_exports = {};
-__export(chunk_DZ7YMTUE_exports, {
+var chunk_HKWBVOEL_exports = {};
+__export(chunk_HKWBVOEL_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_DZ7YMTUE_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_DZ7YMTUE_exports);
+module.exports = __toCommonJS(chunk_HKWBVOEL_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");
@@ -5828,15 +5828,18 @@ function inliningLooksUseful(func, node) {
   }
   return false;
 }
-function inlineRequested(state, func) {
-  const excludeAnnotations = func.node.loc?.source && state.fnMap[func.node.loc?.source]?.excludeAnnotations || {};
-  if (func.node.attrs && func.node.attrs.attributes && func.node.attrs.attributes.elements.some(
+function inlineRequestedNode(state, func) {
+  const excludeAnnotations = func.loc?.source && state.fnMap[func.loc?.source]?.excludeAnnotations || {};
+  if (func.attrs && func.attrs.attributes && func.attrs.attributes.elements.some(
     (attr) => attr.type === "UnaryExpression" && (attr.argument.name === "inline" || attr.argument.name.startsWith("inline_") && !(0, import_chunk_MBTLUWXR.hasProperty)(excludeAnnotations, attr.argument.name.substring(7)))
   )) {
     return true;
   }
   return false;
 }
+function inlineRequested(state, func) {
+  return inlineRequestedNode(state, func.node);
+}
 function shouldInline(state, func, call, context) {
   if (state.inlining || (state.localsStack?.length ?? 0) <= 1) {
     return false;
@@ -5861,6 +5864,15 @@ function shouldInline(state, func, call, context) {
         return true;
       }
     }
+    if (requested && func.node.params.length !== args.length) {
+      inlineDiagnostic(
+        state,
+        func,
+        call,
+        "This function cannot be inlined due to incorrect arguments"
+      );
+      return false;
+    }
     if (!context && requested) {
       inlineDiagnostic(
         state,
@@ -6430,6 +6442,28 @@ function fixNodeScope(state, lookupNode, nodeStack) {
   }
   return null;
 }
+function reportFailedInlining(state, ast) {
+  (0, import_chunk_MBTLUWXR.traverseAst)(ast, (node) => {
+    switch (node.type) {
+      case "FunctionDeclaration":
+        if (inlineRequestedNode(state, node)) {
+          if (!state.inlineDiagnostics) {
+            state.inlineDiagnostics = {};
+          }
+          diagnosticHelper(
+            state.inlineDiagnostics,
+            node,
+            `The inline function ${node.id.name} was not removed from the program`,
+            "INFO",
+            void 0
+          );
+        }
+        return false;
+      default:
+        return null;
+    }
+  });
+}
 var init_inliner = (0, import_chunk_ABYVSU2C.__esm)({
   "src/inliner.ts"() {
     "use strict";
@@ -8355,7 +8389,7 @@ function common_types(left, right, allowed) {
   const types = left.type | right.type;
   let mask = (6 | 120) & allowed;
   if (types & allowed & 256) {
-    mask |= 256 | 6 | 128 | 1 | 1024 | 512;
+    mask |= 256 | 6 | 128 | 1 | 1024 | 512 | 131072 | 32768 | 65536 | 2048;
   } else if (types & allowed & 128) {
     mask |= 128;
   }
@@ -9046,6 +9080,8 @@ function checkCallArgs(istate, node, callees, args) {
       if (cur.info === false) {
         argEffects = false;
       }
+      if (effects)
+        result.embeddedEffects = true;
       const needsCheck = checker && (cur === callees || !isOverride(cur, callees));
       const expectedArgs = (argTypes || cur.node.params).length;
       if (args.length !== expectedArgs) {
@@ -9152,8 +9188,6 @@ function checkCallArgs(istate, node, callees, args) {
         result.value.type = 524287;
         delete result.value.value;
       }
-      if (effects)
-        result.embeddedEffects = true;
       return result;
     },
     {
@@ -14313,7 +14347,7 @@ function minimizeLocals(state, func) {
       case "AssignmentExpression":
         if (info) {
           (0, import_node_assert4.default)(node.left.type === "Identifier");
-          if (node.right.type === "Identifier" && node.right.name === info.name) {
+          if (node.right.type === "Identifier" && node.right.name === info.name && node.operator === "=") {
             return (0, import_chunk_MBTLUWXR.withLoc)(
               { type: "Literal", value: null, raw: "null" },
               node,
@@ -16988,6 +17022,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   cleanupAll();
   config.checkCompilerLookupRules = checkLookupRules;
   reportMissingSymbols(state, config);
+  Object.values(fnMap).forEach(
+    ({ ast }) => ast && reportFailedInlining(state, ast)
+  );
   if (state.inlineDiagnostics) {
     if (!state.diagnostics) {
       state.diagnostics = state.inlineDiagnostics;
@@ -28528,7 +28565,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 && 1710462159189 < opt_time) {
+      if (source_time < opt_time && 1711474096407 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28567,7 +28604,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.49",
+            optimizerVersion: "1.1.51",
             ...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_DZ7YMTUE.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_DZ7YMTUE.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_HKWBVOEL.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_HKWBVOEL.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_DZ7YMTUE.defaultConfig,
-  display: () => import_chunk_DZ7YMTUE.display,
-  generateOneConfig: () => import_chunk_DZ7YMTUE.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_DZ7YMTUE.generateOptimizedProject,
-  getConfig: () => import_chunk_DZ7YMTUE.getConfig,
-  getProjectAnalysis: () => import_chunk_DZ7YMTUE.getProjectAnalysis,
-  get_jungle: () => import_chunk_DZ7YMTUE.get_jungle,
-  isErrorWithLocation: () => import_chunk_DZ7YMTUE.isErrorWithLocation,
-  launchSimulator: () => import_chunk_DZ7YMTUE.launchSimulator,
-  manifestProducts: () => import_chunk_DZ7YMTUE.manifestProducts,
-  mctree: () => import_chunk_DZ7YMTUE.mctree,
-  simulateProgram: () => import_chunk_DZ7YMTUE.simulateProgram
+  defaultConfig: () => import_chunk_HKWBVOEL.defaultConfig,
+  display: () => import_chunk_HKWBVOEL.display,
+  generateOneConfig: () => import_chunk_HKWBVOEL.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_HKWBVOEL.generateOptimizedProject,
+  getConfig: () => import_chunk_HKWBVOEL.getConfig,
+  getProjectAnalysis: () => import_chunk_HKWBVOEL.getProjectAnalysis,
+  get_jungle: () => import_chunk_HKWBVOEL.get_jungle,
+  isErrorWithLocation: () => import_chunk_HKWBVOEL.isErrorWithLocation,
+  launchSimulator: () => import_chunk_HKWBVOEL.launchSimulator,
+  manifestProducts: () => import_chunk_HKWBVOEL.manifestProducts,
+  mctree: () => import_chunk_HKWBVOEL.mctree,
+  simulateProgram: () => import_chunk_HKWBVOEL.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_DZ7YMTUE = require("./chunk-DZ7YMTUE.cjs");
+var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.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_DZ7YMTUE.init_optimizer)();
+(0, import_chunk_HKWBVOEL.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_DZ7YMTUE.SectionKinds,
-  appSupport: () => import_chunk_DZ7YMTUE.appSupport,
-  connectiq: () => import_chunk_DZ7YMTUE.connectiq,
-  getDeviceInfo: () => import_chunk_DZ7YMTUE.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_DZ7YMTUE.getFunctionDocumentation,
-  getLanguages: () => import_chunk_DZ7YMTUE.getLanguages,
-  getSdkPath: () => import_chunk_DZ7YMTUE.getSdkPath,
-  isWin: () => import_chunk_DZ7YMTUE.isWin,
-  optimizeProgram: () => import_chunk_DZ7YMTUE.optimizeProgram,
-  readPrg: () => import_chunk_DZ7YMTUE.readPrg,
-  readPrgWithOffsets: () => import_chunk_DZ7YMTUE.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_DZ7YMTUE.xml_util_exports
+  SectionKinds: () => import_chunk_HKWBVOEL.SectionKinds,
+  appSupport: () => import_chunk_HKWBVOEL.appSupport,
+  connectiq: () => import_chunk_HKWBVOEL.connectiq,
+  getDeviceInfo: () => import_chunk_HKWBVOEL.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_HKWBVOEL.getFunctionDocumentation,
+  getLanguages: () => import_chunk_HKWBVOEL.getLanguages,
+  getSdkPath: () => import_chunk_HKWBVOEL.getSdkPath,
+  isWin: () => import_chunk_HKWBVOEL.isWin,
+  optimizeProgram: () => import_chunk_HKWBVOEL.optimizeProgram,
+  readPrg: () => import_chunk_HKWBVOEL.readPrg,
+  readPrgWithOffsets: () => import_chunk_HKWBVOEL.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_HKWBVOEL.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_DZ7YMTUE = require("./chunk-DZ7YMTUE.cjs");
+var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.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_DZ7YMTUE.init_sdk_util)();
+(0, import_chunk_HKWBVOEL.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/inliner.d.ts

@@ -10,4 +10,5 @@ export declare function inlineDiagnostic(state: ProgramStateAnalysis, func: Func
 export type InlineContext = mctree.ReturnStatement | mctree.IfStatement | mctree.AssignmentExpression | mctree.ExpressionStatement | mctree.VariableDeclarator;
 export declare function inlineFunction(state: ProgramStateAnalysis, func: FunctionStateNode, call: mctree.CallExpression, context: InlineContext | null): InlineBody | null;
 export declare function applyTypeIfNeeded(node: mctree.Node): mctree.Node;
+export declare function reportFailedInlining(state: ProgramStateAnalysis, ast: mctree.Program): void;
 export {};

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_DZ7YMTUE = require("./chunk-DZ7YMTUE.cjs");
+var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.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_DZ7YMTUE.init_worker_task)();
+    (0, import_chunk_HKWBVOEL.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_DZ7YMTUE.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_HKWBVOEL.performTask)(task));
       });
     }
   }

package/package.json

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