@markw65/monkeyc-optimizer 1.1.13 → 1.1.14

package/README.md

@@ -715,3 +715,14 @@ Bug Fixes
 ### 1.1.13
 
 - Adds a new [Minimize Modules](https://github.com/markw65/monkeyc-optimizer/wiki/Optimizing-module-imports#minimize-modules) pass, which attempts to ensure that every module referenced by the program is imported.
+
+### 1.1.14
+
+- Fixes a bug that could crash the optimizer if it tried to inline a function in a non-local variable's initializer.
+- Adds a post build optimizer. This step takes the built .prg file, and optimizes the bytecode. Currently the optimizations are:
+  - Remove unreachable code
+  - simplify control flow by removing branches to branches
+  - Remove empty "finally" handlers (every try/catch gets an empty finally handler)
+  - Remove stores to dead locals
+  - Remove side-effect free code that produces an unused result
+  - Optimize shift left by constant to multiply, since the bytecode is smaller (this seems to be a bug in the garmin tools; they consider shift left and shift right to have an 8-bit argument, but its always zero, and the simulator and devices treat it as a one byte shift instruction, followed by a one byte nop).

package/build/api.cjs

@@ -2161,8 +2161,9 @@ function inlineRequested(state, func) {
     return false;
 }
 function shouldInline(state, func, call, context) {
-    if (state.inlining)
+    if (state.inlining || (state.localsStack?.length ?? 0) <= 1) {
         return false;
+    }
     let autoInline = false;
     let inlineAsExpression = false;
     const args = call.arguments;

package/build/optimizer.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {buildOptimizedProject,copyRecursiveAsNeeded,defaultConfig,display,generateApiMirTests,generateOptimizedProject,getProjectAnalysis,get_jungle,isErrorWithLocation,launchSimulator,manifestProducts,mctree,simulateProgram});
+0 && (module.exports = {buildOptimizedProject,copyRecursiveAsNeeded,defaultConfig,display,generateApiMirTests,generateOptimizedProject,getConfig,getProjectAnalysis,get_jungle,isErrorWithLocation,launchSimulator,manifestProducts,mctree,simulateProgram});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -3416,6 +3416,7 @@ __webpack_require__.d(__webpack_exports__, {
   "display": () => (/* reexport */ display),
   "generateApiMirTests": () => (/* binding */ generateApiMirTests),
   "generateOptimizedProject": () => (/* binding */ generateOptimizedProject),
+  "getConfig": () => (/* binding */ getConfig),
   "getProjectAnalysis": () => (/* binding */ getProjectAnalysis),
   "get_jungle": () => (/* reexport */ get_jungle),
   "isErrorWithLocation": () => (/* binding */ isErrorWithLocation),
@@ -4523,7 +4524,13 @@ async function launchSimulator(force = true) {
         if (!force && (await checkIfSimulatorRunning()))
             return;
         const sdk = await (0,external_sdk_util_cjs_namespaceObject.getSdkPath)();
-        const child = (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"));
+        const child = force || process.platform !== "darwin"
+            ? (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"))
+            : (0,external_child_process_namespaceObject.execFile)("/usr/bin/open", [
+                "-g",
+                "-a",
+                external_path_.resolve(sdk, "bin", "ConnectIQ.App", "Contents/MacOS/simulator"),
+            ]);
         child.unref();
         for (let i = 0;; i++) {
             if (await checkIfSimulatorRunning())
@@ -5380,8 +5387,9 @@ function inlineRequested(state, func) {
     return false;
 }
 function shouldInline(state, func, call, context) {
-    if (state.inlining)
+    if (state.inlining || (state.localsStack?.length ?? 0) <= 1) {
         return false;
+    }
     let autoInline = false;
     let inlineAsExpression = false;
     const args = call.arguments;
@@ -16803,7 +16811,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1676335488374 < opt_time) {
+        if (source_time < opt_time && 1676942537698 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -16830,7 +16838,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.1.13",
+                optimizerVersion: "1.1.14",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));