enhance inline & unused (#5245)

2022-01-01 21:40:43 +00:00
parent 8d0422b6f3
commit 87a7426598
17 changed files with 992 additions and 236 deletions
--- a/test/compress/classes.js
+++ b/test/compress/classes.js
@@ -1646,10 +1646,8 @@ issue_4962_1: {
        })(function g() {});
    }
    expect: {
-        (function g() {}),
-        void function() {
-            while (console.log(typeof g));
-        }();
+        (function g() {});
+        while (console.log(typeof g));
    }
    expect_stdout: "undefined"
    node_version: ">=12"
--- a/test/compress/const.js
+++ b/test/compress/const.js
@@ -838,12 +838,10 @@ issue_4202: {
    expect: {
        {
            const o = {};
-            (function() {
-                function f() {
-                    o.p = 42;
-                }
-                f(f);
-            })();
+            function f() {
+                o.p = 42;
+            }
+            f(f);
            console.log(o.p++);
        }
    }
@@ -1287,12 +1285,10 @@ issue_4261_2: {
    expect: {
        {
            const a = 42;
-            (function() {
-                function g() {
-                    while (void console.log(a));
-                }
-                while (g());
-            })();
+            function g() {
+                while (void console.log(a));
+            }
+            while (g());
        }
    }
    expect_stdout: "42"
--- a/test/compress/default-values.js
+++ b/test/compress/default-values.js
@@ -2027,13 +2027,11 @@ issue_5222: {
        f();
    }
    expect: {
-        (function() {
-            do {
-                a = void 0,
-                [ a ] = [];
-            } while (console.log("PASS"));
-            var a;
-        })();
+        do {
+            a = void 0,
+            [ a ] = [];
+        } while (console.log("PASS"));
+        var a;
    }
    expect_stdout: "PASS"
    node_version: ">=6"
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -604,6 +604,254 @@ empty_body: {
    }
 }

+inline_binary_and: {
+    options = {
+        inline: true,
+    }
+    input: {
+        console.log(function() {
+            (function() {
+                while (console.log("foo"));
+                return "bar";
+            })() && (function() {
+                while (console.log("baz"));
+                return "moo";
+            })();
+        }());
+    }
+    expect: {
+        console.log(function() {
+            if (function() {
+                while (console.log("foo"));
+                return "bar";
+            }()) {
+                while (console.log("baz"));
+                return void "moo";
+                return;
+            }
+        }());
+    }
+    expect_stdout: [
+        "foo",
+        "baz",
+        "undefined",
+    ]
+}
+
+inline_binary_or: {
+    options = {
+        inline: true,
+    }
+    input: {
+        (function() {
+            while (console.log("foo"));
+        })() || (function() {
+            while (console.log("bar"));
+        })();
+    }
+    expect: {
+        if (!function() {
+            while (console.log("foo"));
+        }())
+            while (console.log("bar"));
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+}
+
+inline_conditional: {
+    options = {
+        inline: true,
+    }
+    input: {
+        (function() {
+            while (console.log("foo"));
+        })() ? (function() {
+            while (console.log("bar"));
+        })() : (function() {
+            while (console.log("baz"));
+        })();
+    }
+    expect: {
+        if (function() {
+            while (console.log("foo"));
+        }())
+            while (console.log("bar"));
+        else
+            while (console.log("baz"));
+    }
+    expect_stdout: [
+        "foo",
+        "baz",
+    ]
+}
+
+inline_do: {
+    options = {
+        inline: true,
+    }
+    input: {
+        do (function() {
+            while (console.log("foo"));
+        })();
+        while (function() {
+            while (console.log("bar"));
+        }());
+    }
+    expect: {
+        do {
+            while (console.log("foo"));
+        } while (function() {
+            while (console.log("bar"));
+        }());
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+}
+
+inline_finally_return: {
+    options = {
+        inline: true,
+    }
+    input: {
+        console.log(function() {
+            try {
+                throw "FAIL";
+            } finally {
+                return function() {
+                    while (console.log("PASS"));
+                }(), 42;
+            }
+        }());
+    }
+    expect: {
+        console.log(function() {
+            try {
+                throw "FAIL";
+            } finally {
+                while (console.log("PASS"));
+                return 42;
+            }
+        }());
+    }
+    expect_stdout: [
+        "PASS",
+        "42",
+    ]
+}
+
+inline_for_init: {
+    options = {
+        inline: true,
+    }
+    input: {
+        for (function() {
+            while (console.log("foo"));
+        }(); function() {
+            while (console.log("bar"));
+        }(); function() {
+            while (console.log("baz"));
+        }()) (function() {
+            while (console.log("moo"));
+        })();
+    }
+    expect: {
+        while (console.log("foo"));
+        for (; function() {
+            while (console.log("bar"));
+        }(); function() {
+            while (console.log("baz"));
+        }()) {
+            while (console.log("moo"));
+        }
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+}
+
+inline_for_object: {
+    options = {
+        inline: true,
+    }
+    input: {
+        for (var a in function() {
+            while (console.log("foo"));
+        }(), function() {
+            while (console.log("bar"));
+        }()) (function() {
+            while (console.log("baz"));
+        })();
+    }
+    expect: {
+        while (console.log("foo"));
+        for (var a in function() {
+            while (console.log("bar"));
+        }()) {
+            while (console.log("baz"));
+        }
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+}
+
+inline_if_else: {
+    options = {
+        inline: true,
+    }
+    input: {
+        if (function() {
+            while (console.log("foo"));
+        }(), function() {
+            while (console.log("bar"));
+        }()) (function() {
+            while (console.log("baz"));
+        })();
+        else (function() {
+            while (console.log("moo"));
+        })();
+    }
+    expect: {
+        while (console.log("foo"));
+        if (function() {
+            while (console.log("bar"));
+        }()) {
+            while (console.log("baz"));
+        } else {
+            while (console.log("moo"));
+        }
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+        "moo",
+    ]
+}
+
+inline_label: {
+    options = {
+        inline: true,
+    }
+    input: {
+        L: (function() {
+            while (console.log("PASS"));
+        })()
+    }
+    expect: {
+        L: {
+            while (console.log("PASS"));
+        }
+    }
+    expect_stdout: "PASS"
+}
+
 inline_loop_1: {
    options = {
        inline: true,
@@ -679,6 +927,86 @@ inline_loop_4: {
    }
 }

+inline_loop_5: {
+    options = {
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        for (var a in "foo") {
+            (function() {
+                function f() {}
+                var f;
+                console.log(typeof f, a - f);
+            })();
+        }
+    }
+    expect: {
+        for (var a in "foo")
+            f = function() {},
+            void console.log(typeof f, a - f);
+        var f;
+    }
+    expect_stdout: [
+        "function NaN",
+        "function NaN",
+        "function NaN",
+    ]
+}
+
+inline_loop_6: {
+    options = {
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        for (var a in "foo") {
+            (function() {
+                var f;
+                function f() {}
+                console.log(typeof f, a - f);
+            })();
+        }
+    }
+    expect: {
+        for (var a in "foo")
+            f = function() {},
+            void console.log(typeof f, a - f);
+        var f;
+    }
+    expect_stdout: [
+        "function NaN",
+        "function NaN",
+        "function NaN",
+    ]
+}
+
+inline_loop_7: {
+    options = {
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        for (var a = 0; a < 2; a++) {
+            (function() {
+                var b = b && b[console.log("FAIL")] || "PASS";
+                while (console.log(b));
+            })();
+        }
+    }
+    expect: {
+        for (var a = 0; a < 2; a++) {
+            b = void 0;
+            var b = b && b[console.log("FAIL")] || "PASS";
+            while (console.log(b));
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+}
+
 inline_negate_iife: {
    options = {
        inline: true,
@@ -699,6 +1027,111 @@ inline_negate_iife: {
    expect_stdout: "true"
 }

+inline_return_binary: {
+    options = {
+        inline: true,
+    }
+    input: {
+        console.log(function() {
+            return function() {
+                while (console.log("foo"));
+                return "bar";
+            }() || function() {
+                while (console.log("baz"));
+                return "moo";
+            }();
+        }());
+    }
+    expect: {
+        console.log(function() {
+            while (console.log("foo"));
+            return "bar";
+        }() || function() {
+            while (console.log("baz"));
+            return "moo";
+        }());
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+}
+
+inline_return_conditional: {
+    options = {
+        inline: true,
+    }
+    input: {
+        console.log(function() {
+            return console ? "foo" : function() {
+                while (console.log("bar"));
+                return "baz";
+            }();
+        }());
+    }
+    expect: {
+        console.log(function() {
+            if (console)
+                return "foo";
+            else {
+                while (console.log("bar"));
+                return "baz";
+                return;
+            }
+        }());
+    }
+    expect_stdout: "foo"
+}
+
+inline_while: {
+    options = {
+        inline: true,
+    }
+    input: {
+        while (function() {
+            while (console.log("foo"));
+        }()) (function() {
+            while (console.log("bar"));
+        })();
+    }
+    expect: {
+        while (function() {
+            while (console.log("foo"));
+        }()) {
+            while (console.log("bar"));
+        }
+    }
+    expect_stdout: "foo"
+}
+
+inline_with: {
+    options = {
+        inline: true,
+    }
+    input: {
+        with (+function() {
+            while (console.log("foo"));
+        }(), -function() {
+            while (console.log("bar"));
+        }()) ~function() {
+            while (console.log("baz"));
+        }();
+    }
+    expect: {
+        while (console.log("foo"));
+        with (-function() {
+            while (console.log("bar"));
+        }()) {
+            while (console.log("baz"));
+        }
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+        "baz",
+    ]
+}
+
 issue_2476: {
    options = {
        inline: true,
@@ -820,16 +1253,14 @@ issue_2604_1: {
    }
    expect: {
        var a = "FAIL";
-        (function() {
-            try {
-                throw 1;
-            } catch (b) {
-                (function(b) {
-                    b && b();
-                })();
-                b && (a = "PASS");
-            }
-        })();
+        try {
+            throw 1;
+        } catch (b) {
+            (function(b) {
+                b && b();
+            })();
+            b && (a = "PASS");
+        }
        console.log(a);
    }
    expect_stdout: "PASS"
@@ -862,13 +1293,11 @@ issue_2604_2: {
    }
    expect: {
        var a = "FAIL";
-        (function() {
-            try {
-                throw 1;
-            } catch (o) {
-                o && (a = "PASS");
-            }
-        })();
+        try {
+            throw 1;
+        } catch (o) {
+            o && (a = "PASS");
+        }
        console.log(a);
    }
    expect_stdout: "PASS"
@@ -1305,9 +1734,7 @@ issue_2630_1: {
    }
    expect: {
        var c = 0;
-        (function() {
-            while (void (c = 1 + ++c));
-        })(),
+        while (void (c = 1 + ++c));
        console.log(c);
    }
    expect_stdout: "2"
@@ -1338,9 +1765,8 @@ issue_2630_2: {
    }
    expect: {
        var c = 0;
-        !function() {
-            while (void (c = 1 + (c += 1)));
-        }(), console.log(c);
+        while (void (c = 1 + (c += 1)));
+        console.log(c);
    }
    expect_stdout: "2"
 }
@@ -1384,7 +1810,7 @@ issue_2630_3: {
 issue_2630_4: {
    options = {
        collapse_vars: true,
-        inline: true,
+        inline: 3,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -1412,6 +1838,35 @@ issue_2630_4: {
 }

 issue_2630_5: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var x = 3, a = 1, b = 2;
+        (function() {
+            (function f1() {
+                while (--x >= 0 && f2());
+            }());
+            function f2() {
+                a++ + (b += a);
+            }
+        })();
+        console.log(a);
+    }
+    expect: {
+        var x = 3, a = 1, b = 2;
+        while (--x >= 0 && void (b += ++a));
+        console.log(a);
+    }
+    expect_stdout: "2"
+}
+
+issue_2630_6: {
    options = {
        assignments: true,
        collapse_vars: true,
@@ -4981,10 +5436,9 @@ issue_3833_2: {
        f();
    }
    expect: {
-        (function(a) {
-            while (a);
-            console.log("PASS");
-        })();
+        var a = void 0;
+        while (a);
+        console.log("PASS");
    }
    expect_stdout: "PASS"
 }
@@ -5605,17 +6059,15 @@ issue_4261: {
        try {
            throw 42;
        } catch (e) {
-            (function() {
-                function g() {
-                    // `ReferenceError: e is not defined` on Node.js v0.10
-                    while (void e.p);
-                }
-                while (console.log(g()));
-            })();
+            function g() {
+                // `ReferenceError: e is not defined` on Node.js v4-
+                while (void e.p);
+            }
+            while (console.log(g()));
        }
    }
    expect_stdout: "undefined"
-    node_version: "<0.10 || >=0.12"
+    node_version: ">=6"
 }

 issue_4265: {
@@ -5975,9 +6427,8 @@ issue_4659_3: {
            function f() {
                return a++;
            }
-            (function() {
-                while (!console);
-            })(f && a++);
+            f && a++;
+            while (!console);
            (function() {
                var a = console && a;
            })();
@@ -7122,9 +7573,7 @@ issue_5237: {
    }
    expect: {
        function f() {
-            (function() {
-                while (console.log(0/0));
-            })();
+            while (console.log(0/0));
            var NaN = console && console.log(NaN);
            return;
        }
--- a/test/compress/issue-1704.js
+++ b/test/compress/issue-1704.js
@@ -356,6 +356,7 @@ mangle_catch_redef_3: {
        try {
            throw 0;
        } catch (o) {
+            // prints "FAIL" if inlined on Node.js v4-
            (function() {
                function f() {
                    o = "FAIL";
@@ -366,7 +367,8 @@ mangle_catch_redef_3: {
        console.log(o);
    }
    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: true
+    expect_stdout: "PASS"
+    node_version: ">=6"
 }

 mangle_catch_redef_3_toplevel: {
@@ -379,6 +381,7 @@ mangle_catch_redef_3_toplevel: {
        try {
            throw 0;
        } catch (o) {
+            // prints "FAIL" if inlined on Node.js v4-
            (function() {
                function f() {
                    o = "FAIL";
@@ -389,7 +392,8 @@ mangle_catch_redef_3_toplevel: {
        console.log(o);
    }
    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: true
+    expect_stdout: "PASS"
+    node_version: ">=6"
 }

 mangle_catch_redef_3_ie8: {
@@ -402,6 +406,7 @@ mangle_catch_redef_3_ie8: {
        try {
            throw 0;
        } catch (o) {
+            // prints "FAIL" if inlined on Node.js v4-
            (function() {
                function f() {
                    o = "FAIL";
@@ -412,7 +417,8 @@ mangle_catch_redef_3_ie8: {
        console.log(o);
    }
    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: true
+    expect_stdout: "PASS"
+    node_version: ">=6"
 }

 mangle_catch_redef_3_ie8_toplevel: {
@@ -425,6 +431,7 @@ mangle_catch_redef_3_ie8_toplevel: {
        try {
            throw 0;
        } catch (o) {
+            // prints "FAIL" if inlined on Node.js v4-
            (function() {
                function f() {
                    o = "FAIL";
@@ -435,5 +442,6 @@ mangle_catch_redef_3_ie8_toplevel: {
        console.log(o);
    }
    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: true
+    expect_stdout: "PASS"
+    node_version: ">=6"
 }
--- a/test/compress/issue-892.js
+++ b/test/compress/issue-892.js
@@ -1,6 +1,4 @@
 dont_mangle_arguments: {
-    mangle = {
-    };
    options = {
        booleans: true,
        comparisons: true,
@@ -21,12 +19,13 @@ dont_mangle_arguments: {
        side_effects: true,
        unused: true,
    }
+    mangle = {}
    input: {
        (function(){
            var arguments = arguments, not_arguments = 9;
            console.log(not_arguments, arguments);
-        })(5,6,7);
+        })(5, 6, 7);
    }
-    expect_exact: "(function(){var arguments=arguments,o=9;console.log(o,arguments)})(5,6,7);"
+    expect_exact: "(function(){var arguments,o=9;console.log(o,arguments)})(5,6,7);"
    expect_stdout: true
 }
--- a/test/compress/join_vars.js
+++ b/test/compress/join_vars.js
@@ -570,6 +570,50 @@ inlined_assignments: {
    expect_stdout: "PASS"
 }

+inilne_for: {
+    options = {
+        inline: true,
+        join_vars: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = function() {
+            for (; console.log("PASS"););
+        };
+        a();
+    }
+    expect: {
+        for (; console.log("PASS"););
+    }
+    expect_stdout: "PASS"
+}
+
+inilne_var: {
+    options = {
+        inline: true,
+        join_vars: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        A = "PASS";
+        var a = function() {
+            var b = A;
+            for (b in console.log(b));
+        };
+        a();
+    }
+    expect: {
+        A = "PASS";
+        var b = A;
+        for (b in console.log(b));
+    }
+    expect_stdout: "PASS"
+}
+
 typescript_enum: {
    rename = true
    options = {
--- a/test/compress/keep_fargs.js
+++ b/test/compress/keep_fargs.js
@@ -1236,7 +1236,8 @@ issues_3267_1: {
    }
    expect: {
        !function() {
-            if (Object())
+            var i = Object();
+            if (i)
                return console.log("PASS");
            throw "FAIL";
        }();
--- a/test/compress/let.js
+++ b/test/compress/let.js
@@ -1054,12 +1054,10 @@ issue_4202: {
        "use strict";
        {
            let o = {};
-            (function() {
-                function f() {
-                    o.p = 42;
-                }
-                f(f);
-            })();
+            function f() {
+                o.p = 42;
+            }
+            f(f);
            console.log(o.p++);
        }
    }
--- a/test/compress/nullish.js
+++ b/test/compress/nullish.js
@@ -262,6 +262,30 @@ de_morgan_2e: {
    node_version: ">=14"
 }

+inline_binary_nullish: {
+    options = {
+        inline: true,
+    }
+    input: {
+        (function() {
+            while (console.log("foo"));
+        })() ?? (function() {
+            while (console.log("bar"));
+        })();
+    }
+    expect: {
+        if (void 0 === function() {
+            while (console.log("foo"));
+        }())
+            while (console.log("bar"));
+    }
+    expect_stdout: [
+        "foo",
+        "bar",
+    ]
+    node_version: ">=14"
+}
+
 issue_4679: {
    options = {
        comparisons: true,
--- a/test/compress/pure_getters.js
+++ b/test/compress/pure_getters.js
@@ -1363,9 +1363,8 @@ issue_3490_1: {
    }
    expect: {
        var b = 42, c = "FAIL";
-        if (function() {
-            var a;
-        }(), c = "PASS", b) while ("" == typeof d);
+        var a;
+        if (c = "PASS", b) while ("" == typeof d);
        console.log(c, b);
    }
    expect_stdout: "PASS 42"
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -41,10 +41,8 @@ reduce_vars: {
    }
    expect: {
        var A = 1;
-        (function() {
-            console.log(-3);
-            console.log(A - 5);
-        })();
+        console.log(-3);
+        console.log(A - 5);
        (function f1() {
            var a = 2;
            console.log(a - 5);
@@ -6690,7 +6688,8 @@ issues_3267_1: {
    }
    expect: {
        !function(x) {
-            if (Object())
+            var i = Object();
+            if (i)
                return console.log("PASS");
            throw "FAIL";
        }();
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -1160,10 +1160,8 @@ issue_3490_1: {
    }
    expect: {
        var b = 42, c = "FAIL";
-        if (function() {
-            var a;
-            a && a.p;
-        }(), c = "PASS", b) while ("" == typeof d);
+        var a;
+        if (a && a.p, c = "PASS", b) while ("" == typeof d);
        console.log(c, b);
    }
    expect_stdout: "PASS 42"
@@ -1193,9 +1191,8 @@ issue_3490_2: {
    }
    expect: {
        var b = 42, c = "FAIL";
-        for (function() {
-            var a;
-        }(), c = "PASS", b; "" == typeof d;);
+        var a;
+        for (c = "PASS", b; "" == typeof d;);
        console.log(c, b);
    }
    expect_stdout: "PASS 42"
--- a/test/compress/spreads.js
+++ b/test/compress/spreads.js
@@ -197,10 +197,8 @@ do_inline_3: {
        })();
    }
    expect: {
-        (function() {
-            var [] = [ ..."" ];
-            while (console.log("PASS"));
-        })();
+        var [] = [ ..."" ];
+        while (console.log("PASS"));
    }
    expect_stdout: "PASS"
    node_version: ">=6"