@markw65/monkeyc-optimizer 1.1.2 → 1.1.3

package/README.md

@@ -587,3 +587,28 @@ Bug Fixes
 - Analyze constants with casts to help with constant propagation
 - Ignore widening casts (eg a cast that is given a `Number` and converts it to `Number or String`)
 - More accurate deletion of unused constants. Sometimes a constant that was unused after the optimization phase ended, was still considered used because of references that were eventually deleted.
+
+### 1.1.3
+
+- Tweaks and fixes
+
+  - Update to [@markw65/prettier-plugin-monkeyc@1.0.42](https://github.com/markw65/prettier-plugin-monkeyc#1042)
+  - Fixed an issue that cause inlining in return context to be too conservative
+  - Update inliner to keep a stack of locations, so that error messages can show exactly where an error occurred, even in the presence of inlining.
+  - Update diagnostic api to optionally include a uri to more detailing information.
+
+- Type Analysis
+
+  - Track type info through branch conditions, so that in `if (x != null) { A } else { B }`, the type checker knows that x is not null in A, and it is null in B.
+  - Added checkers for return types, call arguments, assignments and variable declarations.
+  - Automatically infer Array and Dictionary types
+  - Track equivalencies, and use them for various optimizations.
+  - Add support for "strong" and "weak" type checking.
+  - Add type analysis to getProgramAnalysis.
+
+- Optimizations
+  - Eliminate self-assignments (eg `x = x;`, but also `x = a; y = a; ... y = x;`).
+  - Eliminate dead stores.
+  - Replace more expensive accesses by less expensive ones.
+  - Delete empty else blocks.
+  - Delete if statements with empty body and no else.

package/build/api.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {checkCompilerVersion,collectNamespaces,diagnostic,findUsingForNode,formatAst,getApiFunctionInfo,getApiMapping,getSuperClasses,hasProperty,isLocal,isLookupCandidate,isStateNode,markInvokeClassMethod,parseSdkVersion,sameLookupResult,traverseAst,variableDeclarationName,visitReferences,visit_resources,visitorNode});
+0 && (module.exports = {checkCompilerVersion,collectNamespaces,diagnostic,findUsingForNode,formatAst,getApiFunctionInfo,getApiMapping,getSuperClasses,hasProperty,isLocal,isLookupCandidate,isStateNode,lookupNext,markInvokeClassMethod,parseSdkVersion,sameLookupResult,traverseAst,variableDeclarationName,visitReferences,visit_resources,visitorNode});
 /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -113,7 +113,7 @@ function isMCTreeNode(node) {
  *  - if post returns false, the node it was called on is
  *    removed.
  */
-function traverseAst(node, pre, post) {
+function traverseAst(node, pre, post, parent) {
     const nodes = pre && pre(node);
     if (nodes === false)
         return;
@@ -128,7 +128,7 @@ function traverseAst(node, pre, post) {
             const values = value;
             const deletions = values.reduce((state, obj, i) => {
                 if (isMCTreeNode(obj)) {
-                    const repl = traverseAst(obj, pre, post);
+                    const repl = traverseAst(obj, pre, post, node);
                     if (repl === false) {
                         if (!state)
                             state = {};
@@ -147,7 +147,7 @@ function traverseAst(node, pre, post) {
             }
         }
         else if (isMCTreeNode(value)) {
-            let repl = traverseAst(value, pre, post);
+            let repl = traverseAst(value, pre, post, node);
             if (repl === false) {
                 delete node[key];
             }
@@ -167,7 +167,7 @@ function traverseAst(node, pre, post) {
             }
         }
     }
-    return post && post(node);
+    return post && post(node, parent);
 }
 function isStatement(node) {
     return hasProperty(mctreeTypeInfo[node.type], "stmt");
@@ -212,6 +212,9 @@ function withLoc(node, start, end) {
 }
 function withLocDeep(node, start, end, inplace) {
     node = withLoc(inplace ? node : { ...node }, start, end);
+    if (!inplace && node.origins) {
+        node.origins = [...node.origins];
+    }
     for (const key of mctreeTypeInfo[node.type].keys) {
         const value = node[key];
         if (!value)
@@ -546,6 +549,7 @@ __webpack_require__.d(__webpack_exports__, {
   "isLocal": () => (/* binding */ isLocal),
   "isLookupCandidate": () => (/* binding */ isLookupCandidate),
   "isStateNode": () => (/* binding */ isStateNode),
+  "lookupNext": () => (/* binding */ lookupNext),
   "markInvokeClassMethod": () => (/* binding */ markInvokeClassMethod),
   "parseSdkVersion": () => (/* binding */ parseSdkVersion),
   "sameLookupResult": () => (/* binding */ sameLookupResult),
@@ -869,7 +873,7 @@ function visit_resource_refs(state, doc, e) {
                             start: addPositions(startPos, error.location.start),
                             end: addPositions(startPos, error.location.end),
                         };
-                        (0,external_api_cjs_.diagnostic)(state, location, ex.message, check || "WARNING");
+                        (0,external_api_cjs_.diagnostic)(state, { type: "Identifier", loc: location, name: "" }, ex.message, check || "WARNING");
                     }
                 }
             }
@@ -1458,6 +1462,22 @@ function isLookupCandidate(node) {
             node.property.argument
         : node.property.type === "Identifier" && node.property;
 }
+function lookupNext(state, results, decls, property) {
+    return results.reduce((current, lookupDef) => {
+        const items = lookupDef.results
+            .map((module) => {
+            if (!isStateNode(module)) {
+                return null;
+            }
+            const res = checkOne(state, module, decls, property);
+            return res ? { parent: module, results: res } : null;
+        })
+            .filter((r) => r != null);
+        if (!items.length)
+            return current;
+        return current ? current.concat(items) : items;
+    }, null);
+}
 /**
  *
  * @param state    - The ProgramState
@@ -1491,20 +1511,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
                     break;
                 if (!results)
                     return [null, null];
-                result = results.reduce((current, lookupDef) => {
-                    const items = lookupDef.results
-                        .map((module) => {
-                        if (!isStateNode(module)) {
-                            return null;
-                        }
-                        const res = checkOne(state, module, decls, property);
-                        return res ? { parent: module, results: res } : null;
-                    })
-                        .filter((r) => r != null);
-                    if (!items.length)
-                        return current;
-                    return current ? current.concat(items) : items;
-                }, null);
+                result = lookupNext(state, results, decls, property);
                 if (!result &&
                     results.some((ld) => ld.results.some((sn) => sn.type === "VariableDeclarator" ||
                         sn.type === "Identifier" ||
@@ -1610,7 +1617,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
             if (imports) {
                 if (imports.length > 1) {
                     if (state.config?.checkInvalidSymbols !== "OFF") {
-                        diagnostic(state, node.loc, `${formatAst(node)} is ambiguous and exists in multiple imported modules [${imports
+                        diagnostic(state, node, `${formatAst(node)} is ambiguous and exists in multiple imported modules [${imports
                             .map(({ name }) => name)
                             .join(", ")}]`, state.config?.checkInvalidSymbols || "WARNING");
                     }
@@ -1623,7 +1630,10 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
                 if (imports.length == 1) {
                     if (decls !== "type_decls") {
                         if (state.config?.checkCompilerLookupRules !== "OFF") {
-                            diagnostic(state, node.loc, `${formatAst(node)} will only be found when compiled with compiler2 at -O1 or above`, state.config?.checkCompilerLookupRules || "WARNING");
+                            diagnostic(state, node, `${formatAst(node)} will only be found when compiled with compiler2 at -O1 or above`, state.config?.checkCompilerLookupRules || "WARNING", {
+                                uri: "https://github.com/markw65/monkeyc-optimizer/wiki/Compiler1-vs-Compiler2-lookup-rules",
+                                message: "more info",
+                            });
                         }
                         else if (state.lookupRules === "COMPILER1") {
                             return [null, null];
@@ -1688,7 +1698,7 @@ function stateFuncs() {
                     switch (node.type) {
                         case "MemberExpression": {
                             if (isLookupCandidate(node)) {
-                                return (this.pre && this.pre(node, this)) || ["object"];
+                                return (this.pre && this.pre(node, this)) ?? ["object"];
                             }
                             break;
                         }
@@ -2157,7 +2167,7 @@ function findUsing(state, stack, using) {
         return using.module;
     }
     if (state.config?.checkInvalidSymbols !== "OFF") {
-        diagnostic(state, using.node.id.loc, `Unable to resolve import of ${formatAst(using.node.id)}`, state.config?.checkInvalidSymbols || "WARNING");
+        diagnostic(state, using.node.id, `Unable to resolve import of ${formatAst(using.node.id)}`, state.config?.checkInvalidSymbols || "WARNING");
     }
     return null;
 }
@@ -2216,7 +2226,8 @@ function markInvokeClassMethod(state, func) {
 function isLocal(v) {
     return v.stack[v.stack.length - 1]?.type === "BlockStatement";
 }
-function diagnostic(state, loc, message, type = "INFO") {
+function diagnostic(state, node, message, type = "INFO", extra) {
+    const loc = node.loc;
     if (!loc || !loc.source)
         return;
     const source = loc.source;
@@ -2228,11 +2239,38 @@ function diagnostic(state, loc, message, type = "INFO") {
         state.diagnostics[source] = [];
     }
     const diags = state.diagnostics[source];
-    let index = diags.findIndex((item) => item.loc === loc);
+    let index = diags.findIndex((item) => item.loc.start.offset === loc.start.offset &&
+        item.loc.end.offset === loc.end.offset &&
+        (!item.related
+            ? !node.origins
+            : item.related.length === node.origins?.length &&
+                item.related.every((r, i) => r.loc.start.offset === node.origins[i].loc.start.offset &&
+                    r.loc.end.offset === node.origins[i].loc.end.offset &&
+                    r.loc.source === node.origins[i].loc.source)));
     if (message) {
         if (index < 0)
             index = diags.length;
-        diags[index] = { type, loc, message };
+        const diag = {
+            type,
+            loc,
+            message,
+        };
+        if (extra) {
+            diag.extra = extra;
+        }
+        if (node.origins) {
+            diag.related = [];
+            const related = diag.related;
+            node.origins.forEach((origin) => {
+                if (origin.loc.source) {
+                    related.push({
+                        loc: origin.loc,
+                        message: `inlined from ${origin.func}`,
+                    });
+                }
+            });
+        }
+        diags[index] = diag;
     }
     else if (index >= 0) {
         diags.splice(index, 1);