Merge branch 'master' into harmony-v3.0.0

2017-05-07 07:18:15 +08:00
parent 73d6438773 2d99d06601
commit b4c18f6b83
83 changed files with 9768 additions and 8722 deletions
--- a/test/compress/angular-inject.js
+++ b/test/compress/angular-inject.js
@@ -1,67 +0,0 @@
-ng_inject_defun: {
-    options = {
-        angular: true
-    };
-    input: {
-        /*@ngInject*/
-        function Controller(dependency) {
-            return dependency;
-        }
-    }
-    expect: {
-        function Controller(dependency) {
-            return dependency;
-        }
-        Controller.$inject=['dependency']
-    }
-}
-
-ng_inject_assignment: {
-    options = {
-        angular: true
-    };
-    input: {
-        /*@ngInject*/
-        var Controller = function(dependency) {
-            return dependency;
-        }
-    }
-    expect: {
-        var Controller = function(dependency) {
-            return dependency;
-        }
-        Controller.$inject=['dependency']
-    }
-}
-
-ng_inject_inline: {
-    options = {
-        angular: true
-    };
-    input: {
-        angular.module('a').
-            factory('b',
-                /*@ngInject*/
-                function(dependency) {
-                    return dependency;
-                }).
-            directive('c',
-                /*@ngInject*/
-                function(anotherDependency) {
-                    return anotherDependency;
-                })
-    }
-    expect: {
-        angular.module('a').
-            factory('b',[
-                'dependency',
-                function(dependency) {
-                    return dependency;
-                }]).
-            directive('c',[
-                'anotherDependency',
-                function(anotherDependency) {
-                    return anotherDependency;
-                }])
-    }
-}
--- a/test/compress/ascii.js
+++ b/test/compress/ascii.js
@@ -2,7 +2,7 @@ ascii_only_true: {
    options = {}
    beautify = {
        ascii_only : true,
-        screw_ie8  : true,
+        ie8        : false,
        beautify   : false,
    }
    input: {
@@ -20,7 +20,7 @@ ascii_only_false: {
    options = {}
    beautify = {
        ascii_only : false,
-        screw_ie8  : true,
+        ie8        : false,
        beautify   : false,
    }
    input: {
@@ -33,4 +33,3 @@ ascii_only_false: {
    }
    expect_exact: 'function f(){return"\\x000\\x001\\x007\\08\\0"+"\\0\x01\x02\x03\x04\x05\x06\x07\\b\\t\\n\\v\\f\\r\x0e\x0f"+"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"+\' !"# ... }~\x7f\x80\x81 ... \xfe\xff\u0fff\uffff\'}'
 }
-
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -2,7 +2,7 @@ collapse_vars_side_effects_1: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -68,11 +68,10 @@ collapse_vars_side_effects_1: {
            log(x, s.charAt(i++), y, 7);
        }
        function f4() {
-            var log = console.log.bind(console),
-                i = 10,
+            var i = 10,
                x = i += 2,
                y = i += 3;
-            log(x, i += 4, y, i);
+            console.log.bind(console)(x, i += 4, y, i);
        }
        f1(), f2(), f3(), f4();
    }
@@ -151,7 +150,7 @@ collapse_vars_issue_721: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        define(["require", "exports", 'handlebars'], function (require, exports, hb) {
@@ -217,7 +216,7 @@ collapse_vars_properties: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1(obj) {
@@ -244,7 +243,7 @@ collapse_vars_if: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -294,7 +293,7 @@ collapse_vars_while: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:false, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1(y) {
@@ -393,9 +392,9 @@ collapse_vars_do_while: {
        }
        function f3(y) {
            function fn(n) { console.log(n); }
-            var a = 2;
+            var a = 2, x = 7;
            do {
-                fn(a = 7);
+                fn(a = x);
                break;
            } while (y);
        }
@@ -468,8 +467,9 @@ collapse_vars_do_while_drop_assign: {
        }
        function f3(y) {
            function fn(n) { console.log(n); }
+            var x = 7;
            do {
-                fn(7);
+                fn(x);
                break;
            } while (y);
        }
@@ -670,8 +670,8 @@ collapse_vars_lvalues: {
        function f4(x) { var a = (x -= 3); return x + a; }
        function f5(x) { var w = e1(), v = e2(), c = v = --x; return (w = x) - c; }
        function f6(x) { var w = e1(), v = e2(); return (v = --x) - (w = x); }
-        function f7(x) { var w = e1(), v = e2(), c = v - x; return (w = x) - c; }
-        function f8(x) { var w = e1(), v = e2(); return (w = x) - (v - x); }
+        function f7(x) { var w = e1(); return (w = x) - (e2() - x); }
+        function f8(x) { var w = e1(); return (w = x) - (e2() - x); }
        function f9(x) { var w = e1(); return e2() - x - (w = x); }
    }
 }
@@ -700,10 +700,10 @@ collapse_vars_lvalues_drop_assign: {
        function f2(x) { var z = x, a = ++z; return z += a; }
        function f3(x) { var a = (x -= 3); return x + a; }
        function f4(x) { var a = (x -= 3); return x + a; }
-        function f5(x) { var v = (e1(), e2()), c = v = --x; return x - c; }
+        function f5(x) { e1(); var v = e2(), c = v = --x; return x - c; }
        function f6(x) { e1(), e2(); return --x - x; }
-        function f7(x) { var v = (e1(), e2()), c = v - x; return x - c; }
-        function f8(x) { var v = (e1(), e2()); return x - (v - x); }
+        function f7(x) { e1(); return x - (e2() - x); }
+        function f8(x) { e1(); return x - (e2() - x); }
        function f9(x) { e1(); return e2() - x - x; }
    }
 }
@@ -712,7 +712,7 @@ collapse_vars_misc1: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f0(o, a, h) {
@@ -789,7 +789,7 @@ collapse_vars_repeated: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -812,19 +812,17 @@ collapse_vars_repeated: {
    }
    expect: {
        function f1() {
-            return -3
+            return -3;
        }
        function f2(x) {
-            return x
+            return x;
        }
        (function(x){
-             var a = "GOOD" + x, e = "BAD", e = a;
-             console.log(e + "!");
-        })("!"),
+             console.log("GOOD!!");
+        })(),
        (function(x){
-            var a = "GOOD" + x, e = "BAD" + x, e = a;
-            console.log(e + "!");
-        })("!");
+             console.log("GOOD!!");
+        })();
    }
    expect_stdout: true
 }
