enhance inline (#5226)

2021-12-21 05:03:11 +00:00
parent 86406e71ec
commit ba42cbad3f
15 changed files with 798 additions and 136 deletions
--- a/test/compress/awaits.js
+++ b/test/compress/awaits.js
@@ -182,6 +182,34 @@ dont_inline: {
    node_version: ">=8"
 }

+dont_inline_nested: {
+    options = {
+        inline: true,
+    }
+    input: {
+        function await() {
+            return "PASS";
+        }
+        (async function() {
+            (function() {
+                console.log(await("FAIL"));
+            })();
+        })();
+    }
+    expect: {
+        function await() {
+            return "PASS";
+        }
+        (async function() {
+            (function() {
+                console.log(await("FAIL"));
+            })();
+        })();
+    }
+    expect_stdout: "PASS"
+    node_version: ">=8"
+}
+
 inline_await_1: {
    options = {
        awaits: true,
--- a/test/compress/classes.js
+++ b/test/compress/classes.js
@@ -1310,6 +1310,7 @@ issue_4725_1: {

 issue_4725_2: {
    options = {
+        if_return: true,
        inline: true,
    }
    input: {
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -3731,6 +3731,7 @@ issue_2437_1: {
    options = {
        collapse_vars: true,
        conditionals: true,
+        if_return: true,
        inline: true,
        join_vars: true,
        passes: 2,
@@ -3783,6 +3784,7 @@ issue_2437_2: {
        conditionals: true,
        inline: true,
        join_vars: true,
+        negate_iife: true,
        passes: 3,
        reduce_funcs: true,
        reduce_vars: true,
@@ -9374,9 +9376,8 @@ inline_throw: {
    expect: {
        try {
            (function(a) {
-                return function() {
-                    throw a;
-                }();
+                throw a;
+                return;
            })("PASS");
        } catch (e) {
            console.log(e);
--- a/test/compress/const.js
+++ b/test/compress/const.js
@@ -1219,9 +1219,9 @@ issue_4248: {
    expect_stdout: "PASS"
 }

-issue_4261: {
+issue_4261_1: {
    options = {
-        inline: true,
+        inline: 3,
        reduce_funcs: true,
        reduce_vars: true,
        toplevel: true,
@@ -1259,6 +1259,45 @@ issue_4261: {
    expect_stdout: "42"
 }

+issue_4261_2: {
+    options = {
+        if_return: true,
+        inline: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        {
+            const a = 42;
+            (function() {
+                function f() {
+                    console.log(a);
+                }
+                function g() {
+                    while (f());
+                }
+                (function() {
+                    while (g());
+                })();
+            })();
+        }
+    }
+    expect: {
+        {
+            const a = 42;
+            (function() {
+                function g() {
+                    while (void console.log(a));
+                }
+                while (g());
+            })();
+        }
+    }
+    expect_stdout: "42"
+}
+
 issue_4274_1: {
    options = {
        loops: true,
--- a/test/compress/default-values.js
+++ b/test/compress/default-values.js
@@ -1866,7 +1866,7 @@ issue_5057_2: {

 issue_5057_3: {
    options = {
-        inline: true,
+        inline: 3,
        unused: true,
    }
    input: {
@@ -1889,6 +1889,31 @@ issue_5057_3: {
    node_version: ">=6"
 }

+issue_5057_4: {
+    options = {
+        if_return: true,
+        inline: true,
+        unused: true,
+    }
+    input: {
+        (function(a) {
+            (function f(b) {
+                (function(a = console.log("FAIL 1")) {})(b);
+                console.log(a);
+            })("FAIL 2");
+        })("PASS");
+    }
+    expect: {
+        (function(a) {
+            var b = "FAIL 2";
+            (function(a = console.log("FAIL 1")) {})(b);
+            console.log(a);
+        })("PASS");
+    }
+    expect_stdout: "PASS"
+    node_version: ">=6"
+}
+
 issue_5065: {
    options = {
        pure_getters: "strict",
--- a/test/compress/destructured.js
+++ b/test/compress/destructured.js
@@ -2069,7 +2069,7 @@ issue_4319: {

 issue_4321: {
    options = {
-        inline: true,
+        inline: 3,
        keep_fargs: false,
    }
    input: {
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -679,6 +679,26 @@ inline_loop_4: {
    }
 }

+inline_negate_iife: {
+    options = {
+        inline: true,
+    }
+    input: {
+        console.log(function() {
+            return !function() {
+                while (!console);
+            }();
+        }());
+    }
+    expect: {
+        console.log(function() {
+            while (!console);
+            return !void 0;
+        }());
+    }
+    expect_stdout: "true"
+}
+
 issue_2476: {
    options = {
        inline: true,
@@ -1029,7 +1049,7 @@ issue_2616: {

 issue_2620_1: {
    options = {
-        inline: true,
+        inline: 3,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -1063,6 +1083,42 @@ issue_2620_1: {
 }

 issue_2620_2: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            function f(a) {
+                var b = function g(a) {
+                    a && a();
+                }();
+                if (a) {
+                    var d = c = "PASS";
+                }
+            }
+            f(1);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            var a = 1;
+            if (function(a) {
+                a && a();
+            }(), a) c = "PASS";
+        })(),
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2620_3: {
    options = {
        conditionals: true,
        evaluate: true,
@@ -1096,10 +1152,10 @@ issue_2620_2: {
    expect_stdout: "PASS"
 }

-issue_2620_3: {
+issue_2620_4: {
    options = {
        evaluate: true,
-        inline: true,
+        inline: 3,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -1139,7 +1195,50 @@ issue_2620_3: {
    expect_stdout: "PASS"
 }

-issue_2620_4: {
+issue_2620_5: {
+    options = {
+        evaluate: true,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            function f(a, NaN) {
+                function g() {
+                    switch (a) {
+                      case a:
+                        break;
+                      case c = "PASS", NaN:
+                        break;
+                    }
+                }
+                g();
+            }
+            f(0/0);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            var a = 0/0;
+            var NaN = void 0;
+            switch (a) {
+              case a:
+                break;
+              case c = "PASS", NaN:
+                break;
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2620_6: {
    rename = true
    options = {
        dead_code: true,
@@ -1636,6 +1735,28 @@ duplicate_argnames_3: {
    expect_stdout: "PASS"
 }

+duplicate_argnames_4: {
+    options = {
+        if_return: true,
+        inline: true,
+    }
+    input: {
+        (function() {
+            (function(a, a) {
+                while (console.log(a || "PASS"));
+            })("FAIL");
+        })();
+    }
+    expect: {
+        (function() {
+            var a = "FAIL";
+            var a = void 0;
+            while (console.log(a || "PASS"));
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
 loop_init_arg: {
    options = {
        inline: true,
@@ -2885,6 +3006,7 @@ issue_2437: {
        collapse_vars: true,
        conditionals: true,
        functions: true,
+        if_return: true,
        inline: true,
        join_vars: true,
        passes: 2,
@@ -3310,7 +3432,28 @@ issue_3402: {
    ]
 }

-issue_3439: {
+issue_3439_1: {
+    options = {
+        inline: 3,
+    }
+    input: {
+        console.log(typeof function() {
+            return function(a) {
+                function a() {}
+                return a;
+            }(42);
+        }());
+    }
+    expect: {
+        console.log(typeof function(a) {
+            function a() {}
+            return a;
+        }(42));
+    }
+    expect_stdout: "function"
+}
+
+issue_3439_2: {
    options = {
        inline: true,
    }
@@ -3390,7 +3533,7 @@ issue_3506_2: {
    options = {
        collapse_vars: true,
        evaluate: true,
-        inline: true,
+        inline: 3,
        reduce_vars: true,
        side_effects: true,
        unused: true,
@@ -3419,9 +3562,40 @@ issue_3506_2: {
 issue_3506_3: {
    options = {
        collapse_vars: true,
-        dead_code: true,
        evaluate: true,
        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var a = "FAIL";
+        (function(b) {
+            (function(c) {
+                var d = 1;
+                for (;c && (a = "PASS") && 0 < --d;);
+            })(b);
+        })(a);
+        console.log(a);
+    }
+    expect: {
+        var a = "FAIL";
+        (function(b) {
+            var c = a;
+            var d = 1;
+            for (;c && (a = "PASS") && 0 < --d;);
+        })();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3506_4: {
+    options = {
+        collapse_vars: true,
+        dead_code: true,
+        evaluate: true,
+        inline: 3,
        loops: true,
        reduce_vars: true,
        side_effects: true,
@@ -3448,6 +3622,39 @@ issue_3506_3: {
    expect_stdout: "PASS"
 }

+issue_3506_5: {
+    options = {
+        collapse_vars: true,
+        dead_code: true,
+        evaluate: true,
+        inline: true,
+        loops: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var a = "FAIL";
+        (function(b) {
+            (function(c) {
+                var d = 1;
+                for (;c && (a = "PASS") && 0 < --d;);
+            })(b);
+        })(a);
+        console.log(a);
+    }
+    expect: {
+        var a = "FAIL";
+        (function(b) {
+            var c = a;
+            var d = 1;
+            for (;c && (a = "PASS") && 0 < --d;);
+        })();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
 issue_3512: {
    options = {
        collapse_vars: true,
@@ -3595,6 +3802,45 @@ hoisted_single_use: {
    ]
 }

+inlined_single_use: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(f) {
+            f();
+        }(function() {
+            var a = function() {
+                A;
+            };
+            var b = function() {
+                a(B);
+            };
+            (function() {
+                b;
+            });
+            var c = 42;
+        }));
+    }
+    expect: {
+        console.log(function(f) {
+            var a = function() {
+                A;
+            };
+            var b = function() {
+                a(B);
+            };
+            (function() {
+                b;
+            });
+            return;
+        }());
+    }
+    expect_stdout: "undefined"
+}
+
 pr_3592_1: {
    options = {
        inline: true,
@@ -4286,9 +4532,9 @@ substitute: {
    ]
 }

-substitute_add_farg: {
+substitute_add_farg_1: {
    options = {
-        inline: true,
+        inline: 3,
        keep_fargs: false,
    }
    input: {
@@ -4323,6 +4569,46 @@ substitute_add_farg: {
    ]
 }

+substitute_add_farg_2: {
+    options = {
+        if_return: true,
+        inline: true,
+        keep_fargs: false,
+        side_effects: true,
+    }
+    input: {
+        function f(g) {
+            console.log(g.length);
+            g(null, "FAIL");
+        }
+        f(function() {
+            return function(a, b) {
+                return function(c) {
+                    do {
+                        console.log("PASS");
+                    } while (c);
+                }(a, b);
+            };
+        }());
+    }
+    expect: {
+        function f(g) {
+            console.log(g.length);
+            g(null, "FAIL");
+        }
+        f(function(a, b) {
+            var c = a;
+            do {
+                console.log("PASS");
+            } while (c);
+        });
+    }
+    expect_stdout: [
+        "2",
+        "PASS",
+    ]
+}
+
 substitute_arguments: {
    options = {
        inline: true,
@@ -4652,9 +4938,9 @@ substitute_use_strict: {
    ]
 }

-issue_3833: {
+issue_3833_1: {
    options = {
-        inline: true,
+        inline: 3,
        keep_fargs: false,
        reduce_vars: true,
        toplevel: true,
@@ -4679,6 +4965,33 @@ issue_3833: {
    expect_stdout: "PASS"
 }

+issue_3833_2: {
+    options = {
+        if_return: true,
+        inline: true,
+        keep_fargs: false,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f(a) {
+            return function() {
+                while (a);
+                console.log("PASS");
+            }();
+        }
+        f();
+    }
+    expect: {
+        (function(a) {
+            while (a);
+            console.log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
 issue_3835: {
    options = {
        inline: true,
@@ -4699,9 +5012,9 @@ issue_3835: {
    expect_stdout: true
 }

-issue_3836: {
+issue_3836_1: {
    options = {
-        inline: true,
+        inline: 3,
    }
    input: {
        (function() {
@@ -4720,6 +5033,29 @@ issue_3836: {
    expect_stdout: "PASS"
 }

+issue_3836_2: {
+    options = {
+        if_return: true,
+        inline: true,
+    }
+    input: {
+        (function() {
+            return function() {
+                for (var a in 0)
+                    console.log(k);
+            }(console.log("PASS"));
+        })();
+    }
+    expect: {
+        (function() {
+            console.log("PASS");
+            for (var a in 0)
+                console.log(k);
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
 issue_3852: {
    options = {
        collapse_vars: true,
@@ -5208,6 +5544,7 @@ issue_4259: {

 issue_4261: {
    options = {
+        if_return: true,
        inline: true,
        reduce_funcs: true,
        reduce_vars: true,
@@ -5237,15 +5574,15 @@ issue_4261: {
        } catch (e) {
            (function() {
                function g() {
+                    // `ReferenceError: e is not defined` on Node.js v0.10
                    while (void e.p);
                }
-                (function() {
-                    while (console.log(g()));
-                })();
+                while (console.log(g()));
            })();
        }
    }
-    expect_stdout: true
+    expect_stdout: "undefined"
+    node_version: "<0.10 || >=0.12"
 }

 issue_4265: {
@@ -5500,6 +5837,7 @@ issue_4655: {

 issue_4659_1: {
    options = {
+        if_return: true,
        inline: true,
        reduce_vars: true,
    }
@@ -5524,11 +5862,9 @@ issue_4659_1: {
            function f() {
                return a++;
            }
+            f && a++;
            (function() {
-                f && a++;
-                (function() {
-                    var a = console && a;
-                })();
+                var a = console && a;
            })();
        })();
        console.log(a);
@@ -5538,6 +5874,7 @@ issue_4659_1: {

 issue_4659_2: {
    options = {
+        if_return: true,
        inline: true,
        reduce_vars: true,
    }
@@ -5564,11 +5901,9 @@ issue_4659_2: {
            function f() {
                return a++;
            }
+            void (f && a++);
            (function() {
-                void (f && a++);
-                (function() {
-                    var a = console && a;
-                })();
+                var a = console && a;
            })();
        })();
        console.log(a);
@@ -5578,6 +5913,7 @@ issue_4659_2: {

 issue_4659_3: {
    options = {
+        if_return: true,
        inline: true,
        reduce_vars: true,
        unused: true,
@@ -5607,12 +5943,10 @@ issue_4659_3: {
                return a++;
            }
            (function() {
-                (function() {
-                    while (!console);
-                })(f && a++);
-                (function() {
-                    var a = console && a;
-                })();
+                while (!console);
+            })(f && a++);
+            (function() {
+                var a = console && a;
            })();
        })();
        console.log(a);
@@ -5787,6 +6121,7 @@ issue_4725_1: {

 issue_4725_2: {
    options = {
+        if_return: true,
        inline: true,
    }
    input: {
--- a/test/compress/if_return.js
+++ b/test/compress/if_return.js
@@ -545,7 +545,36 @@ if_body_return_3: {
    ]
 }

-issue_3600: {
+issue_3600_1: {
+    options = {
+        if_return: true,
+        inline: 3,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = 0;
+        (function() {
+            if ([ ][c++]); else return;
+            return void function() {
+                var b = --b, a = c = 42;
+                return c;
+            }();
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        (function() {
+            if ([][c++]) b = --b, c = 42;
+            var b;
+        })();
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+issue_3600_2: {
    options = {
        if_return: true,
        inline: true,
@@ -566,8 +595,10 @@ issue_3600: {
    expect: {
        var c = 0;
        (function() {
-            if ([][c++]) b = --b, c = 42;
-            var b;
+            if ([][c++]) {
+                var b = --b;
+                c = 42;
+            }
        })();
        console.log(c);
    }
--- a/test/compress/keep_fargs.js
+++ b/test/compress/keep_fargs.js
@@ -1217,6 +1217,7 @@ issues_3267_1: {
        evaluate: true,
        inline: true,
        keep_fargs: false,
+        negate_iife: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -6671,6 +6671,7 @@ issues_3267_1: {
        dead_code: true,
        evaluate: true,
        inline: true,
+        negate_iife: true,
        reduce_vars: true,
        sequences: true,
        side_effects: true,
@@ -6688,7 +6689,7 @@ issues_3267_1: {
        });
    }
    expect: {
-        !function(i) {
+        !function(x) {
            if (Object())
                return console.log("PASS");
            throw "FAIL";
@@ -6705,6 +6706,7 @@ issues_3267_2: {
        evaluate: true,
        inline: true,
        keep_fargs: false,
+        negate_iife: true,
        passes: 2,
        reduce_vars: true,
        sequences: true,
--- a/test/compress/spreads.js
+++ b/test/compress/spreads.js
@@ -147,7 +147,7 @@ dont_inline: {
    node_version: ">=6"
 }

-do_inline: {
+do_inline_1: {
    options = {
        inline: true,
        spreads: true,
@@ -164,6 +164,48 @@ do_inline: {
    node_version: ">=6"
 }

+do_inline_2: {
+    options = {
+        inline: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            (function() {
+                console.log("PASS");
+            })(..."");
+        })();
+    }
+    expect: {
+        [] = [ ..."" ],
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+    node_version: ">=6"
+}
+
+do_inline_3: {
+    options = {
+        if_return: true,
+        inline: true,
+    }
+    input: {
+        (function() {
+            (function() {
+                while (console.log("PASS"));
+            })(..."");
+        })();
+    }
+    expect: {
+        (function() {
+            var [] = [ ..."" ];
+            while (console.log("PASS"));
+        })();
+    }
+    expect_stdout: "PASS"
+    node_version: ">=6"
+}
+
 drop_empty_call_1: {
    options = {
        side_effects: true,
--- a/test/compress/yields.js
+++ b/test/compress/yields.js
@@ -784,6 +784,30 @@ inline_nested_yield: {
    node_version: ">=4"
 }

+dont_inline_nested: {
+    options = {
+        inline: true,
+    }
+    input: {
+        var yield = "PASS";
+        (function*() {
+            (function() {
+                console.log(yield);
+            })();
+        })().next();
+    }
+    expect: {
+        var yield = "PASS";
+        (function*() {
+            (function() {
+                console.log(yield);
+            })();
+        })().next();
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
 drop_body: {
    options = {
        side_effects: true,