v3.7.7

fix corner case in collapse_vars (#3701 )
fixes #3700
2020-02-02 00:24:50 +00:00 · 2020-01-30 09:04:44 +08:00 · 2020-01-30 00:08:53 +08:00 · 2020-01-29 08:52:20 +08:00 · 2020-01-28 22:44:18 +08:00 · 2020-01-28 12:33:21 +08:00
32 changed files with 2237 additions and 598 deletions
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ a double dash to prevent input files being used as option arguments:
                                `wrap_iife`  Wrap IIFEs in parenthesis. Note: you may
                                             want to disable `negate_iife` under
                                             compressor options.
+    -O, --output-opts [options] Specify output options (`beautify` disabled by default).
    -o, --output <file>         Output file path (default STDOUT). Specify `ast` or
                                `spidermonkey` to write UglifyJS or SpiderMonkey AST
                                as JSON to STDOUT respectively.
@@ -735,6 +736,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
  annotation `/*@__PURE__*/` or `/*#__PURE__*/` immediately precedes the call. For
  example: `/*@__PURE__*/foo();`

+- `strings` (default: `true`) -- compact string concatenations.
+
 - `switches` (default: `true`) -- de-duplicate and remove unreachable `switch` branches

 - `toplevel` (default: `false`) -- drop unreferenced functions (`"funcs"`) and/or
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -36,6 +36,7 @@ program.option("-c, --compress [options]", "Enable compressor/specify compressor
 program.option("-m, --mangle [options]", "Mangle names/specify mangler options.", parse_js());
 program.option("--mangle-props [options]", "Mangle properties/specify mangler options.", parse_js());
 program.option("-b, --beautify [options]", "Beautify output/specify output options.", parse_js());
+program.option("-O, --output-opts [options]", "Output options (beautify disabled).", parse_js());
 program.option("-o, --output <file>", "Output file (default STDOUT).");
 program.option("--comments [filter]", "Preserve copyright comments in the output.");
 program.option("--config-file <file>", "Read minify() options from JSON file.");
@@ -59,7 +60,7 @@ if (program.configFile) {
    if (options.mangle && options.mangle.properties && options.mangle.properties.regex) {
        options.mangle.properties.regex = UglifyJS.parse(options.mangle.properties.regex, {
            expression: true
-        }).getValue();
+        }).value;
    }
 }
 if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
@@ -93,6 +94,10 @@ if (program.beautify) {
        options.output.beautify = true;
    }
 }