@@ -833,7 +831,7 @@ collapse_vars_closures: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function constant_vars_can_be_replaced_in_any_scope() {
@@ -923,7 +921,7 @@ collapse_vars_try: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1() {
@@ -1048,10 +1046,9 @@ collapse_vars_object: {
    }
    expect: {
        function f0(x, y) {
-            var z = x + y;
            return {
                get b() { return 7; },
-                r: z
+                r: x + y
            };
        }
        function f1(x, y) {
@@ -1121,7 +1118,7 @@ collapse_vars_constants: {
    options = {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true, reduce_vars:true
    }
    input: {
        function f1(x) {
@@ -1159,7 +1156,7 @@ collapse_vars_arguments: {
        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true,
-        toplevel:true
+        toplevel:true, reduce_vars:true
    }
    input: {
        var outer = function() {
@@ -1286,6 +1283,7 @@ collapse_vars_regexp: {
        join_vars:     true,
        cascade:       true,
        side_effects:  true,
+        reduce_vars:   true,
    }
    input: {
        function f1() {
@@ -1319,8 +1317,8 @@ collapse_vars_regexp: {
            };
        }
        (function(){
-            var result, s = "acdabcdeabbb", rx = /ab*/g;
-            while (result = rx.exec(s))
+            var result, rx = /ab*/g;
+            while (result = rx.exec("acdabcdeabbb"))
                console.log(result[0]);
        })();
    }
@@ -1367,8 +1365,8 @@ issue_1537_destructuring_1: {
        [x] = [y];
    }
    expect: {
-        var x = 1;
-        [x] = [2];
+        var x = 1, y = 2;
+        [x] = [y];
    }
 }

@@ -1443,7 +1441,10 @@ issue_1537_destructuring_for_of: {
 issue_1562: {
    options = {
        collapse_vars: true,
+        evaluate: true,
+        reduce_vars: true,
        toplevel: true,
+        unused: true,
    }
    input: {
        var v = 1, B = 2;
@@ -1462,14 +1463,11 @@ issue_1562: {
        var v = 1;
        for (v in objs) f(2);

-        var x = 3;
-        while(x + 2) bar(10);
+        while(5) bar(10);

-        var y = 4;
-        do bar(20); while(y + 2);
+        do bar(20); while(6);

-        var z = 5;
-        for (; f(z + 2) ;) bar(30);
+        for (; f(7) ;) bar(30);
    }
 }

@@ -1691,3 +1689,598 @@ var_side_effects_3: {
    }
    expect_stdout: true
 }
+
+reduce_vars_assign: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+    }
+    input: {
+        !function() {
+            var a = 1;
+            a = [].length,
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a = 1;
+            a = [].length,
+            console.log(a);
+        }();
+    }
+    expect_stdout: "0"
+}
+
+iife_1: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var log = function(x) {
+            console.log(x);
+        }, foo = bar();
+        log(foo);
+    }
+    expect: {
+        (function(x) {
+            console.log(x);
+        })(bar());
+    }
+}
+
+iife_2: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: false,
+        toplevel: true,
+        unused: false,
+    }
+    input: {
+        var foo = bar();
+        !function(x) {
+            console.log(x);
+        }(foo);
+    }
+    expect: {
+        !function(x) {
+            console.log(x);
+        }(bar());
+    }
+}
+
+var_defs: {
+    options = {
+        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
+    }
+    input: {
+        var f1 = function(x, y) {
+            var a, b, r = x + y, q = r * r, z = q - r, a = z, b = 7;
+            console.log(a + b);
+        };
+        f1("1", 0);
+    }
+    expect: {
+        var f1 = function(x, y) {
+            var r = x + y, a = r * r - r, b = 7;
+            console.log(a + b);
+        };
+        f1("1", 0);
+    }
+    expect_stdout: "97"
+}
+
+assignment: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            var a;
+            a = x;
+            return a;
+        }
+    }
+    expect: {
+        function f() {
+            return x;
+        }
+    }
+}
+
+for_init: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f(x, y) {
+            var a = x;
+            var b = y;
+            for (a; b;);
+        }
+    }
+    expect: {
+        function f(x, y) {
+            var b = y;
+            for (x; b;);
+        }
+    }
+}
+
+switch_case: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f(x, y, z) {
+            var a = x();
+            var b = y();
+            var c = z;
+            switch (a) {
+              default: d();
+              case b: e();
+              case c: f();
+            }
+        }
+    }
+    expect: {
+        function f(x, y, z) {
+            var c = z;
+            switch (x()) {
+              default: d();
+              case y(): e();
+              case c: f();
+            }
+        }
+    }
+}
+
+issue_27: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(jQuery) {
+            var $;
+            $ = jQuery;
+            $("body").addClass("foo");
+        })(jQuery);
+    }
+    expect: {
+        (function(jQuery) {
+            jQuery("body").addClass("foo");
+        })(jQuery);
+    }
+}
+
+modified: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f1(b) {
+            var a = b;
+            return b + a;
+        }
+        function f2(b) {
+            var a = b;
+            return b++ + a;
+        }
+        function f3(b) {
+            var a = b++;
+            return b + a;
+        }
+        function f4(b) {
+            var a = b++;
+            return b++ + a;
+        }
+        function f5(b) {
+            var a = function() {
+                return b;
+            }();
+            return b++ + a;
+        }
+        console.log(f1(1), f2(1), f3(1), f4(1), f5(1));
+    }
+    expect: {
+        function f1(b) {
+            return b + b;
+        }
+        function f2(b) {
+            var a = b;
+            return b++ + a;
+        }
+        function f3(b) {
+            var a = b++;
+            return b + a;
+        }
+        function f4(b) {
+            var a = b++;
+            return b++ + a;
+        }
+        function f5(b) {
+            var a = function() {
+                return b;
+            }();
+            return b++ + a;
+        }
+        console.log(f1(1), f2(1), f3(1), f4(1), f5(1));
+    }
+    expect_stdout: "2 2 3 3 2"
+}
+
+issue_1858: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(x) {
+            var a = {}, b = a.b = x;
+            return a.b + b;
+        }(1));
+    }
+    expect: {
+        console.log(function(x) {
+            var a = {}, b = a.b = x;
+            return a.b + b;
+        }(1));
+    }
+    expect_stdout: "2"
+}
+
+anonymous_function: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        console.log(function f(a) {
+            f ^= 0;
+            return f * a;
+        }(1));
+    }
+    expect: {
+        console.log(function f(a) {
+            f ^= 0;
+            return f * a;
+        }(1));
+    }
+    expect_stdout: true
+}
+
+side_effects_property: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = [];
+        var b = 0;
+        a[b++] = function() { return 42;};
+        var c = a[b++]();
+        console.log(c);
+    }
+    expect: {
+        var a = [];
+        var b = 0;
+        a[b++] = function() { return 42;};
+        var c = a[b++]();
+        console.log(c);
+    }
+    expect_stdout: true
+}
+
+undeclared: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f(x, y) {
+            var a;
+            a = x;
+            b = y;
+            return b + a;
+        }
+    }
+    expect: {
+        function f(x, y) {
+            var a;
+            a = x;
+            b = y;
+            return b + a;
+        }
+    }
+}
+
+ref_scope: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var a = 1, b = 2, c = 3;
+            var a = c++, b = b /= a;
+            return function() {
+                return a;
+            }() + b;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var a = 1, b = 2, c = 3;
+            b = b /= a = c++;
+            return function() {
+                return a;
+            }() + b;
+        }());
+    }
+    expect_stdout: true
+}
+
+chained_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = 2;
+        var a = 3 / a;
+        console.log(a);
+    }
+    expect: {
+        var a = 3 / (a = 2);
+        console.log(a);
+    }
+    expect_stdout: true
+}
+
+chained_2: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a;
+        var a = 2;
+        a = 3 / a;
+        console.log(a);
+    }
+    expect: {
+        var a;
+        a = 3 / (a = 2);
+        console.log(a);
+    }
+    expect_stdout: true
+}
+
+chained_3: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            var c = a, c = b;
+            b++;
+            return c;
+        }(1, 2));
+    }
+    expect: {
+        console.log(function(a, b) {
+            var c = a, c = b;
+            b++;
+            return c;
+        }(1, 2));
+    }
+    expect_stdout: "2"
+}
+
+boolean_binary_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = 1;
+        a++;
+        (function() {} || a || 3).toString();
+        console.log(a);
+    }
+    expect: {
+        var a = 1;
+        a++;
+        (function() {} || a || 3).toString();
+        console.log(a);
+    }
+    expect_stdout: true
+}
+
+boolean_binary_2: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var c = 0;
+        c += 1;
+        (function() {
+            c = 1 + c;
+        } || 9).toString();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        c += 1;
+        (function() {
+            c = 1 + c;
+        } || 9).toString();
+        console.log(c);
+    }
+    expect_stdout: true
+}
+
+inner_lvalues: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        var a, b = 10;
+        var a = (--b || a || 3).toString(), c = --b + -a;
+        console.log(null, a, b);
+    }
+    expect: {
+        var a, b = 10;
+        var a = (--b || a || 3).toString(), c = --b + -a;
+        console.log(null, a, b);
+    }
+    expect_stdout: true
+}
+
+double_def: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a = x, a = a && y;
+        a();
+    }
+    expect: {
+        var a = x;
+        (a = a && y)();
+    }
+}
+
+toplevel_single_reference: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a;
+        for (var b in x) {
+            var a = b;
+            b(a);
+        }
+    }
+    expect: {
+        var a;
+        for (var b in x)
+            b(a = b);
+    }
+}
+
+unused_orig: {
+    options = {
+        collapse_vars: true,
+        passes: 2,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        console.log(function(b) {
+            var a;
+            var c = b;
+            for (var d in c) {
+                var a = c[0];
+                return --b + a;
+            }
+            try {
+            } catch (e) {
+                --b + a;
+            }
+            a && a.NaN;
+        }([2]), a);
+    }
+    expect: {
+        var a = 1;
+        console.log(function(b) {
+            var a;
+            var c = b;
+            for (var d in c)
+                return --b + (a = c[0]);
+            a && a.NaN;
+        }([2]), a);
+    }
+    expect_stdout: "3 1"
+}
+
+issue_315: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        keep_fargs: false,
+        reduce_vars: true,
+        sequences: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(s) {
+            var w, _i, _len, _ref, _results;
+            _ref = s.trim().split(" ");
+            _results = [];
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                w = _ref[_i];
+                _results.push(w.toLowerCase());
+            }
+            return _results;
+        }("test"));
+    }
+    expect: {
+        console.log(function() {
+            var w, _i, _len, _ref, _results;
+            for (_results = [], _i = 0, _len = (_ref = "test".trim().split(" ")).length; _i < _len ; _i++)
+                w = _ref[_i], _results.push(w.toLowerCase());
+            return _results;
+        }());
+    }
+    expect_stdout: true
+}
+
+lvalues_def: {
+    options = {
+        collapse_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var a = 0, b = 1;
+        var a = b++, b = +function() {}();
+        a && a[a++];
+        console.log(a, b);
+    }
+    expect: {
+        var a = 0, b = 1;
+        var a = b++, b = +void 0;
+        a && a[a++];
+        console.log(a, b);
+    }
+    expect_stdout: true
+}
+
+compound_assignment: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a;
+        a = 1;
+        a += a + 2;
+        console.log(a);
+    }
+    expect: {
+        var a;
+        a = 1;
+        a += a + 2;
+        console.log(a);
+    }
+    expect_stdout: "4"
+}
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -979,12 +979,12 @@ delete_conditional_1: {
        console.log(delete (1 ? 0 / 0 : x));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((1 / 0, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((NaN, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
@@ -1006,12 +1006,12 @@ delete_conditional_2: {
        console.log(delete (0 ? x : 0 / 0));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((Infinity, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((NaN, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -1016,7 +1016,8 @@ issue_1715_3: {
            try {
                console;
            } catch (a) {
-                var a = x();
+                var a;
+                x();
            }
        }
        f();
@@ -1110,3 +1111,120 @@ delete_assign_2: {
    }
    expect_stdout: true
 }
+
+drop_var: {
+    options = {
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        console.log(a, b);
+        var a = 1, b = 2;
+        console.log(a, b);
+        var a = 3;
+        console.log(a, b);
+    }
+    expect: {
+        console.log(a, b);
+        var a = 1, b = 2;
+        console.log(a, b);
+        a = 3;
+        console.log(a, b);
+    }
+    expect_stdout: [
+        "undefined undefined",
+        "1 2",
+        "3 2",
+    ]
+}
+
+issue_1830_1: {
+    options = {
+        unused: true,
+    }
+    input: {
+        !function() {
+            L: for (var b = console.log(1); !1;) continue L;
+        }();
+    }
+    expect: {
+        !function() {
+            L: for (console.log(1); !1;) continue L;
+        }();
+    }
+    expect_stdout: "1"
+}
+
+issue_1830_2: {
+    options = {
+        unused: true,
+    }
+    input: {
+        !function() {
+            L: for (var a = 1, b = console.log(a); --a;) continue L;
+        }();
+    }
+    expect: {
+        !function() {
+            var a = 1;
+            L: for (console.log(a); --a;) continue L;
+        }();
+    }
+    expect_stdout: "1"
+}
+
+issue_1838: {
+    options = {
+        join_vars: true,
+        loops: true,
+        unused: true,
+    }
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        function f() {
+            var b = a;
+            while (c);
+        }
+    }
+    expect_exact: [
+        "function f() {",
+        "    for (a; c; ) ;",
+        "}",
+    ]
+}
+
+var_catch_toplevel: {
+    options = {
+        conditionals: true,
+        negate_iife: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            a--;
+            try {
+                a++;
+            } catch(a) {
+                if (a) var a;
+                var a = 10;
+            }
+        }
+        f();
+    }
+    expect: {
+        !function() {
+            a--;
+            try {
+                a++;
+            } catch(a) {
+                var a;
+            }
+        }();
+    }
+}
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -1016,12 +1016,12 @@ delete_binary_1: {
        console.log(delete (true && (0 / 0)));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((1 / 0, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((NaN, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
@@ -1042,12 +1042,12 @@ delete_binary_2: {
        console.log(delete (false || (0 / 0)));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((Infinity, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((NaN, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -93,3 +93,77 @@ issue_485_crashing_1530: {
        this, void 0;
    }
 }
+
+issue_1841_1: {
+    options = {
+        keep_fargs: false,
+        pure_getters: "strict",
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function() {
+            for (var key in "hi")
+                b = 42;
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}
+
+issue_1841_2: {
+    options = {
+        keep_fargs: false,
+        pure_getters: false,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                arg.baz, b = 42;
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}
+
+function_returning_constant_literal: {
+    options = {
+        reduce_vars: true,
+        unsafe: true,
+        toplevel: true,
+        evaluate: true,
+        cascade: true,
+        unused: true,
+    }
+    input: {
+        function greeter() {
+            return { message: 'Hello there' };
+        }
+        var greeting = greeter();
+        console.log(greeting.message);
+    }
+    expect: {
+        console.log("Hello there");
+    }
+    expect_stdout: "Hello there"
+}
--- a/test/compress/issue-1321.js
+++ b/test/compress/issue-1321.js
@@ -1,6 +1,6 @@
 issue_1321_no_debug: {
    mangle_props = {
-        ignore_quoted: true
+        keep_quoted: true
    }
    input: {
        var x = {};
@@ -19,7 +19,7 @@ issue_1321_no_debug: {

 issue_1321_debug: {
    mangle_props = {
-        ignore_quoted: true,
+        keep_quoted: true,
        debug: ""
    }
    input: {
@@ -39,7 +39,7 @@ issue_1321_debug: {

 issue_1321_with_quoted: {
    mangle_props = {
-        ignore_quoted: false
+        keep_quoted: false
    }
    input: {
        var x = {};
--- a/test/compress/issue-1446.js
+++ b/test/compress/issue-1446.js
@@ -23,7 +23,7 @@ typeof_eq_undefined: {
 typeof_eq_undefined_ie8: {
    options = {
        comparisons: true,
-        screw_ie8: false
+        ie8: true,
    }
    input: {
        var a = typeof b != "undefined";
--- a/test/compress/issue-1588.js
+++ b/test/compress/issue-1588.js
@@ -1,9 +1,9 @@
 screw_ie8: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        try { throw "foo"; } catch (x) { console.log(x); }
@@ -16,10 +16,10 @@ screw_ie8: {

 support_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        try { throw "foo"; } catch (x) { console.log(x); }
--- a/test/compress/issue-1609.js
+++ b/test/compress/issue-1609.js
@@ -18,9 +18,7 @@ chained_evaluation_1: {
    expect: {
        (function() {
            (function() {
-                var c;
-                c = f(1);
-                c.bar = 1;
+                f(1).bar = 1;
            })();
        })();
    }
@@ -46,9 +44,8 @@ chained_evaluation_2: {
    expect: {
        (function() {
            (function() {
-                var c, b = "long piece of string";
-                c = f(b);
-                c.bar = b;
+                var b = "long piece of string";
+                f(b).bar = b;
            })();
        })();
    }
--- a/test/compress/issue-1656.js
+++ b/test/compress/issue-1656.js
@@ -35,11 +35,11 @@ f7: {
        console.log(a, b);
    }
    expect_exact: [
-        "var a = 100, b = 10;",
+        "var b = 10;",
        "",
        "!function() {",
-        "    for (;b = a, !1; ) ;",
-        "}(), console.log(a, b);",
+        "    for (;b = 100, !1; ) ;",
+        "}(), console.log(100, b);",
    ]
    expect_stdout: true
 }
--- a/test/compress/issue-1704.js
+++ b/test/compress/issue-1704.js
@@ -1,10 +1,10 @@
 mangle_catch: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -22,11 +22,11 @@ mangle_catch: {

 mangle_catch_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -44,11 +44,11 @@ mangle_catch_ie8: {

 mangle_catch_var: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -66,11 +66,11 @@ mangle_catch_var: {

 mangle_catch_var_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -88,11 +88,11 @@ mangle_catch_var_ie8: {

 mangle_catch_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -110,11 +110,11 @@ mangle_catch_toplevel: {

 mangle_catch_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -132,11 +132,11 @@ mangle_catch_ie8_toplevel: {

 mangle_catch_var_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -154,11 +154,11 @@ mangle_catch_var_toplevel: {

 mangle_catch_var_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -176,11 +176,11 @@ mangle_catch_var_ie8_toplevel: {

 mangle_catch_redef_1: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -198,11 +198,11 @@ mangle_catch_redef_1: {

 mangle_catch_redef_1_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -220,11 +220,11 @@ mangle_catch_redef_1_ie8: {

 mangle_catch_redef_1_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -242,11 +242,11 @@ mangle_catch_redef_1_toplevel: {

 mangle_catch_redef_1_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
@@ -264,11 +264,11 @@ mangle_catch_redef_1_ie8_toplevel: {

 mangle_catch_redef_2: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: false,
    }
    input: {
@@ -285,11 +285,11 @@ mangle_catch_redef_2: {

 mangle_catch_redef_2_ie8: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: false,
    }
    input: {
@@ -306,11 +306,11 @@ mangle_catch_redef_2_ie8: {

 mangle_catch_redef_2_toplevel: {
    options = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
        toplevel: true,
    }
    input: {
@@ -327,11 +327,11 @@ mangle_catch_redef_2_toplevel: {

 mangle_catch_redef_2_ie8_toplevel: {
    options = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
        toplevel: true,
    }
    input: {
--- a/test/compress/issue-1733.js
+++ b/test/compress/issue-1733.js
@@ -1,6 +1,6 @@
 function_iife_catch: {
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        function f(n) {
@@ -21,7 +21,7 @@ function_iife_catch: {

 function_iife_catch_ie8: {
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f(n) {
@@ -42,7 +42,7 @@ function_iife_catch_ie8: {

 function_catch_catch: {
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var o = 0;
@@ -70,7 +70,7 @@ function_catch_catch: {

 function_catch_catch_ie8: {
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var o = 0;
--- a/test/compress/issue-1787.js
+++ b/test/compress/issue-1787.js
@@ -10,10 +10,6 @@ unary_prefix: {
            return x;
        }());
    }
-    expect: {
-        console.log(function() {
-            return -2 / 3;
-        }());
-    }
+    expect_exact: "console.log(-2/3);"
    expect_stdout: true
 }
--- a/test/compress/issue-1833.js
+++ b/test/compress/issue-1833.js
@@ -0,0 +1,134 @@
+iife_for: {
+    options = {
+        negate_iife: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                L: for (;;) break L;
+            }
+            g();
+        }
+        f();
+    }
+    expect: {
+        !function() {
+            !function() {
+                L: for (;;) break L;
+            }();
+        }();
+    }
+}
+
+iife_for_in: {
+    options = {
+        negate_iife: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                L: for (var a in x) break L;
+            }
+            g();
+        }
+        f();
+    }
+    expect: {
+        !function() {
+            !function() {
+                L: for (var a in x) break L;
+            }();
+        }();
+    }
+}
+
+iife_do: {
+    options = {
+        negate_iife: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                L: do {
+                    break L;
+                } while (1);
+            }
+            g();
+        }
+        f();
+    }
+    expect: {
+        !function() {
+            !function() {
+                L: do {
+                    break L;
+                } while (1);
+            }();
+        }();
+    }
+}
+
+iife_while: {
+    options = {
+        negate_iife: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                L: while (1) break L;
+            }
+            g();
+        }
+        f();
+    }
+    expect: {
+        !function() {
+            !function() {
+                L: while (1) break L;
+            }();
+        }();
+    }
+}
+
+label_do: {
+    options = {
+        evaluate: true,
+        loops: true,
+    }
+    input: {
+        L: do {
+            continue L;
+        } while (0);
+    }
+    expect: {
+        L: do {
+            continue L;
+        } while (0);
+    }
+}
+
+label_while: {
+    options = {
+        evaluate: true,
+        dead_code: true,
+        loops: true,
+    }
+    input: {
+        function f() {
+            L: while (0) continue L;
+        }
+    }
+    expect_exact: "function f(){L:;}"
+}
--- a/test/compress/issue-640.js
+++ b/test/compress/issue-640.js
@@ -159,7 +159,7 @@ negate_iife_4: {
        })();
    }
    expect: {
-        (function(){ return t })() ? console.log(true) : console.log(false), function(){
+        !function(){ return t }() ? console.log(false) : console.log(true), function(){
            console.log("something");
        }();
    }
@@ -183,7 +183,7 @@ negate_iife_5: {
        })();
    }
    expect: {
-        (function(){ return t })() ? foo(true) : bar(false), function(){
+        !function(){ return t }() ? bar(false) : foo(true), function(){
            console.log("something");
        }();
    }
@@ -207,7 +207,7 @@ negate_iife_5_off: {
        })();
    }
    expect: {
-        (function(){ return t })() ? foo(true) : bar(false), function(){
+        !function(){ return t }() ? bar(false) : foo(true), function(){
            console.log("something");
        }();
    }
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -245,7 +245,7 @@ issue_1532: {
 issue_186: {
    beautify = {
        beautify: false,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -264,7 +264,7 @@ issue_186: {
 issue_186_ie8: {
    beautify = {
        beautify: false,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -283,7 +283,7 @@ issue_186_ie8: {
 issue_186_beautify: {
    beautify = {
        beautify: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -310,7 +310,7 @@ issue_186_beautify: {
 issue_186_beautify_ie8: {
    beautify = {
        beautify: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -340,7 +340,7 @@ issue_186_bracketize: {
    beautify = {
        beautify: false,
        bracketize: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -360,7 +360,7 @@ issue_186_bracketize_ie8: {
    beautify = {
        beautify: false,
        bracketize: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
@@ -380,7 +380,7 @@ issue_186_beautify_bracketize: {
    beautify = {
        beautify: true,
        bracketize: true,
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        var x = 3;
@@ -412,7 +412,7 @@ issue_186_beautify_bracketize_ie8: {
    beautify = {
        beautify: true,
        bracketize: true,
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        var x = 3;
--- a/test/compress/negate-iife.js
+++ b/test/compress/negate-iife.js
@@ -25,11 +25,9 @@ negate_iife_2: {
        negate_iife: true
    };
    input: {
-        (function(){ return {} })().x = 10; // should not transform this one
-    }
-    expect: {
        (function(){ return {} })().x = 10;
    }
+    expect_exact: "({}).x=10;"
 }

 negate_iife_2_side_effects: {
@@ -38,11 +36,9 @@ negate_iife_2_side_effects: {
        side_effects: true,
    }
    input: {
-        (function(){ return {} })().x = 10; // should not transform this one
-    }
-    expect: {
        (function(){ return {} })().x = 10;
    }
+    expect_exact: "({}).x=10;"
 }

 negate_iife_3: {
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -13,7 +13,7 @@ keep_properties: {
 dot_properties: {
    options = {
        properties: true,
-        screw_ie8: false
+        ie8: true,
    };
    input: {
        a["foo"] = "bar";
@@ -36,7 +36,7 @@ dot_properties: {
 dot_properties_es5: {
    options = {
        properties: true,
-        screw_ie8: true
+        ie8: false,
    };
    input: {
        a["foo"] = "bar";
@@ -125,7 +125,7 @@ evaluate_string_length: {

 mangle_properties: {
    mangle_props = {
-        ignore_quoted: false
+        keep_quoted: false
    };
    input: {
        a["foo"] = "bar";
@@ -148,8 +148,8 @@ mangle_unquoted_properties: {
        properties: false
    }
    mangle_props = {
-        ignore_quoted: true,
-        reserved: []
+        builtins: true,
+        keep_quoted: true
    }
    beautify = {
        beautify: false,
@@ -234,12 +234,13 @@ mangle_debug_suffix: {
    }
 }

-mangle_debug_suffix_ignore_quoted: {
+mangle_debug_suffix_keep_quoted: {
    options = {
        properties: false
    }
    mangle_props = {
-        ignore_quoted: true,
+        builtins: true,
+        keep_quoted: true,
        debug: "XYZ",
        reserved: []
    }
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -53,9 +53,7 @@ reduce_vars: {
            console.log(-3);
            eval("console.log(a);");
        })(eval);
-        (function() {
-            return "yes";
-        })();
+        "yes";
        console.log(2);
    }
    expect_stdout: true
@@ -66,7 +64,7 @@ modified: {
        conditionals  : true,
        evaluate      : true,
        reduce_vars   : true,
-        unused        : true
+        unused        : true,
    }
    input: {
        function f0() {
@@ -136,12 +134,11 @@ modified: {
        }

        function f2() {
-            var b = 2;
-            b = 3;
-            console.log(1 + b);
-            console.log(b + 3);
+            3;
            console.log(4);
-            console.log(1 + b + 3);
+            console.log(6);
+            console.log(4);
+            console.log(7);
        }

        function f3() {
@@ -300,7 +297,7 @@ unsafe_evaluate_array: {
    }
 }

-unsafe_evaluate_equality: {
+unsafe_evaluate_equality_1: {
    options = {
        evaluate     : true,
        reduce_vars  : true,
@@ -308,47 +305,62 @@ unsafe_evaluate_equality: {
        unused       : true
    }
    input: {
-        function f0(){
+        function f0() {
            var a = {};
-            console.log(a === a);
+            return a === a;
        }
-
-        function f1(){
+        function f1() {
            var a = [];
-            console.log(a === a);
+            return a === a;
        }
+        console.log(f0(), f1());
+    }
+    expect: {
+        function f0() {
+            return true;
+        }
+        function f1() {
+            return true;
+        }
+        console.log(f0(), f1());
+    }
+    expect_stdout: true
+}

-        function f2(){
+unsafe_evaluate_equality_2: {
+    options = {
+        collapse_vars: true,
+        evaluate     : true,
+        passes       : 2,
+        reduce_vars  : true,
+        unsafe       : true,
+        unused       : true
+    }
+    input: {
+        function f2() {
            var a = {a:1, b:2};
            var b = a;
            var c = a;
-            console.log(b === c);
+            return b === c;
        }
-
-        function f3(){
+        function f3() {
            var a = [1, 2, 3];
            var b = a;
            var c = a;
-            console.log(b === c);
+            return b === c;
        }
+        console.log(f2(), f3());
    }
    expect: {
-        function f0(){
-            console.log(true);
+        function f2() {
+            return true;
        }
-
-        function f1(){
-            console.log(true);
-        }
-
-        function f2(){
-            console.log(true);
-        }
-
-        function f3(){
-            console.log(true);
+        function f3() {
+            return true;
        }
+        console.log(f2(), f3());
    }
+    expect_stdout: true
 }

 passes: {
@@ -375,12 +387,11 @@ passes: {
    }
    expect: {
        function f() {
-            var b = 2;
-            b = 3;
-            console.log(1 + b);
-            console.log(b + 3);
+            3;
            console.log(4);
-            console.log(1 + b + 3);
+            console.log(6);
+            console.log(4);
+            console.log(7);
        }
    }
 }
@@ -573,7 +584,7 @@ inner_var_label: {
    }
 }

-inner_var_for: {
+inner_var_for_1: {
    options = {
        evaluate: true,
        reduce_vars: true,
@@ -602,6 +613,29 @@ inner_var_for: {
    }
 }

+inner_var_for_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a = 1;
+            for (var b = 1; --b;) var a = 2;
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            a = 1;
+            for (var b = 1; --b;) var a = 2;
+            console.log(a);
+        }();
+    }
+    expect_stdout: "1"
+}
+
 inner_var_for_in_1: {
    options = {
        evaluate: true,
@@ -1639,7 +1673,7 @@ redefine_arguments_1: {
            return typeof arguments;
        }
        function g() {
-            return"number";
+            return "number";
        }
        function h(x) {
            var arguments = x;
@@ -1678,9 +1712,7 @@ redefine_arguments_2: {
        console.log(function() {
            var arguments;
            return typeof arguments;
-        }(), function() {
-            return"number";
-        }(), function(x) {
+        }(), "number", function(x) {
            var arguments = x;
            return typeof arguments;
        }());
@@ -1789,9 +1821,7 @@ redefine_farg_2: {
        console.log(function(a) {
            var a;
            return typeof a;
-        }([]), function() {
-            return "number";
-        }(),function(a, b) {
+        }([]), "number",function(a, b) {
            var a = b;
            return typeof a;
        }([]));
@@ -1828,10 +1858,7 @@ redefine_farg_3: {
        console.log(function(a) {
            var a;
            return typeof a;
-        }([]), "number", function(a) {
-            var a = void 0;
-            return typeof a;
-        }([]));
+        }([]), "number", "undefined");
    }
    expect_stdout: "object number undefined"
 }
@@ -1951,7 +1978,6 @@ pure_getters_2: {
        var a = a && a.b;
    }
    expect: {
-        var a;
        var a = a && a.b;
    }
 }
@@ -1995,3 +2021,443 @@ catch_var: {
    }
    expect_stdout: "true"
 }
+
+var_assign_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            a = 2;
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            console.log(2);
+        }();
+    }
+    expect_stdout: "2"
+}
+
+var_assign_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            if (a = 2) console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            if (2) console.log(2);
+        }();
+    }
+    expect_stdout: "2"
+}
+
+var_assign_3: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            while (a = 2);
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a;
+            while (a = 2);
+            console.log(a);
+        }();
+    }
+}
+
+var_assign_4: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        !function a() {
+            a = 2;
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function a() {
+            a = 2,
+            console.log(a);
+        }();
+    }
+}
+
+var_assign_5: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            !function(b) {
+                a = 2;
+                console.log(a, b);
+            }(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a;
+            !function(b) {
+                a = 2,
+                console.log(a, b);
+            }(a);
+        }();
+    }
+    expect_stdout: "2 undefined"
+}
+
+var_assign_6: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a = function(){}(a = 1);
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a = function(){}(a = 1);
+            console.log(a);
+        }();
+    }
+    expect_stdout: "undefined"
+}
+
+immutable: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a = "test";
+            console.log(a.indexOf("e"));
+        }();
+    }
+    expect: {
+        !function() {
+            console.log("test".indexOf("e"));
+        }();
+    }
+    expect_stdout: "1"
+}
+
+issue_1814_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        const a = 42;
+        !function() {
+            var b = a;
+            !function(a) {
+                console.log(a++, b);
+            }(0);
+        }();
+    }
+    expect: {
+        const a = 42;
+        !function() {
+            !function(a) {
+                console.log(a++, 42);
+            }(0);
+        }();
+    }
+    expect_stdout: "0 42"
+}
+
+issue_1814_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        const a = "32";
+        !function() {
+            var b = a + 1;
+            !function(a) {
+                console.log(a++, b);
+            }(0);
+        }();
+    }
+    expect: {
+        const a = "32";
+        !function() {
+            !function(a) {
+                console.log(a++, "321");
+            }(0);
+        }();
+    }
+    expect_stdout: "0 '321'"
+}
+
+try_abort: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            try {
+                var a = 1;
+                throw "";
+                var b = 2;
+            } catch (e) {
+            }
+            console.log(a, b);
+        }();
+    }
+    expect: {
+        !function() {
+            try {
+                var a = 1;
+                throw "";
+                var b = 2;
+            } catch (e) {
+            }
+            console.log(a, b);
+        }();
+    }
+    expect_stdout: "1 undefined"
+}
+
+boolean_binary_assign: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            void 0 && (a = 1);
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a;
+            void 0;
+            console.log(a);
+        }();
+    }
+    expect_stdout: "undefined"
+}
+
+cond_assign: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a;
+            void 0 ? (a = 1) : 0;
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a;
+            void 0 ? (a = 1) : 0;
+            console.log(a);
+        }();
+    }
+    expect_stdout: "undefined"
+}
+
+iife_assign: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            var a = 1, b = 0;
+            !function() {
+                b++;
+                return;
+                a = 2;
+            }();
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function() {
+            var a = 1, b = 0;
+            !function() {
+                b++;
+                return;
+                a = 2;
+            }();
+            console.log(a);
+        }();
+    }
+    expect_stdout: "1"
+}
+
+issue_1850_1: {
+    options = {
+        reduce_vars: true,
+        toplevel: false,
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect_stdout: true
+}
+
+issue_1850_2: {
+    options = {
+        reduce_vars: true,
+        toplevel: "funcs",
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect: {
+        var a = 1;
+        (function() {
+            console.log(a, a, a);
+        })();
+    }
+    expect_stdout: true
+}
+
+issue_1850_3: {
+    options = {
+        reduce_vars: true,
+        toplevel: "vars",
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect_stdout: true
+}
+
+issue_1850_4: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log(a, a, a);
+        }
+        var a = 1;
+        f();
+    }
+    expect: {
+        var a = 1;
+        (function() {
+            console.log(a, a, a);
+        })();
+    }
+    expect_stdout: true
+}
+
+issue_1865: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(some) {
+            some.thing = false;
+        }
+        console.log(function() {
+            var some = { thing: true };
+            f(some);
+            return some.thing;
+        }());
+    }
+    expect: {
+        function f(some) {
+            some.thing = false;
+        }
+        console.log(function() {
+            var some = { thing: true };
+            f(some);
+            return some.thing;
+        }());
+    }
+    expect_stdout: true
+}
--- a/test/compress/screw-ie8.js
+++ b/test/compress/screw-ie8.js
@@ -1,9 +1,9 @@
 do_screw: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    beautify = {
-        screw_ie8: true,
+        ie8: false,
        ascii_only: true,
    }
    input: {
@@ -14,10 +14,10 @@ do_screw: {

 dont_screw: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    beautify = {
-        screw_ie8: false,
+        ie8: true,
        ascii_only: true,
    }
    input: {
@@ -28,7 +28,7 @@ dont_screw: {

 do_screw_constants: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        f(undefined, Infinity);
@@ -38,7 +38,7 @@ do_screw_constants: {

 dont_screw_constants: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        f(undefined, Infinity);
@@ -47,9 +47,15 @@ dont_screw_constants: {
 }

 do_screw_try_catch: {
-    options = { screw_ie8: true };
-    mangle = { screw_ie8: true };
-    beautify = { screw_ie8: true };
+    options = {
+        ie8: false,
+    }
+    mangle = {
+        ie8: false,
+    }
+    beautify = {
+        ie8: false,
+    }
    input: {
        good = function(e){
            return function(error){
@@ -75,9 +81,15 @@ do_screw_try_catch: {
 }

 dont_screw_try_catch: {
-    options = { screw_ie8: false };
-    mangle = { screw_ie8: false };
-    beautify = { screw_ie8: false };
+    options = {
+        ie8: true,
+    }
+    mangle = {
+        ie8: true,
+    }
+    beautify = {
+        ie8: true,
+    }
    input: {
        bad = function(e){
            return function(error){
@@ -103,9 +115,15 @@ dont_screw_try_catch: {
 }

 do_screw_try_catch_undefined: {
-    options = { screw_ie8: true };
-    mangle = { screw_ie8: true };
-    beautify = { screw_ie8: true };
+    options = {
+        ie8: false,
+    }
+    mangle = {
+        ie8: false,
+    }
+    beautify = {
+        ie8: false,
+    }
    input: {
        function a(b){
            try {
@@ -132,9 +150,15 @@ do_screw_try_catch_undefined: {
 }

 dont_screw_try_catch_undefined: {
-    options = { screw_ie8: false };
-    mangle = { screw_ie8: false };
-    beautify = { screw_ie8: false };
+    options = {
+        ie8: true,
+    }
+    mangle = {
+        ie8: true,
+    }
+    beautify = {
+        ie8: true,
+    }
    input: {
        function a(b){
            try {
@@ -164,11 +188,11 @@ reduce_vars: {
    options = {
        evaluate: true,
        reduce_vars: true,
-        screw_ie8: false,
+        ie8: true,
        unused: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f() {
@@ -196,10 +220,10 @@ reduce_vars: {

 issue_1586_1: {
    options = {
-        screw_ie8: false,
+        ie8: true,
    }
    mangle = {
-        screw_ie8: false,
+        ie8: true,
    }
    input: {
        function f() {
@@ -215,10 +239,10 @@ issue_1586_1: {

 issue_1586_2: {
    options = {
-        screw_ie8: true,
+        ie8: false,
    }
    mangle = {
-        screw_ie8: true,
+        ie8: false,
    }
    input: {
        function f() {
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -460,7 +460,7 @@ issue_1758: {
        console.log(function(c) {
            var undefined = 42;
            return function() {
-                return c--, c--, c.toString(), void 0;
+                return c--, c--, void c.toString();
            }();
        }());
    }
@@ -481,12 +481,12 @@ delete_seq_1: {
        console.log(delete (1, 0 / 0));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((1 / 0, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((0 / 0, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
@@ -505,12 +505,12 @@ delete_seq_2: {
        console.log(delete (1, 2, 0 / 0));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((1 / 0, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((0 / 0, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
@@ -530,12 +530,12 @@ delete_seq_3: {
        console.log(delete (1, 2, 0 / 0));
    }
    expect: {
-        console.log((void 0, !0));
-        console.log((void 0, !0));
-        console.log((Infinity, !0));
-        console.log((1 / 0, !0));
-        console.log((NaN, !0));
-        console.log((0 / 0, !0));
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
+        console.log(!0);
    }
    expect_stdout: true
 }
@@ -606,7 +606,107 @@ delete_seq_6: {
    }
    expect: {
        var a;
-        console.log((a, !0));
+        console.log(!0);
    }
    expect_stdout: true
 }
+
+side_effects: {
+    options = {
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        0, a(), 1, b(), 2, c(), 3;
+    }
+    expect: {
+        a(), b(), c();
+    }
+}
+
+side_effects_cascade_1: {
+    options = {
+        cascade: true,
+        conditionals: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f(a, b) {
+            a -= 42;
+            if (a < 0) a = 0;
+            b.a = a;
+        }
+    }
+    expect: {
+        function f(a, b) {
+            (a -= 42) < 0 && (a = 0), b.a = a;
+        }
+    }
+}
+
+side_effects_cascade_2: {
+    options = {
+        cascade: true,
+        side_effects: true,
+    }
+    input: {
+        function f(a, b) {
+            b = a,
+            !a + (b += a) || (b += a),
+            b = a,
+            b;
+        }
+    }
+    expect: {
+        function f(a, b) {
+            b = a,
+            !a + (b += a) || (b += a),
+            b = a;
+        }
+    }
+}
+
+side_effects_cascade_3: {
+    options = {
+        cascade: true,
+        conditionals: true,
+        side_effects: true,
+    }
+    input: {
+        function f(a, b) {
+            "foo" ^ (b += a),
+            b ? false : (b = a) ? -1 : (b -= a) - (b ^= a),
+            a-- || !a,
+            a;
+        }
+    }
+    expect: {
+        function f(a, b) {
+            !(b += a) && ((b = a) || (b -= a, b ^= a)),
+            --a;
+        }
+    }
+}
+
+issue_27: {
+    options = {
+        cascade: true,
+        passes: 2,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function(jQuery) {
+            var $;
+            $ = jQuery;
+            $("body").addClass("foo");
+        })(jQuery);
+    }
+    expect: {
+        (function(jQuery) {
+            jQuery("body").addClass("foo");
+        })(jQuery);
+    }
+}