fix corner case in collapse_vars

fixes #5924 fixes #5925
mishoo · Aug 21, 2024 · e374b79 · e374b79
1 parent 23f98ba
commit e374b79
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -3409,6 +3409,7 @@ Compressor.prototype.compress = function(node) {
                 var find_arguments = scope.uses_arguments && !compressor.has_directive("use strict");
                 var scan_toplevel = scope instanceof AST_Toplevel;
                 var tw = new TreeWalker(function(node) {
+                    if (node.inlined_node) node.inlined_node.walk(tw);
                     var value;
                     if (node instanceof AST_SymbolRef) {
                         value = node.fixed_value();

diff --git a/test/compress/functions.js b/test/compress/functions.js
@@ -9076,3 +9076,68 @@ issue_5895_2: {
         "foo",
     ]
 }
+
+issue_5924: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 42;
+        function f() {
+            return a - 41;
+        }
+        function g() {
+            return f;
+        }
+        var b = f();
+        a--;
+        console.log(b ? "PASS" : "FAIL");
+    }
+    expect: {
+        var a = 42;
+        function f() {
+            return a - 41;
+        }
+        function g() {
+            return f;
+        }
+        var b = f();
+        a--;
+        console.log(b ? "PASS" : "FAIL");
+    }
+    expect_stdout: "PASS"
+}
+
+issue_5925: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_vars: true,
+    }
+    input: {
+        var a = 42;
+        console.log(function() {
+            function f() {
+                return +a - 41;
+            }
+            var b = f(f);
+            a--;
+            return b;
+        }() ? "PASS" : "FAIL");
+    }
+    expect: {
+        var a = 42;
+        console.log(function() {
+            function f() {
+                return +a - 41;
+            }
+            var b = f(f);
+            a--;
+            return b;
+        }() ? "PASS" : "FAIL");
+    }
+    expect_stdout: "PASS"
+}