+if (program.outputOpts) {
+    if (program.beautify) fatal("--beautify cannot be used with --output-opts");
+    options.output = typeof program.outputOpts == "object" ? program.outputOpts : {};
+}
 if (program.comments) {
    if (typeof options.output != "object") options.output = {};
    options.output.comments = typeof program.comments == "string" ? program.comments : "some";
@@ -370,7 +375,7 @@ function parse_js(flag) {
                if (!(node instanceof UglifyJS.AST_Sequence)) throw node;

                function to_string(value) {
-                    return value instanceof UglifyJS.AST_Constant ? value.getValue() : value.print_to_string({
+                    return value instanceof UglifyJS.AST_Constant ? value.value : value.print_to_string({
                        quote_keys: true
                    });
                }
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -618,7 +618,7 @@ var AST_PropAccess = DEFNODE("PropAccess", "expression property", {
    getProperty: function() {
        var p = this.property;
        if (p instanceof AST_Constant) {
-            return p.getValue();
+            return p.value;
        }
        if (p instanceof AST_UnaryPrefix
            && p.operator == "void"
@@ -824,9 +824,6 @@ var AST_This = DEFNODE("This", null, {

 var AST_Constant = DEFNODE("Constant", null, {
    $documentation: "Base class for all constants",
-    getValue: function() {
-        return this.value;
-    }
 });

 var AST_String = DEFNODE("String", "value quote", {
@@ -967,11 +964,13 @@ TreeWalker.prototype = {
    in_boolean_context: function() {
        var self = this.self();
        for (var i = 0, p; p = this.parent(i); i++) {
-            if (p instanceof AST_SimpleStatement
-                || p instanceof AST_Conditional && p.condition === self
+            if (p instanceof AST_Conditional && p.condition === self
                || p instanceof AST_DWLoop && p.condition === self
                || p instanceof AST_For && p.condition === self
                || p instanceof AST_If && p.condition === self
+                || p instanceof AST_Return && p.in_bool
+                || p instanceof AST_Sequence && p.tail_node() !== self
+                || p instanceof AST_SimpleStatement
                || p instanceof AST_UnaryPrefix && p.operator == "!" && p.expression === self) {
                return true;
            }
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/output.js
+++ b/lib/output.js
@@ -119,15 +119,20 @@ function OutputStream(options) {
        });
    } : function(str) {
        var s = "";
-        for (var i = 0; i < str.length; i++) {
-            if (is_surrogate_pair_head(str[i]) && !is_surrogate_pair_tail(str[i + 1])
-                || is_surrogate_pair_tail(str[i]) && !is_surrogate_pair_head(str[i - 1])) {
-                s += "\\u" + str.charCodeAt(i).toString(16);
-            } else {
-                s += str[i];
+        for (var i = 0, j = 0; i < str.length; i++) {
+            var code = str.charCodeAt(i);
+            if (is_surrogate_pair_head(code)) {
+                if (is_surrogate_pair_tail(str.charCodeAt(i + 1))) {
+                    i++;
+                    continue;
+                }
+            } else if (!is_surrogate_pair_tail(code)) {
+                continue;
            }
+            s += str.slice(j, i) + "\\u" + code.toString(16);
+            j = i + 1;
        }
-        return s;
+        return j == 0 ? str : s + str.slice(j);
    };

    function make_string(str, quote) {
@@ -777,7 +782,7 @@ function OutputStream(options) {
    PARENS(AST_Number, function(output) {
        var p = output.parent();
        if (p instanceof AST_PropAccess && p.expression === this) {
-            var value = this.getValue();
+            var value = this.value;
            if (value < 0 || /^0/.test(make_num(value))) {
                return true;
            }
@@ -1207,7 +1212,7 @@ function OutputStream(options) {
            output.print_string(prop);
            output.print("]");
        } else {
-            if (expr instanceof AST_Number && expr.getValue() >= 0) {
+            if (expr instanceof AST_Number && expr.value >= 0) {
                if (!/[xa-f.)]/i.test(output.last())) {
                    output.print(".");
                }
@@ -1331,21 +1336,21 @@ function OutputStream(options) {
        output.print("this");
    });
    DEFPRINT(AST_Constant, function(self, output) {
-        output.print(self.getValue());
+        output.print(self.value);
    });
    DEFPRINT(AST_String, function(self, output) {
-        output.print_string(self.getValue(), self.quote);
+        output.print_string(self.value, self.quote);
    });
    DEFPRINT(AST_Number, function(self, output) {
        if (use_asm && self.start && self.start.raw != null) {
            output.print(self.start.raw);
        } else {
-            output.print(make_num(self.getValue()));
+            output.print(make_num(self.value));
        }
    });

    DEFPRINT(AST_RegExp, function(self, output) {
-        var regexp = self.getValue();
+        var regexp = self.value;
        var str = regexp.toString();
        if (regexp.raw_source) {
            str = "/" + regexp.raw_source + str.slice(str.lastIndexOf("/"));
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -133,14 +133,10 @@ function is_letter(code) {
 }

 function is_surrogate_pair_head(code) {
-    if (typeof code == "string")
-        code = code.charCodeAt(0);
    return code >= 0xd800 && code <= 0xdbff;
 }

 function is_surrogate_pair_tail(code) {
-    if (typeof code == "string")
-        code = code.charCodeAt(0);
    return code >= 0xdc00 && code <= 0xdfff;
 }

--- a/lib/scope.js
+++ b/lib/scope.js
@@ -428,6 +428,11 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
            if (options.cache && node instanceof AST_Toplevel) {
                node.globals.each(mangle);
            }
+            if (node instanceof AST_Defun && tw.has_directive("use asm")) {
+                var sym = new AST_SymbolRef(node.name);
+                sym.scope = node;
+                sym.reference(options);
+            }
            node.variables.each(function(def) {
                if (!defer_redef(def)) mangle(def);
            });
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.7.3",
+  "version": "3.7.7",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/compress/arrays.js
+++ b/test/compress/arrays.js
@@ -16,6 +16,7 @@ holes_and_undefined: {
 constant_join: {
    options = {
        evaluate: true,
+        strings: true,
        unsafe: true,
    }
    input: {
@@ -65,6 +66,7 @@ constant_join: {
 constant_join_2: {
    options = {
        evaluate: true,
+        strings: true,
        unsafe: true,
    }
    input: {
@@ -94,9 +96,11 @@ constant_join_2: {
 constant_join_3: {
    options = {
        evaluate: true,
+        strings: true,
        unsafe: true,
    }
    input: {
+        var foo, bar, baz;
        var a = [ null ].join();
        var b = [ , ].join();
        var c = [ , 1, , 3 ].join();
@@ -111,6 +115,7 @@ constant_join_3: {
        var l = [ foo, bar + "baz" ].join("");
    }
    expect: {
+        var foo, bar, baz;
        var a = "";
        var b = "";
        var c = ",1,,3";
--- a/test/compress/asm.js
+++ b/test/compress/asm.js
@@ -166,3 +166,69 @@ asm_nested_functions: {
    }
    expect_exact: '0;function a(){"use asm";0.0}0;function b(){0;function c(){"use asm";0.0}0;function d(){0}0}0;'
 }
+
+issue_3636_1: {
+    mangle = {}
+    input: {
+        function n(stdlib, foreign, buffer) {
+            "use asm";
+            function add(x, y) {
+                x = x | 0;
+                y = y | 0;
+                return x + y | 0;
+            }
+            return {
+                add: add
+            };
+        }
+        console.log(new n().add("foo", 42));
+    }
+    expect: {
+        function n(o, e, u) {
+            "use asm";
+            function d(n, o) {
+                n = n | 0;
+                o = o | 0;
+                return n + o | 0;
+            }
+            return {
+                add: d
+            };
+        }
+        console.log(new n().add("foo", 42));
+    }
+    expect_stdout: "42"
+}
+
+issue_3636_2: {
+    mangle = {}
+    input: {
+        var n = function(stdlib, foreign, buffer) {
+            "use asm";
+            function add(x, y) {
+                x = x | 0;
+                y = y | 0;
+                return x + y | 0;
+            }
+            return {
+                add: add
+            };
+        };
+        console.log(new n().add("foo", 42));
+    }
+    expect: {
+        var n = function(n, o, e) {
+            "use asm";
+            function r(n, o) {
+                n = n | 0;
+                o = o | 0;
+                return n + o | 0;
+            }
+            return {
+                add: r
+            };
+        };
+        console.log(new n().add("foo", 42));
+    }
+    expect_stdout: "42"
+}
--- a/test/compress/booleans.js
+++ b/test/compress/booleans.js
@@ -86,3 +86,70 @@ issue_3465_3: {
    }
    expect_stdout: "PASS"
 }
+
+issue_2737_2: {
+    options = {
+        booleans: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(bar) {
+            for (;bar();) break;
+        })(function qux() {
+            return console.log("PASS"), qux;
+        });
+    }
+    expect: {
+        (function(bar) {
+            for (;bar();) break;
+        })(function() {
+            return console.log("PASS"), 1;
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3658: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function f() {
+            console || f();
+            return "PASS";
+        }());
+    }
+    expect: {
+        console.log(function f() {
+            console || f();
+            return "PASS";
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3690: {
+    options = {
+        booleans: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            return function() {
+                return a = [ this ];
+            }() ? "PASS" : "FAIL";
+        }());
+    }
+    expect: {
+        console.log(function(a) {
+            return function() {
+                return 1;
+            }() ? "PASS" : "FAIL";
+        }());
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -5863,8 +5863,8 @@ issue_2974: {
        var c = 0;
        (function(b) {
            var a = 2;
-            for (; b.null = -4, c++, b.null && --a > 0;);
-        })(!0),
+            for (;c++, (!0).null && --a > 0;);
+        })(),
        console.log(c);
    }
    expect_stdout: "1"
@@ -7422,3 +7422,346 @@ issue_3641: {
    }
    expect_stdout: "foo undefined"
 }
+
+issue_3651: {
+    options = {
+        collapse_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = "PASS";
+        try {
+            a = function() {
+                try {
+                    var c = 1;
+                    while (0 < --c);
+                } catch (e) {} finally {
+                    throw 42;
+                }
+            }();
+            b = "FAIL";
+            a.p;
+        } catch (e) {
+            console.log(b);
+        }
+    }
+    expect: {
+        var a, b = "PASS";
+        try {
+            a = function() {
+                try {
+                    var c = 1;
+                    while (0 < --c);
+                } catch (e) {} finally {
+                    throw 42;
+                }
+            }();
+            b = "FAIL";
+            a.p;
+        } catch (e) {
+            console.log(b);
+        }
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3671: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = 0;
+        try {
+            a++;
+            A += 0;
+            a = 1 + a;
+        } catch (e) {
+            console.log(a);
+        }
+    }
+    expect: {
+        var a = 0;
+        try {
+            a++;
+            A += 0;
+            a = 1 + a;
+        } catch (e) {
+            console.log(a);
+        }
+    }
+    expect_stdout: "1"
+}
+
+call_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        (function(a) {
+            a = console;
+            (function() {})();
+            a.log("PASS");
+        })();
+    }
+    expect: {
+        (function(a) {
+            (function() {})();
+            (a = console).log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+call_1_symbol: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        (function(a) {
+            function f() {}
+            a = console;
+            f();
+            a.log(typeof f);
+        })();
+    }
+    expect: {
+        (function(a) {
+            function f() {}
+            f();
+            (a = console).log(typeof f);
+        })();
+    }
+    expect_stdout: "function"
+}
+
+call_2: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        (function(a) {
+            a = console;
+            (function() {
+                return 42;
+                console.log("FAIL");
+            })();
+            a.log("PASS");
+        })();
+    }
+    expect: {
+        (function(a) {
+            (function() {
+                return 42;
+                console.log("FAIL");
+            })();
+            (a = console).log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+call_2_symbol: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        (function(a) {
+            function f() {
+                return 42;
+                console.log("FAIL");
+            }
+            a = console;
+            f();
+            a.log(typeof f);
+        })();
+    }
+    expect: {
+        (function(a) {
+            function f() {
+                return 42;
+                console.log("FAIL");
+            }
+            f();
+            (a = console).log(typeof f);
+        })();
+    }
+    expect_stdout: "function"
+}
+
+call_3: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        (function(a) {
+            a = console;
+            (function() {
+                a = {
+                    log: function() {
+                        console.log("PASS");
+                    }
+                }
+            })();
+            a.log("FAIL");
+        })();
+    }
+    expect: {
+        (function(a) {
+            a = console;
+            (function() {
+                a = {
+                    log: function() {
+                        console.log("PASS");
+                    }
+                }
+            })();
+            a.log("FAIL");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+call_3_symbol: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        (function(a) {
+            function f() {
+                a = {
+                    log: function() {
+                        console.log(typeof f);
+                    }
+                }
+            }
+            a = console;
+            f();
+            a.log("FAIL");
+        })();
+    }
+    expect: {
+        (function(a) {
+            function f() {
+                a = {
+                    log: function() {
+                        console.log(typeof f);
+                    }
+                }
+            }
+            a = console;
+            f();
+            a.log("FAIL");
+        })();
+    }
+    expect_stdout: "function"
+}
+
+issue_3698_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var log = console.log;
+        var a, b = 0, c = 0;
+        (function() {
+            a = b;
+        })(b++, (b++, c++));
+        log(a, b, c);
+    }
+    expect: {
+        var log = console.log;
+        var a, b = 0, c = 0;
+        (function() {
+            a = b;
+        })(b++, (b++, c++));
+        log(a, b, c);
+    }
+    expect_stdout: "2 2 1"
+}
+
+issue_3698_2: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        var log = console.log;
+        var a, b = 0, c = 0, d = 1;
+        (function f() {
+            a = b;
+            d-- && f();
+        })(b++, (b++, c++));
+        log(a, b, c, d);
+    }
+    expect: {
+        var log = console.log;
+        var a, b = 0, c = 0, d = 1;
+        (function f() {
+            a = b;
+            d-- && f();
+        })(b++, (b++, c++));
+        log(a, b, c, d);
+    }
+    expect_stdout: "2 2 1 -1"
+}
+
+issue_3698_3: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        var a = 0, b = 0;
+        (function f(c) {
+            {
+                b++;
+                var bar_1 = (b = 1 + b, c = 0);
+                a-- && f();
+            }
+        })();
+        console.log(b);
+    }
+    expect: {
+        var a = 0, b = 0;
+        (function f(c) {
+            var bar_1 = (b = 1 + ++b, c = 0);
+            a-- && f();
+        })();
+        console.log(b);
+    }
+    expect_stdout: "2"
+}
+
+issue_3700: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = "FAIL";
+        try {
+            a = "PASS";
+            (function() {
+                throw 0;
+            })();
+            a = 1 + a;
+        } catch (e) {
+        }
+        console.log(a);
+    }
+    expect: {
+        var a = "FAIL";
+        try {
+            a = "PASS";
+            (function() {
+                throw 0;
+            })();
+            a = 1 + a;
+        } catch (e) {
+        }
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/concat-strings.js
+++ b/test/compress/concat-strings.js
@@ -26,7 +26,9 @@ concat_1: {
 }

 concat_2: {
-    options = {}
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            1 + (2 + 3),
@@ -55,7 +57,9 @@ concat_2: {
 }

 concat_3: {
-    options = {}
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            1 + 2 + (3 + 4 + 5),
@@ -84,7 +88,9 @@ concat_3: {
 }

 concat_4: {
-    options = {}
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            1 + "2" + (3 + 4 + 5),
@@ -113,7 +119,9 @@ concat_4: {
 }

 concat_5: {
-    options = {}
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            "1" + 2 + (3 + 4 + 5),
@@ -142,7 +150,9 @@ concat_5: {
 }

 concat_6: {
-    options = {}
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            "1" + "2" + (3 + 4 + 5),
@@ -171,6 +181,9 @@ concat_6: {
 }

 concat_7: {
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            "" + 1,
@@ -197,6 +210,9 @@ concat_7: {
 }

 concat_8: {
+    options = {
+        strings: true,
+    }
    input: {
        console.log(
            1 + "",
@@ -221,3 +237,20 @@ concat_8: {
    }
    expect_stdout: true
 }
+
+issue_3689: {
+    options = {
+        strings: true,
+    }
+    input: {
+        console.log(function(a) {
+            return a + ("" + (a[0] = 0));
+        }([]));
+    }
+    expect: {
+        console.log(function(a) {
+            return a + ("" + (a[0] = 0));
+        }([]));
+    }
+    expect_stdout: "00"
+}
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -294,6 +294,45 @@ cond_5: {
    }
 }

+cond_6: {
+    options = {
+        booleans: true,
+        conditionals: true,
+    }
+    input: {
+        x ? a : b;
+        x ? a : a;
+
+        x ? y ? a : b : c;
+        x ? y ? a : a : b;
+        x ? y ? a : b : b;
+        x ? y ? a : b : a;
+        x ? y ? a : a : a;
+
+        x ? a : y ? b : c;
+        x ? a : y ? a : b;
+        x ? a : y ? b : b;
+        x ? a : y ? b : a;
+        x ? a : y ? a : a;
+    }
+    expect: {
+        x ? a : b;
+        x, a;
+
+        x ? y ? a : b : c;
+        x ? (y, a) : b;
+        x && y ? a : b;
+        !x || y ? a : b;
+        x && y, a;
+
+        x ? a : y ? b : c;
+        x || y ? a : b;
+        x ? a : (y, b);
+        !x && y ? b : a;
+        !x && y, a;
+    }
+}
+
 cond_7: {
    options = {
        conditionals: true,
@@ -726,6 +765,24 @@ cond_11: {
    expect_stdout: "foo bar"
 }

+cond_12: {
+    options = {
+        conditionals: true,
+    }
+    input: {
+        x ? y && a : a;
+        x ? y || a : a;
+        x ? a : y && a;
+        x ? a : y || a;
+    }
+    expect: {
+        (!x || y) && a;
+        x && y || a;
+        (x || y) && a;
+        !x && y || a;
+    }
+}
+
 ternary_boolean_consequent: {
    options = {
        booleans: true,
@@ -1578,3 +1635,34 @@ issue_3576: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3668: {
+    options = {
+        conditionals: true,
+        if_return: true,
+    }
+    input: {
+        function f() {
+            try {
+                var undefined = typeof f;
+                if (!f) return undefined;
+                return;
+            } catch (e) {
+                return "FAIL";
+            }
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            try {
+                var undefined = typeof f;
+                return f ? void 0 : undefined;
+            } catch (e) {
+                return "FAIL";
+            }
+        }
+        console.log(f());
+    }
+    expect_stdout: "undefined"
+}
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -141,207 +141,6 @@ try_catch_finally: {
    ]
 }

-accessor: {
-    options = {
-        side_effects: true,
-    }
-    input: {
-        ({
-            get a() {},
-            set a(v){
-                this.b = 2;
-            },
-            b: 1
-        });
-    }
-    expect: {}
-}
-
-issue_2233_1: {
-    options = {
-        pure_getters: "strict",
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        Array.isArray;
-        Boolean;
-        console.log;
-        Date;
-        decodeURI;
-        decodeURIComponent;
-        encodeURI;
-        encodeURIComponent;
-        Error.name;
-        escape;
-        eval;
-        EvalError;
-        Function.length;
-        isFinite;
-        isNaN;
-        JSON;
-        Math.random;
-        Number.isNaN;
-        parseFloat;
-        parseInt;
-        RegExp;
-        Object.defineProperty;
-        String.fromCharCode;
-        RangeError;
-        ReferenceError;
-        SyntaxError;
-        TypeError;
-        unescape;
-        URIError;
-    }
-    expect: {}
-    expect_stdout: true
-}
-
-global_timeout_and_interval_symbols: {
-    options = {
-        pure_getters: "strict",
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        // These global symbols do not exist in the test sandbox
-        // and must be tested separately.
-        clearInterval;
-        clearTimeout;
-        setInterval;
-        setTimeout;
-    }
-    expect: {}
-}
-
-issue_2233_2: {
-    options = {
-        pure_getters: "strict",
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var RegExp;
-        Array.isArray;
-        RegExp;
-        UndeclaredGlobal;
-        function foo() {
-            var Number;
-            AnotherUndeclaredGlobal;
-            Math.sin;
-            Number.isNaN;
-        }
-    }
-    expect: {
-        var RegExp;
-        UndeclaredGlobal;
-        function foo() {
-            var Number;
-            AnotherUndeclaredGlobal;
-            Number.isNaN;
-        }
-    }
-}
-
-issue_2233_3: {
-    options = {
-        pure_getters: "strict",
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        toplevel: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var RegExp;
-        Array.isArray;
-        RegExp;
-        UndeclaredGlobal;
-        function foo() {
-            var Number;
-            AnotherUndeclaredGlobal;
-            Math.sin;
-            Number.isNaN;
-        }
-    }
-    expect: {
-        UndeclaredGlobal;
-    }
-}
-
-global_fns: {
-    options = {
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        Boolean(1, 2);
-        decodeURI(1, 2);
-        decodeURIComponent(1, 2);
-        Date(1, 2);
-        encodeURI(1, 2);
-        encodeURIComponent(1, 2);
-        Error(1, 2);
-        escape(1, 2);
-        EvalError(1, 2);
-        isFinite(1, 2);
-        isNaN(1, 2);
-        Number(1, 2);
-        Object(1, 2);
-        parseFloat(1, 2);
-        parseInt(1, 2);
-        RangeError(1, 2);
-        ReferenceError(1, 2);
-        String(1, 2);
-        SyntaxError(1, 2);
-        TypeError(1, 2);
-        unescape(1, 2);
-        URIError(1, 2);
-        try {
-            Function(1, 2);
-        } catch (e) {
-            console.log(e.name);
-        }
-        try {
-            RegExp(1, 2);
-        } catch (e) {
-            console.log(e.name);
-        }
-        try {
-            Array(NaN);
-        } catch (e) {
-            console.log(e.name);
-        }
-    }
-    expect: {
-        try {
-            Function(1, 2);
-        } catch (e) {
-            console.log(e.name);
-        }
-        try {
-            RegExp(1, 2);
-        } catch (e) {
-            console.log(e.name);
-        }
-        try {
-            Array(NaN);
-        } catch (e) {
-            console.log(e.name);
-        }
-    }
-    expect_stdout: [
-        "SyntaxError",
-        "SyntaxError",
-        "RangeError",
-    ]
-}
-
 collapse_vars_assignment: {
    options = {
        collapse_vars: true,
@@ -863,23 +662,6 @@ issue_2749: {
    expect_stdout: "PASS"
 }

-unsafe_builtin: {
-    options = {
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        (!w).constructor(x);
-        Math.abs(y);
-        [ 1, 2, z ].valueOf();
-    }
-    expect: {
-        w, x;
-        y;
-        z;
-    }
-}
-
 issue_2860_1: {
    options = {
        dead_code: true,
@@ -941,24 +723,6 @@ issue_2929: {
    expect_stdout: "PASS"
 }

-unsafe_string_replace: {
-    options = {
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        "foo".replace("f", function() {
-            console.log("PASS");
-        });
-    }
-    expect: {
-        "foo".replace("f", function() {
-            console.log("PASS");
-        });
-    }
-    expect_stdout: "PASS"
-}
-
 issue_3402: {
    options = {
        dead_code: true,
@@ -1066,6 +830,7 @@ issue_3552: {
 unreachable_assign: {
    options = {
        dead_code: true,
+        strings: true,
    }
    input: {
        console.log(A = "P" + (A = "A" + (B = "S" + (A = B = "S"))), A, B);
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -699,18 +699,6 @@ iife: {
    }
 }

-drop_value: {
-    options = {
-        side_effects: true,
-    }
-    input: {
-        (1, [2, foo()], 3, {a:1, b:bar()});
-    }
-    expect: {
-        foo(), bar();
-    }
-}
-
 issue_1539: {
    options = {
        collapse_vars: true,
@@ -2266,3 +2254,124 @@ issue_3598: {
    }
    expect_stdout: "PASS"
 }
+
+self_assign: {
+    options = {
+        passes: 2,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        function d(a) {
+            a = a;
+        }
+        function e(a, b) {
+            a = b;
+            b = a;
+        }
+        function f(a, b, c) {
+            a = b;
+            b = c;
+            c = a;
+        }
+        function g(a, b, c) {
+            a = a * b + c;
+        }
+    }
+    expect: {
+        function d(a) {}
+        function e(a, b) {}
+        function f(a, b, c) {}
+        function g(a, b, c) {}
+    }
+}
+
+function_argument_reference: {
+    options = {
+        keep_fargs: false,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var a = 1, b = 42;
+        function f(a) {
+            b <<= a;
+        }
+        f();
+        console.log(a, b);
+    }
+    expect: {
+        var a = 1, b = 42;
+        function f(a) {
+            b <<= a;
+        }
+        f();
+        console.log(a, b);
+    }
+    expect_stdout: "1 42"
+}
+
+function_parameter_ie8: {
+    options = {
+        ie8: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a;
+            function f() {
+                console.log("PASS");
+            }
+            f(a = 1 + a);
+        })();
+    }
+    expect: {
+        (function() {
+            (function f() {
+                console.log("PASS");
+            })(0);
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3664: {
+    options = {
+        pure_getters: "strict",
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var a, b = (a = (a = [ b && console.log("FAIL") ]).p = 0, 0);
+            return "PASS";
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var b = ([ b && console.log("FAIL") ].p = 0, 0);
+            return "PASS";
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3673: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        (a = [ a ]).p = 42;
+        console.log("PASS");
+    }
+    expect: {
+        var a;
+        (a = [ a ]).p = 42;
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -266,12 +266,7 @@ issue_2084: {
    }
    expect: {
        var c = 0;
-        !function() {
-            var c;
-            c = 1 + (c = -1),
-            c = 1 + (c = 0),
-            0 !== 23..toString() && (c = 1 + c);
-        }(),
+        23..toString(),
        console.log(c);
    }
    expect_stdout: "0"
@@ -1911,14 +1906,14 @@ issue_2737_2: {
    }
    input: {
        (function(bar) {
-            for (;bar(); ) break;
+            for (;bar();) break;
        })(function qux() {
            return console.log("PASS"), qux;
        });
    }
    expect: {
        (function(bar) {
-            for (;bar(); ) break;
+            for (;bar();) break;
        })(function qux() {
            return console.log("PASS"), qux;
        });
@@ -2249,7 +2244,7 @@ issue_3076: {
        var c = "PASS";
        (function(b) {
            var n = 2;
-            while (--b + (e = void 0, e && (c = "FAIL"), e = 5, 1).toString() && --n > 0);
+            while (--b + (e = void 0, e && (c = "FAIL"), e = 5, 1..toString()) && --n > 0);
            var e;
        })(2),
        console.log(c);
@@ -3705,3 +3700,88 @@ pr_3595_4: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3679_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var f = function() {};
+            f.g = function() {
+                console.log("PASS");
+            };
+            f.g();
+        })();
+    }
+    expect: {
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3679_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        passes: 2,
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            "use strict";
+            var f = function() {};
+            f.g = function() {
+                console.log("PASS");
+            };
+            f.g();
+        })();
+    }
+    expect: {
+        (function() {
+            "use strict";
+            console.log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3679_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        functions: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var f = function() {};
+            f.p = "PASS";
+            f.g = function() {
+                console.log(f.p);
+            };
+            f.g();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {};
+            f.p = "PASS";
+            (f.g = function() {
+                console.log(f.p);
+            })();
+        })();
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -664,7 +664,7 @@ issue_2519: {
    }
    expect: {
        function testFunc() {
-            return 1 * ((6 + 5) / 2);
+            return +((6 + 5) / 2);
        }
        console.log(testFunc());
    }
--- a/test/compress/issue-1770.js
+++ b/test/compress/issue-1770.js
@@ -46,7 +46,7 @@ mangle_props: {
            obj[1/0],
            obj["Infinity"],
            obj[-1/0],
-            obj[-1/0],
+            obj[-(1/0)],
            obj["-Infinity"],
            obj[null],
            obj["null"]
--- a/test/compress/issue-269.js
+++ b/test/compress/issue-269.js
@@ -1,98 +1,111 @@
 issue_269_1: {
-	options = {
+    options = {
        unsafe: true,
    }
-	input: {
-		f(
-			String(x),
-			Number(x),
-			Boolean(x),
+    input: {
+        var x = {};
+        console.log(
+            String(x),
+            Number(x),
+            Boolean(x),

-			String(),
-			Number(),
-			Boolean()
-		);
-	}
-	expect: {
-		f(
-			x + '', +x, !!x,
-			'', 0, false
-		);
-	}
+            String(),
+            Number(),
+            Boolean()
+        );
+    }
+    expect: {
+        var x = {};
+        console.log(
+            x + "", +x, !!x,
+            "", 0, false
+        );
+    }
+    expect_stdout: true
 }

 issue_269_dangers: {
-	options = {
+    options = {
        unsafe: true,
    }
-	input: {
-		f(
-			String(x, x),
-			Number(x, x),
-			Boolean(x, x)
-		);
-	}
-	expect: {
-		f(String(x, x), Number(x, x), Boolean(x, x));
-	}
+    input: {
+        var x = {};
+        console.log(
+            String(x, x),
+            Number(x, x),
+            Boolean(x, x)
+        );
+    }
+    expect: {
+        var x = {};
+        console.log(String(x, x), Number(x, x), Boolean(x, x));
+    }
+    expect_stdout: true
 }

 issue_269_in_scope: {
-	options = {
+    options = {
        unsafe: true,
    }
-	input: {
-		var String, Number, Boolean;
-		f(
-			String(x),
-			Number(x, x),
-			Boolean(x)
-		);
-	}
-	expect: {
-		var String, Number, Boolean;
-		f(String(x), Number(x, x), Boolean(x));
-	}
+    input: {
+        var String, Number, Boolean;
+        var x = {};
+        console.log(
+            String(x),
+            Number(x, x),
+            Boolean(x)
+        );
+    }
+    expect: {
+        var String, Number, Boolean;
+        var x = {};
+        console.log(String(x), Number(x, x), Boolean(x));
+    }
+    expect_stdout: true
 }

 strings_concat: {
-	options = {
+    options = {
+        strings: true,
        unsafe: true,
    }
-	input: {
-		f(
-			String(x + 'str'),
-			String('str' + x)
-		);
-	}
-	expect: {
-		f(
-			x + 'str',
-			'str' + x
-		);
-	}
+    input: {
+        var x = {};
+        console.log(
+            String(x + "str"),
+            String("str" + x)
+        );
+    }
+    expect: {
+        var x = {};
+        console.log(
+            x + "str",
+            "str" + x
+        );
+    }
+    expect_stdout: true
 }

 regexp: {
-	options = {
+    options = {
        evaluate: true,
        unsafe: true,
    }
-	input: {
-		RegExp("foo");
-		RegExp("bar", "ig");
-		RegExp(foo);
-		RegExp("bar", ig);
-		RegExp("should", "fail");
-	}
-	expect: {
-		/foo/;
-		/bar/ig;
-		RegExp(foo);
-		RegExp("bar", ig);
-		RegExp("should", "fail");
-	}
-	expect_warnings: [
-		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:5,2]',
-	]
+    input: {
+        RegExp("foo");
+        RegExp("bar", "ig");
+        RegExp(foo);
+        RegExp("bar", ig);
+        RegExp("should", "fail");
+    }
+    expect: {
+        /foo/;
+        /bar/ig;
+        RegExp(foo);
+        RegExp("bar", ig);
+        RegExp("should", "fail");
+    }
+    expect_warnings: [
+        'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:5,8]',
+    ]
 }
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -6,7 +6,7 @@ while_becomes_for: {
        while (foo()) bar();
    }
    expect: {
-        for (; foo(); ) bar();
+        for (;foo();) bar();
    }
 }

@@ -19,7 +19,7 @@ drop_if_break_1: {
            if (foo()) break;
    }
    expect: {
-        for (; !foo(););
+        for (;!foo(););
    }
 }

@@ -32,7 +32,7 @@ drop_if_break_2: {
            if (foo()) break;
    }
    expect: {
-        for (; bar() && !foo(););
+        for (;bar() && !foo(););
    }
 }

@@ -70,7 +70,7 @@ drop_if_break_4: {
        }
    }
    expect: {
-        for (; bar() && (x(), y(), !foo());) z(), k();
+        for (;bar() && (x(), y(), !foo());) z(), k();
    }
 }

@@ -82,7 +82,7 @@ drop_if_else_break_1: {
        for (;;) if (foo()) bar(); else break;
    }
    expect: {
-        for (; foo(); ) bar();
+        for (;foo();) bar();
    }
 }

@@ -97,7 +97,7 @@ drop_if_else_break_2: {
        }
    }
    expect: {
-        for (; bar() && foo();) baz();
+        for (;bar() && foo();) baz();
    }
 }

@@ -114,7 +114,7 @@ drop_if_else_break_3: {
        }
    }
    expect: {
-        for (; bar() && foo();) {
+        for (;bar() && foo();) {
            baz();
            stuff1();
            stuff2();
@@ -138,7 +138,7 @@ drop_if_else_break_4: {
        }
    }
    expect: {
-        for (; bar() && (x(), y(), foo());) baz(), z(), k();
+        for (;bar() && (x(), y(), foo());) baz(), z(), k();
    }
 }

@@ -523,13 +523,13 @@ issue_2740_1: {
        loops: true,
    }
    input: {
-        for (; ; ) break;
-        for (a(); ; ) break;
-        for (; b(); ) break;
-        for (c(); d(); ) break;
-        for (; ; e()) break;
-        for (f(); ; g()) break;
-        for (; h(); i()) break;
+        for (;;) break;
+        for (a();;) break;
+        for (;b();) break;
+        for (c(); d();) break;
+        for (;;e()) break;
+        for (f();; g()) break;
+        for (;h(); i()) break;
        for (j(); k(); l()) break;
    }
    expect: {
@@ -670,7 +670,7 @@ issue_3371: {
            function a() {
                console.log("PASS");
            }
-            for (; a(); );
+            for (;a(););
        })();
    }
    expect_stdout: "PASS"
--- a/test/compress/numbers.js
+++ b/test/compress/numbers.js
@@ -91,7 +91,7 @@ evaluate_1: {
    expect: {
        console.log(
            x + 1 + 2,
-            1 * x * 2,
+            2 * x,
            +x + 1 + 2,
            1 + x + 2 + 3,
            3 | x,
@@ -173,7 +173,7 @@ evaluate_2: {
        var x = "42", y = null;
        [
            x + 1 + 2,
-            1 * x * 2,
+            2 * x,
            +x + 1 + 2,
            1 + x + 2 + 3,
            3 | x,
@@ -669,6 +669,9 @@ issue_1710: {
 }

 unary_binary_parenthesis: {
+    options = {
+        evaluate: true,
+    }
    input: {
        var v = [ 0, 1, NaN, Infinity, null, undefined, true, false, "", "foo", /foo/ ];
        v.forEach(function(x) {
@@ -979,3 +982,272 @@ unsafe_math_swap_constant: {
    }
    expect_stdout: "6 6 7 6 6 8 9 10"
 }
+
+identity_1: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        0 + a;
+        a + 0;
+        0 - a;
+        a - 0;
+        1 * a;
+        a * 1;
+        1 / a;
+        a / 1;
+    }
+    expect: {
+        0 + a;
+        a + 0;
+        0 - a;
+        +a;
+        +a;
+        +a;
+        1 / a;
+        +a;
+    }
+}
+
+identity_2: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        0 + !a;
+        !a + 0;
+        0 - !a;
+        !a - 0;
+        1 * !a;
+        !a * 1;
+        1 / !a;
+        !a / 1;
+    }
+    expect: {
+        +!a;
+        +!a;
+        0 - !a;
+        +!a;
+        +!a;
+        +!a;
+        1 / !a;
+        +!a;
+    }
+}
+
+identity_3: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        0 + --a;
+        --a + 0;
+        0 - --a;
+        --a - 0;
+        1 * --a;
+        --a * 1;
+        1 / --a;
+        --a / 1;
+    }
+    expect: {
+        --a;
+        --a;
+        0 - --a;
+        --a;
+        --a;
+        --a;
+        1 / --a;
+        --a;
+    }
+}
+
+issue_3653: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        console.log(0 - (console && 0));
+        console.log(0 + (0 - (console && 0)));
+        console.log(0 - (0 - (console && 0)));
+        console.log(1 * (0 - (console && 0)));
+        console.log(1 / (0 - (console && 0)));
+        console.log((0 - (console && 0)) + 0);
+        console.log((0 - (console && 0)) - 0);
+        console.log((0 - (console && 0)) * 1);
+        console.log((0 - (console && 0)) / 1);
+    }
+    expect: {
+        console.log(0 - (console && 0));
+        console.log(0 - (console && 0));
+        console.log(0 - (0 - (console && 0)));
+        console.log(0 - (console && 0));
+        console.log(1 / (0 - (console && 0)));
+        console.log(0 - (console && 0));
+        console.log(0 - (console && 0));
+        console.log(0 - (console && 0));
+        console.log(0 - (console && 0));
+    }
+    expect_stdout: [
+        "0",
+        "0",
+        "0",
+        "0",
+        "Infinity",
+        "0",
+        "0",
+        "0",
+        "0",
+    ]
+}
+
+issue_3655: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        console.log(0 + 0 * -[].length);
+        console.log(0 + (0 + 0 * -[].length));
+        console.log(0 - (0 + 0 * -[].length));
+        console.log(1 * (0 + 0 * -[].length));
+        console.log(1 / (0 + 0 * -[].length));
+        console.log((0 + 0 * -[].length) + 0);
+        console.log((0 + 0 * -[].length) - 0);
+        console.log((0 + 0 * -[].length) * 1);
+        console.log((0 + 0 * -[].length) / 1);
+    }
+    expect: {
+        console.log(0 + 0 * -[].length);
+        console.log(0 + 0 * -[].length);
+        console.log(0 - (0 + 0 * -[].length));
+        console.log(0 + 0 * -[].length);
+        console.log(1 / (0 + 0 * -[].length));
+        console.log(0 + 0 * -[].length);
+        console.log(0 + 0 * -[].length);
+        console.log(0 + 0 * -[].length);
+        console.log(0 + 0 * -[].length);
+    }
+    expect_stdout: [
+        "0",
+        "0",
+        "0",
+        "0",
+        "Infinity",
+        "0",
+        "0",
+        "0",
+        "0",
+    ]
+}
+
+issue_3676_1: {
+    options = {
+        evaluate: true,
+        unsafe_math: true,
+    }
+    input: {
+        var a = [];
+        console.log(false - (a - (a[1] = 42)));
+    }
+    expect: {
+        var a = [];
+        console.log(false - (a - (a[1] = 42)));
+    }
+    expect_stdout: "NaN"
+}
+
+issue_3676_2: {
+    options = {
+        evaluate: true,
+        unsafe_math: true,
+    }
+    input: {
+        var a;
+        console.log(false - ((a = []) - (a[1] = 42)));
+    }
+    expect: {
+        var a;
+        console.log(false - ((a = []) - (a[1] = 42)));
+    }
+    expect_stdout: "NaN"
+}
+
+issue_3682_1: {
+    options = {
+        evaluate: true,
+        unsafe_math: true,
+    }
+    input: {
+        var a = -0;
+        console.log(1 / (a - 1 + 1));
+    }
+    expect: {
+        var a = -0;
+        console.log(1 / (a - 1 + 1));
+    }
+    expect_stdout: "Infinity"
+}
+
+issue_3682_2: {
+    options = {
+        evaluate: true,
+        unsafe_math: true,
+    }
+    input: {
+        var a = -0, b = 1;
+        console.log(1 / (a - (b - b)));
+    }
+    expect: {
+        var a = -0, b = 1;
+        console.log(1 / (a - (b - b)));
+    }
+    expect_stdout: "-Infinity"
+}
+
+issue_3682_3: {
+    options = {
+        evaluate: true,
+        unsafe_math: true,
+    }
+    input: {
+        var a = -0, b = 1, c = -1;
+        console.log(1 / (a - (+b + +c)));
+    }
+    expect: {
+        var a = -0, b = 1, c = -1;
+        console.log(1 / (a - (+b + +c)));
+    }
+    expect_stdout: "-Infinity"
+}
+
+issue_3684: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        console.log(1 / (-1 * (0 & console) + 0));
+        console.log(1 / ((0 & console) / -1 + 0));
+    }
+    expect: {
+        console.log(1 / (-1 * (0 & console) + 0));
+        console.log(1 / ((0 & console) / -1 + 0));
+    }
+    expect_stdout: [
+        "Infinity",
+        "Infinity",
+    ]
+}
+
+issue_3695: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        var a = [];
+        console.log(+(a * (a[0] = false)));
+    }
+    expect: {
+        var a = [];
+        console.log(+(a * (a[0] = false)));
+    }
+    expect_stdout: "NaN"
+}
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -6847,3 +6847,34 @@ issue_3631_2: {
    }
    expect_stdout: "undefined"
 }
+
+issue_3666: {
+    options = {
+        collapse_vars: true,
+        passes: 2,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            var a = "FAIL";
+        } finally {
+            for (;!a;)
+                var c = a++;
+            var a = "PASS", b = c = "PASS";
+        }
+        console.log(a, b);
+    }
+    expect: {
+        try {
+            var a = "FAIL";
+        } finally {
+            for (;!a;)
+                a++;
+            var b = a = "PASS";
+        }
+        console.log(a, b);
+    }
+    expect_stdout: "PASS PASS"
+}
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -910,15 +910,23 @@ call: {
            console.log(this === b ? "bar" : "baz");
        };
        (a, b)();
+        (a, b).c();
        (a, b.c)();
+        (a, b)["c"]();
+        (a, b["c"])();
        (a, function() {
            console.log(this === a);
        })();
        new (a, b)();
+        new (a, b).c();
        new (a, b.c)();
+        new (a, b)["c"]();
+        new (a, b["c"])();
        new (a, function() {
            console.log(this === a);
        })();
+        console.log(typeof (a, b).c);
+        console.log(typeof (a, b)["c"]);
    }
    expect: {
        var a = function() {
@@ -931,23 +939,39 @@ call: {
            console.log(this === b ? "bar" : "baz");
        },
        b(),
+        b.c(),
        (a, b.c)(),
+        b["c"](),
+        (a, b["c"])(),
        function() {
            console.log(this === a);
        }(),
        new b(),
        new b.c(),
+        new b.c(),
+        new b["c"](),
+        new b["c"](),
        new function() {
            console.log(this === a);
-        }();
+        }(),
+        console.log((a, typeof b.c)),
+        console.log((a, typeof b["c"]));
    }
    expect_stdout: [
        "foo",
+        "bar",
+        "baz",
+        "bar",
        "baz",
        "true",
        "foo",
        "baz",
+        "baz",
+        "baz",
+        "baz",
        "false",
+        "function",
+        "function",
    ]
 }

--- a/test/compress/side_effects.js
+++ b/test/compress/side_effects.js
@@ -0,0 +1,277 @@
+accessor: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        ({
+            get a() {},
+            set a(v){
+                this.b = 2;
+            },
+            b: 1
+        });
+    }
+    expect: {}
+}
+
+issue_2233_1: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        Array.isArray;
+        Boolean;
+        console.log;
+        Date;
+        decodeURI;
+        decodeURIComponent;
+        encodeURI;
+        encodeURIComponent;
+        Error.name;
+        escape;
+        eval;
+        EvalError;
+        Function.length;
+        isFinite;
+        isNaN;
+        JSON;
+        Math.random;
+        Number.isNaN;
+        parseFloat;
+        parseInt;
+        RegExp;
+        Object.defineProperty;
+        String.fromCharCode;
+        RangeError;
+        ReferenceError;
+        SyntaxError;
+        TypeError;
+        unescape;
+        URIError;
+    }
+    expect: {}
+    expect_stdout: true
+}
+
+global_timeout_and_interval_symbols: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        // These global symbols do not exist in the test sandbox
+        // and must be tested separately.
+        clearInterval;
+        clearTimeout;
+        setInterval;
+        setTimeout;
+    }
+    expect: {}
+}
+
+issue_2233_2: {
+    options = {
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var RegExp;
+        Array.isArray;
+        RegExp;
+        UndeclaredGlobal;
+        function foo() {
+            var Number;
+            AnotherUndeclaredGlobal;
+            Math.sin;
+            Number.isNaN;
+        }
+    }
+    expect: {
+        var RegExp;
+        UndeclaredGlobal;
+        function foo() {
+            var Number;
+            AnotherUndeclaredGlobal;
+            Number.isNaN;
+        }
+    }
+}
+
+issue_2233_3: {
+    options = {
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var RegExp;
+        Array.isArray;
+        RegExp;
+        UndeclaredGlobal;
+        function foo() {
+            var Number;
+            AnotherUndeclaredGlobal;
+            Math.sin;
+            Number.isNaN;
+        }
+    }
+    expect: {
+        UndeclaredGlobal;
+    }
+}
+
+global_fns: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        Boolean(1, 2);
+        decodeURI(1, 2);
+        decodeURIComponent(1, 2);
+        Date(1, 2);
+        encodeURI(1, 2);
+        encodeURIComponent(1, 2);
+        Error(1, 2);
+        escape(1, 2);
+        EvalError(1, 2);
+        isFinite(1, 2);
+        isNaN(1, 2);
+        Number(1, 2);
+        Object(1, 2);
+        parseFloat(1, 2);
+        parseInt(1, 2);
+        RangeError(1, 2);
+        ReferenceError(1, 2);
+        String(1, 2);
+        SyntaxError(1, 2);
+        TypeError(1, 2);
+        unescape(1, 2);
+        URIError(1, 2);
+        try {
+            Function(1, 2);
+        } catch (e) {
+            console.log(e.name);
+        }
+        try {
+            RegExp(1, 2);
+        } catch (e) {
+            console.log(e.name);
+        }
+        try {
+            Array(NaN);
+        } catch (e) {
+            console.log(e.name);
+        }
+    }
+    expect: {
+        try {
+            Function(1, 2);
+        } catch (e) {
+            console.log(e.name);
+        }
+        try {
+            RegExp(1, 2);
+        } catch (e) {
+            console.log(e.name);
+        }
+        try {
+            Array(NaN);
+        } catch (e) {
+            console.log(e.name);
+        }
+    }
+    expect_stdout: [
+        "SyntaxError",
+        "SyntaxError",
+        "RangeError",
+    ]
+}
+
+unsafe_builtin_1: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        (!w).constructor(x);
+        Math.abs(y);
+        [ 1, 2, z ].valueOf();
+    }
+    expect: {
+        w, x;
+        y;
+        z;
+    }
+}
+
+unsafe_builtin_2: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        var o = {};
+        constructor.call(o, 42);
+        __defineGetter__.call(o, "foo", function() {
+            return o.p;
+        });
+        __defineSetter__.call(o, void 0, function(a) {
+            o.p = a;
+        });
+        console.log(typeof o, o.undefined = "PASS", o.foo);
+    }
+    expect: {
+        var o = {};
+        constructor.call(o, 42);
+        __defineGetter__.call(o, "foo", function() {
+            return o.p;
+        });
+        __defineSetter__.call(o, void 0, function(a) {
+            o.p = a;
+        });
+        console.log(typeof o, o.undefined = "PASS", o.foo);
+    }
+    expect_stdout: "object PASS PASS"
+}
+
+unsafe_string_replace: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        "foo".replace("f", function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+drop_value: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        (1, [2, foo()], 3, {a:1, b:bar()});
+    }
+    expect: {
+        foo(), bar();
+    }
+}
--- a/test/compress/transform.js
+++ b/test/compress/transform.js
@@ -103,6 +103,7 @@ if_return: {
        booleans: true,
        conditionals: true,
        if_return: true,
+        passes: 2,
        sequences: true,
        side_effects: true,
    }
--- a/test/compress/unicode.js
+++ b/test/compress/unicode.js
@@ -16,6 +16,81 @@ unicode_parse_variables: {
    }
 }

+unicode_escaped_identifier: {
+    input: {
+        var \u0061 = "\ud800\udc00";
+        console.log(a);
+    }
+    expect_exact: 'var a="\ud800\udc00";console.log(a);'
+    expect_stdout: "\ud800\udc00"
+}
+
+unicode_identifier_ascii_only: {
+    beautify = {
+        ascii_only: true,
+    }
+    input: {
+        var \u0061 = "testing \udbc4\udd11";
+        var bar = "h\u0065llo";
+        console.log(a, \u0062\u0061r);
+    }
+    expect_exact: 'var a="testing \\udbc4\\udd11";var bar="hello";console.log(a,bar);'
+    expect_stdout: "testing \udbc4\udd11 hello"
+}
+
+unicode_string_literals: {
+    beautify = {
+        ascii_only: true,
+    }
+    input: {
+        var a = "6 length unicode character: \udbc4\udd11";
+        console.log(\u0061);
+    }
+    expect_exact: 'var a="6 length unicode character: \\udbc4\\udd11";console.log(a);'
+    expect_stdout: "6 length unicode character: \udbc4\udd11"
+}
+
+check_escape_style: {
+    beautify = {
+        ascii_only: true,
+    }
+    input: {
+        var a = "\x01";
+        var \ua0081 = "\x10"; // \u0081 only in ID_Continue
+        var \u0100 = "\u0100";
+        var \u1000 = "\u1000";
+        var \u1000 = "\ud800\udc00";
+        var \u3f80 = "\udbc0\udc00";
+        console.log(\u0061, \ua0081, \u0100, \u1000, \u3f80);
+    }
+    expect_exact: 'var a="\\x01";var \\ua0081="\\x10";var \\u0100="\\u0100";var \\u1000="\\u1000";var \\u1000="\\ud800\\udc00";var \\u3f80="\\udbc0\\udc00";console.log(a,\\ua0081,\\u0100,\\u1000,\\u3f80);'
+    expect_stdout: "\u0001 \u0010 \u0100 \ud800\udc00 \udbc0\udc00"
+}
+
+escape_non_escaped_identifier: {
+    beautify = {
+        ascii_only: true,
+    }
+    input: {
+        var µþ = "µþ";
+        console.log(\u00b5þ);
+    }
+    expect_exact: 'var \\u00b5\\u00fe="\\xb5\\xfe";console.log(\\u00b5\\u00fe);'
+    expect_stdout: "µþ"
+}
+
+non_escape_2_non_escape: {
+    beautify = {
+        ascii_only: false,
+    }
+    input: {
+        var µþ = "µþ";
+        console.log(\u00b5þ);
+    }
+    expect_exact: 'var µþ="µþ";console.log(µþ);'
+    expect_stdout: "µþ"
+}
+
 issue_2242_1: {
    beautify = {
        ascii_only: false,
@@ -24,6 +99,7 @@ issue_2242_1: {
        console.log("\ud83d", "\ude00", "\ud83d\ude00", "\ud83d@\ude00");
    }
    expect_exact: 'console.log("\\ud83d","\\ude00","\ud83d\ude00","\\ud83d@\\ude00");'
+    expect_stdout: "\ud83d \ude00 \ud83d\ude00 \ud83d@\ude00"
 }

 issue_2242_2: {
@@ -34,6 +110,7 @@ issue_2242_2: {
        console.log("\ud83d", "\ude00", "\ud83d\ude00", "\ud83d@\ude00");
    }
    expect_exact: 'console.log("\\ud83d","\\ude00","\\ud83d\\ude00","\\ud83d@\\ude00");'
+    expect_stdout: "\ud83d \ude00 \ud83d\ude00 \ud83d@\ude00"
 }

 issue_2242_3: {
@@ -44,6 +121,7 @@ issue_2242_3: {
        console.log("\ud83d" + "\ude00", "\ud83d" + "@" + "\ude00");
    }
    expect_exact: 'console.log("\\ud83d"+"\\ude00","\\ud83d"+"@"+"\\ude00");'
+    expect_stdout: "\ud83d\ude00 \ud83d@\ude00"
 }

 issue_2242_4: {
@@ -54,6 +132,7 @@ issue_2242_4: {
        console.log("\ud83d" + "\ude00", "\ud83d" + "@" + "\ude00");
    }
    expect_exact: 'console.log("\ud83d\ude00","\\ud83d@\\ude00");'
+    expect_stdout: "\ud83d\ude00 \ud83d@\ude00"
 }

 issue_2569: {
--- a/test/input/issue-1482/beautify.js
+++ b/test/input/issue-1482/beautify.js
@@ -0,0 +1,17 @@
+if (x) foo();
+
+if (x) foo(); else baz();
+
+if (x) foo(); else if (y) bar(); else baz();
+
+if (x) if (y) foo(); else bar(); else baz();
+
+if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+
+function f() {
+    if (x) foo();
+    if (x) foo(); else baz();
+    if (x) foo(); else if (y) bar(); else baz();
+    if (x) if (y) foo(); else bar(); else baz();
+    if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+}
--- a/test/input/issue-1482/default.js
+++ b/test/input/issue-1482/default.js
@@ -1,17 +1 @@
-if (x) foo();
-
-if (x) foo(); else baz();
-
-if (x) foo(); else if (y) bar(); else baz();
-
-if (x) if (y) foo(); else bar(); else baz();
-
-if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
-
-function f() {
-    if (x) foo();
-    if (x) foo(); else baz();
-    if (x) foo(); else if (y) bar(); else baz();
-    if (x) if (y) foo(); else bar(); else baz();
-    if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
-}
+if(x)foo();if(x)foo();else baz();if(x)foo();else if(y)bar();else baz();if(x)if(y)foo();else bar();else baz();if(x)foo();else if(y)bar();else if(z)baz();else moo();function f(){if(x)foo();if(x)foo();else baz();if(x)foo();else if(y)bar();else baz();if(x)if(y)foo();else bar();else baz();if(x)foo();else if(y)bar();else if(z)baz();else moo()}
--- a/test/mocha.js
+++ b/test/mocha.js
@@ -1,7 +1,7 @@
 var fs = require("fs");

 var config = {
-    limit: 5000,
+    limit: 10000,
    timeout: function(limit) {
        this.limit = limit;
    }
@@ -55,11 +55,11 @@ process.nextTick(function run() {
        var elapsed = Date.now();
        var timer;
        var done = function() {
-            reset();
            elapsed = Date.now() - elapsed;
            if (elapsed > task.limit) {
                throw new Error("Timed out: " + elapsed + "ms > " + task.limit + "ms");
            }
+            reset();
            log_titles(console.log, task.titles, green('\u221A '));
            process.nextTick(run);
        };
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -176,7 +176,7 @@ describe("bin/uglifyjs", function() {
        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
        exec(command, function(err, stdout) {
            if (err) throw err;
-            assert.strictEqual(stdout, read("test/input/issue-1482/default.js"));
+            assert.strictEqual(stdout, read("test/input/issue-1482/beautify.js"));
            done();
        });
    });
@@ -188,6 +188,22 @@ describe("bin/uglifyjs", function() {
            done();
        });
    });
+    it("Should work with `--output-opts`", function(done) {
+        var command = uglifyjscmd + ' test/input/issue-1482/input.js -O';
+        exec(command, function(err, stdout) {
+            if (err) throw err;
+            assert.strictEqual(stdout, read("test/input/issue-1482/default.js"));
+            done();
+        });
+    });
+    it("Should fail when both --beautify & --output-opts are specified", function(done) {
+        var command = uglifyjscmd + " test/input/issue-520/input.js -bO";
+        exec(command, function(err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stderr, "ERROR: --beautify cannot be used with --output-opts\n");
+            done();
+        });
+    });
    it("Should process inline source map", function(done) {
        var command = [
            uglifyjscmd,
--- a/test/ufuzz/index.js
+++ b/test/ufuzz/index.js
@@ -1090,9 +1090,10 @@ function log(options) {
 }

 function fuzzy_match(original, uglified) {
-    original = original.split(" ", 5);
-    uglified = uglified.split(" ", 5);
-    for (var i = 0; i < 5; i++) {
+    uglified = uglified.split(" ");
+    var i = uglified.length;
+    original = original.split(" ", i);
+    while (--i >= 0) {
        if (original[i] === uglified[i]) continue;
        var a = +original[i];
        var b = +uglified[i];
@@ -1128,7 +1129,7 @@ for (var round = 1; round <= num_iterations; round++) {
                ok = fuzzy_match(original_result, uglify_result);
                if (!ok) {
                    var fuzzy_result = sandbox.run_code(original_code.replace(/( - 0\.1){3}/g, " - 0.3"));
-                    ok = sandbox.same_stdout(fuzzy_result, uglify_result, o.toplevel);
+                    ok = sandbox.same_stdout(fuzzy_result, uglify_result);
                }
            }
        } else {
Author	SHA1	Message	Date
Alex Lam S.L	36b2d35bf3	v3.7.7	2020-02-02 00:24:50 +00:00
Alex Lam S.L	79c60032a5	fix corner case in `collapse_vars` (#3701 ) fixes #3700	2020-01-30 09:04:44 +08:00
Alex Lam S.L	a3754068dd	fix corner case in `collapse_vars` (#3699 ) fixes #3698	2020-01-30 00:08:53 +08:00
Alex Lam S.L	2ba5f391e0	enhance `collapse_vars` (#3697 )	2020-01-29 08:52:20 +08:00
Alex Lam S.L	87119e44a0	fix corner case in sign propagation (#3696 ) - migrate de-facto functionality to `evaluate` fixes #3695	2020-01-28 22:44:18 +08:00
Alex Lam S.L	b499e03f82	enhance `conditionals` (#3694 )	2020-01-28 12:33:21 +08:00
Alex Lam S.L	a478f275e4	enhance `sequences` (#3693 )	2020-01-28 09:58:01 +08:00
Alex Lam S.L	e9e76dcf04	fix corner case in string concatenations (#3692 ) - migrate de-facto compression to `conditionals` & `strings` fixes #3689	2020-01-28 07:33:11 +08:00
Alex Lam S.L	0dcedad2d5	fix corner case in `booleans` (#3691 ) fixes #3690	2020-01-28 02:04:44 +08:00
Alex Lam S.L	36a430cd1e	v3.7.6	2020-01-19 11:02:58 +00:00
Alex Lam S.L	41a6eb892a	fix corner case in `evaluate` (#3685 ) fixes #3684	2020-01-16 01:51:37 +08:00
Alex Lam S.L	91d87ae663	fix corner case in `unsafe_math` (#3683 ) fixes #3682	2020-01-15 04:05:58 +08:00
Alex Lam S.L	5beb7e4797	v3.7.5	2020-01-12 11:12:11 +08:00
Alex Lam S.L	46caaa82ba	enhance `collapse_vars` (#3680 ) closes #3679	2020-01-10 04:28:43 +08:00
Alex Lam S.L	5d258259a4	introduce `--output-opts` CLI option (#3678 ) closes #3675	2020-01-08 20:44:03 +08:00
Alex Lam S.L	14c35739dd	fix corner case in `unsafe_math` (#3677 ) fixes #3676	2020-01-08 10:28:10 +08:00
Alex Lam S.L	f5ceff6e4b	fix corner case in `unused` (#3674 ) fixes #3673	2020-01-07 20:06:25 +08:00
Alex Lam S.L	4d6771b9b1	fix corner case in `collapse_vars` (#3672 ) fixes #3671	2020-01-07 19:34:16 +08:00
Alex Lam S.L	d17191111a	v3.7.4	2020-01-07 07:59:54 +08:00
Alex Lam S.L	0ff607cb80	improve `ufuzz` false positive detection (#3670 )	2020-01-06 11:26:15 +08:00
Alex Lam S.L	1988495d71	fix corner case in `conditionals` (#3669 ) fixes #3668	2020-01-04 09:24:28 +08:00
Alex Lam S.L	fdc10086da	fix corner case in `reduce_vars` (#3667 ) fixes #3666	2020-01-03 19:28:47 +08:00
Alex Lam S.L	746f5f6c62	fix corner case in `unused` (#3665 ) fixes #3664	2020-01-01 20:24:30 +08:00
Alex Lam S.L	d83d3d741a	enhance `unused` (#3662 )	2019-12-31 23:39:24 +08:00
Alex Lam S.L	99ac73a635	enhance `booleans` (#3661 )	2019-12-31 13:10:05 +08:00
Alex Lam S.L	a2e4c2fd97	enhance `evaluate` (#3660 )	2019-12-31 11:51:21 +08:00
Alex Lam S.L	94785e8e14	fix corner case in `booleans` (#3659 ) fixes #3658	2019-12-31 09:57:35 +08:00
Alex Lam S.L	4dbdac9c31	enhance `booleans` (#3657 )	2019-12-30 22:41:11 +08:00
Alex Lam S.L	78c8efd851	fix corner case in `evaluate` (#3656 ) fixes #3655	2019-12-29 21:16:53 +08:00
Alex Lam S.L	af310ba2d0	fix corner case in `evaluate` (#3654 ) fixes #3653	2019-12-29 02:50:57 +00:00
Alex Lam S.L	2f3930d1b9	fix corner case in `collapse_vars` (#3652 ) fixes #3651	2019-12-29 00:57:59 +00:00
Alex Lam S.L	d1a78920d9	workaround firefox asm.js quirks (#3650 ) fixes #3636	2019-12-28 23:14:53 +00:00
Alex Lam S.L	d9cd3d33c8	enhance `evaluate` (#3649 )	2019-12-28 20:26:15 +00:00
Alex Lam S.L	22b47cdd63	improve unicode handling (#3648 )	2019-12-28 18:06:51 +00:00
Alex Lam S.L	4cf612dc9f	increase mocha default timeout (#3647 ) closes #3640	2019-12-28 02:32:22 +00:00
Alex Lam S.L	a19d31dd33	fix corner case in `unsafe` (#3646 )	2019-12-27 14:24:54 +00:00