harmony-v3.3.5

disable reminify()
fix-up for #2708
2018-01-08 00:30:45 +08:00 · 2018-01-07 22:32:29 +08:00 · 2018-01-07 20:35:53 +08:00 · 2018-01-07 11:51:36 +00:00 · 2018-01-07 17:53:50 +08:00 · 2018-01-07 15:31:24 +08:00
37 changed files with 2996 additions and 475 deletions
--- a/README.md
+++ b/README.md
@@ -675,7 +675,13 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

 - `if_return` (default: `true`) -- optimizations for if/return and if/continue

- `inline` (default: `true`) -- embed simple functions
+- `inline` (default: `true`) -- inline calls to function with simple/`return` statement:
+  - `false` -- same as `0`
+  - `0` -- disabled inlining
+  - `1` -- inline simple functions
+  - `2` -- inline functions with arguments
+  - `3` -- inline functions with arguments and variables
+  - `true` -- same as `3`

 - `join_vars` (default: `true`) -- join consecutive `var` statements

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,24 +1,20 @@
 environment:
  matrix:
-  - nodejs_version: "0.10"
-  - nodejs_version: "0.12"
-  - nodejs_version: "4.0"
-  - nodejs_version: "6.0"
-
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.12"
+    - nodejs_version: "4"
+    - nodejs_version: "6"
+    - nodejs_version: "8"
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - set UGLIFYJS_TEST_ALL=1
+  - npm install
+build: off
+cache:
+  - tmp
 matrix:
  fast_finish: true
-
-platform:
-  - x86
-  - x64
-
-install:
-  - ps: Install-Product node $env:nodejs_version $env:platform
-  - npm install
-
 test_script:
  - node --version
  - npm --version
  - npm test
-
-build: off
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -3,11 +3,7 @@

 "use strict";

-// workaround for tty output truncation upon process.exit()
-[process.stdout, process.stderr].forEach(function(stream){
-    if (stream._handle && stream._handle.setBlocking)
-        stream._handle.setBlocking(true);
-});
+require("../tools/exit");

 var fs = require("fs");
 var info = require("../package.json");
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -29,7 +29,6 @@ function set_shorthand(name, options, keys) {

 function init_cache(cache) {
    if (!cache) return;
-    if (!("cname" in cache)) cache.cname = -1;
    if (!("props" in cache)) {
        cache.props = new Dictionary();
    } else if (!(cache.props instanceof Dictionary)) {
@@ -39,7 +38,6 @@ function init_cache(cache) {

 function to_json(cache) {
    return {
-        cname: cache.cname,
        props: cache.props.toObject()
    };
 }
--- a/lib/output.js
+++ b/lib/output.js
@@ -557,7 +557,11 @@ function OutputStream(options) {
        var token = node.end;
        if (!token) return;
        var comments = token[tail ? "comments_before" : "comments_after"];
-        if (comments && comments._dumped !== self) {
+        if (comments
+            && comments._dumped !== self
+            && (node instanceof AST_Statement || all(comments, function(c) {
+                return !/comment[134]/.test(c.type);
+            }))) {
            comments._dumped = self;
            var insert = OUTPUT.length;
            comments.filter(comment_filter, node).forEach(function(c, i) {
@@ -627,7 +631,7 @@ function OutputStream(options) {
        add_mapping     : add_mapping,
        option          : function(opt) { return options[opt] },
        prepend_comments: readonly ? noop : prepend_comments,
-        append_comments : readonly ? noop : append_comments,
+        append_comments : readonly || comment_filter === return_false ? noop : append_comments,
        line            : function() { return current_line },
        col             : function() { return current_col },
        pos             : function() { return current_pos },
@@ -699,9 +703,7 @@ function OutputStream(options) {
        }
    };

-    PARENS(AST_Node, function(){
-        return false;
-    });
+    PARENS(AST_Node, return_false);

    // a function expression needs parens around it when it's provably
    // the first token to appear in a statement.
@@ -730,15 +732,9 @@ function OutputStream(options) {
        return p instanceof AST_PropAccess && p.expression === this;
    });

-    PARENS(AST_ClassExpression, function(output){
-        return output.parent() instanceof AST_SimpleStatement;
-    });
-
    // same goes for an object literal, because otherwise it would be
    // interpreted as a block of code.
-    PARENS(AST_Object, function(output){
-        return first_in_statement(output);
-    });
+    PARENS([ AST_ClassExpression, AST_Object ], first_in_statement);

    PARENS(AST_Unary, function(output){
        var p = output.parent();
@@ -805,6 +801,10 @@ function OutputStream(options) {
        // a = yield 3
        if (p instanceof AST_Binary && p.operator !== "=")
            return true;
+        // (yield 1)()
+        // new (yield 1)()
+        if (p instanceof AST_Call && p.expression === this)
+            return true;
        // (yield 1) ? yield 2 : yield 3
        if (p instanceof AST_Conditional && p.condition === this)
            return true;
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -934,10 +934,15 @@ function parse($TEXT, options) {

    function expect(punc) { return expect_token("punc", punc); };

+    function has_newline_before(token) {
+        return token.nlb || !all(token.comments_before, function(comment) {
+            return !comment.nlb;
+        });
+    }
+
    function can_insert_semicolon() {
-        return !options.strict && (
-            S.token.nlb || is("eof") || is("punc", "}")
-        );
+        return !options.strict
+            && (is("eof") || is("punc", "}") || has_newline_before(S.token));
    };

    function is_in_generator() {
@@ -985,10 +990,10 @@ function parse($TEXT, options) {
            if (S.in_directives) {
                var token = peek();
                if (S.token.raw.indexOf("\\") == -1
-                    && (token.nlb
-                        || is_token(token, "eof")
-                        || is_token(token, "punc", ";")
-                        || is_token(token, "punc", "}"))) {
+                    && (is_token(token, "punc", ";")
+                        || is_token(token, "punc", "}")
+                        || has_newline_before(token)
+                        || is_token(token, "eof"))) {
                    S.input.add_directive(S.token.value);
                } else {
                    S.in_directives = false;
@@ -1111,7 +1116,7 @@ function parse($TEXT, options) {

              case "throw":
                next();
-                if (S.token.nlb)
+                if (has_newline_before(S.token))
                    croak("Illegal newline after 'throw'");
                var value = expression(true);
                semicolon();
@@ -1163,10 +1168,6 @@ function parse($TEXT, options) {

    function labeled_statement() {
        var label = as_symbol(AST_Label);
-        if (label.name === "yield" && is_in_generator()) {
-            // Ecma-262, 12.1.1 Static Semantics: Early Errors
-            token_error(S.prev, "Yield cannot be used as label inside generators");
-        }
        if (label.name === "await" && is_in_async()) {
            token_error(S.prev, "await cannot be used as label inside async function");
        }
@@ -1287,7 +1288,7 @@ function parse($TEXT, options) {
    };

    var arrow_function = function(start, argnames, is_async) {
-        if (S.token.nlb) {
+        if (has_newline_before(S.token)) {
            croak("Unexpected newline before arrow (=>)");
        }

@@ -1326,7 +1327,7 @@ function parse($TEXT, options) {
        if (name && ctor !== AST_Accessor && !(name instanceof AST_SymbolDeclaration))
            unexpected(prev());

-        var args = parameters();
+        var args = [];
        var body = _function_body(true, is_generator || is_generator_property, is_async, name, args);
        return new ctor({
            start : args.start,
@@ -1397,9 +1398,8 @@ function parse($TEXT, options) {
        return tracker;
    }

-    function parameters() {
+    function parameters(params) {
        var start = S.token;
-        var params = [];
        var used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));

        expect("(");
@@ -1419,7 +1419,6 @@ function parse($TEXT, options) {
        }

        next();
-        return params;
    }

    function parameter(used_parameters, symbol_type) {
@@ -1506,12 +1505,7 @@ function parse($TEXT, options) {
                    }
                } else if (is("name")) {
                    used_parameters.add_parameter(S.token);
-                    elements.push(new symbol_type({
-                        start: S.token,
-                        name: S.token.value,
-                        end: S.token
-                    }));
-                    next();
+                    elements.push(as_symbol(symbol_type));
                } else {
                    croak("Invalid function parameter");
                }
@@ -1561,11 +1555,8 @@ function parse($TEXT, options) {
                }
                if (is("name") && (is_token(peek(), "punc") || is_token(peek(), "operator")) && [",", "}", "="].indexOf(peek().value) !== -1) {
                    used_parameters.add_parameter(S.token);
-                    var value = new symbol_type({
-                        start: S.token,
-                        name: S.token.value,
-                        end: S.token,
-                    });
+                    var start = prev();
+                    var value = as_symbol(symbol_type);
                    if (is_expand) {
                        elements.push(new AST_Expansion({
                            start: expand_token,
@@ -1574,13 +1565,12 @@ function parse($TEXT, options) {
                        }));
                    } else {
                        elements.push(new AST_ObjectKeyVal({
-                            start: prev(),
-                            key: S.token.value,
+                            start: start,
+                            key: value.name,
                            value: value,
                            end: value.end,
                        }));
                    }
-                    next();
                } else if (is("punc", "}")) {
                    continue; // Allow trailing hole
                } else {
@@ -1637,12 +1627,7 @@ function parse($TEXT, options) {
            });
        } else if (is("name")) {
            used_parameters.add_parameter(S.token);
-            next();
-            return new symbol_type({
-                start: prev(),
-                name: prev().value,
-                end: prev()
-            });
+            return as_symbol(symbol_type);
        } else {
            croak("Invalid function parameter");
        }
@@ -1696,6 +1681,7 @@ function parse($TEXT, options) {
            S.in_generator = S.in_function;
        if (is_async)
            S.in_async = S.in_function;
+        if (args) parameters(args);
        if (block)
            S.in_directives = true;
        S.in_loop = 0;
@@ -1703,10 +1689,8 @@ function parse($TEXT, options) {
        if (block) {
            S.input.push_directives_stack();
            var a = block_();
-            if (S.input.has_directive("use strict")) {
-                if (name) strict_verify_symbol(name);
-                if (args) args.forEach(strict_verify_symbol);
-            }
+            if (name) _verify_symbol(name);
+            if (args) args.forEach(_verify_symbol);
            S.input.pop_directives_stack();
        } else {
            var a = expression(false);
@@ -1934,12 +1918,14 @@ function parse($TEXT, options) {
        } else {
            args = [];
        }
-        return subscripts(new AST_New({
+        var call = new AST_New({
            start      : start,
            expression : newexp,
            args       : args,
            end        : prev()
-        }), allow_calls);
+        });
+        mark_pure(call);
+        return subscripts(call, allow_calls);
    };

    function as_atom_node() {
@@ -2588,9 +2574,14 @@ function parse($TEXT, options) {
                unexpected(tmp);
            }
          case "name":
-            if (tmp.value == "yield" && !is_token(peek(), "punc", ":") && !is_token(peek(), "punc", "(")
-                && S.input.has_directive("use strict") && !is_in_generator()) {
-                token_error(tmp, "Unexpected yield identifier inside strict mode");
+            if (tmp.value == "yield") {
+                if (is_in_generator()) {
+                    token_error(tmp, "Yield cannot be used as identifier inside generators");
+                } else if (!is_token(peek(), "punc", ":")
+                    && !is_token(peek(), "punc", "(")
+                    && S.input.has_directive("use strict")) {
+                    token_error(tmp, "Unexpected yield identifier inside strict mode");
+                }
            }
          case "string":
          case "num":
@@ -2621,9 +2612,19 @@ function parse($TEXT, options) {
        });
    };

-    function strict_verify_symbol(sym) {
-        if (sym.name == "arguments" || sym.name == "eval")
-            croak("Unexpected " + sym.name + " in strict mode", sym.start.line, sym.start.col, sym.start.pos);
+    function _verify_symbol(sym) {
+        var name = sym.name;
+        if (is_in_generator() && name == "yield") {
+            token_error(sym.start, "Yield cannot be used as identifier inside generators");
+        }
+        if (S.input.has_directive("use strict")) {
+            if (name == "yield") {
+                token_error(sym.start, "Unexpected yield identifier inside strict mode");
+            }
+            if (sym instanceof AST_SymbolDeclaration && (name == "arguments" || name == "eval")) {
+                token_error(sym.start, "Unexpected " + name + " in strict mode");
+            }
+        }
    }

    function as_symbol(type, noerror) {
@@ -2631,13 +2632,8 @@ function parse($TEXT, options) {
            if (!noerror) croak("Name expected");
            return null;
        }
-        if (is("name", "yield") && S.input.has_directive("use strict")) {
-            token_error(S.prev, "Unexpected yield identifier inside strict mode");
-        }
        var sym = _make_symbol(type);
-        if (S.input.has_directive("use strict") && sym instanceof AST_SymbolDeclaration) {
-            strict_verify_symbol(sym);
-        }
+        _verify_symbol(sym);
        next();
        return sym;
    };
@@ -2738,7 +2734,7 @@ function parse($TEXT, options) {
            return ex;
        }
        var val = expr_atom(allow_calls, allow_arrows);
-        while (is("operator") && UNARY_POSTFIX(S.token.value) && !S.token.nlb) {
+        while (is("operator") && UNARY_POSTFIX(S.token.value) && !has_newline_before(S.token)) {
            if (val instanceof AST_Arrow) unexpected();
            val = make_unary(AST_UnaryPostfix, S.token, val);
            val.start = start;
@@ -2865,7 +2861,7 @@ function parse($TEXT, options) {
                next();
                return _yield_expression();
            } else if (S.input.has_directive("use strict")) {
-                token_error(S.token, "Unexpected yield identifier inside strict mode")
+                token_error(S.token, "Unexpected yield identifier inside strict mode");
            }
        }

--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -130,12 +130,15 @@ function mangle_properties(ast, options) {
    if (!Array.isArray(reserved)) reserved = [];
    if (!options.builtins) find_builtins(reserved);

-    var cache = options.cache;
-    if (cache == null) {
-        cache = {
-            cname: -1,
-            props: new Dictionary()
-        };
+    var cname = -1;
+    var cache;
+    if (options.cache) {
+        cache = options.cache.props;
+        cache.each(function(mangled_name) {
+            push_uniq(reserved, mangled_name);
+        });
+    } else {
+        cache = new Dictionary();
    }

    var regex = options.regex;
@@ -192,7 +195,7 @@ function mangle_properties(ast, options) {
        if (unmangleable.indexOf(name) >= 0) return false;
        if (reserved.indexOf(name) >= 0) return false;
        if (options.only_cache) {
-            return cache.props.has(name);
+            return cache.has(name);
        }
        if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
        return true;
@@ -201,7 +204,7 @@ function mangle_properties(ast, options) {
    function should_mangle(name) {
        if (regex && !regex.test(name)) return false;
        if (reserved.indexOf(name) >= 0) return false;
-        return cache.props.has(name)
+        return cache.has(name)
            || names_to_mangle.indexOf(name) >= 0;
    }

@@ -219,7 +222,7 @@ function mangle_properties(ast, options) {
            return name;
        }

-        var mangled = cache.props.get(name);
+        var mangled = cache.get(name);
        if (!mangled) {
            if (debug) {
                // debug mode: use a prefix and suffix to preserve readability, e.g. o.foo -> o._$foo$NNN_.
@@ -233,11 +236,11 @@ function mangle_properties(ast, options) {
            // either debug mode is off, or it is on and we could not use the mangled name
            if (!mangled) {
                do {
-                    mangled = base54(++cache.cname);
+                    mangled = base54(++cname);
                } while (!can_mangle(mangled));
            }

-            cache.props.set(name, mangled);
+            cache.set(name, mangled);
        }
        return mangled;
    }
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -43,9 +43,10 @@

 "use strict";

-function SymbolDef(scope, orig) {
+function SymbolDef(scope, orig, init) {
    this.name = orig.name;
    this.orig = [ orig ];
+    this.init = init;
    this.eliminated = 0;
    this.scope = scope;
    this.references = [];
@@ -175,7 +176,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            node.references = [];
        }
        if (node instanceof AST_SymbolLambda) {
-            defun.def_function(node);
+            defun.def_function(node, node.name == "arguments" ? undefined : defun);
        }
        else if (node instanceof AST_SymbolDefun) {
            // Careful here, the scope where this should be defined is
@@ -183,10 +184,10 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            // scope when we encounter the AST_Defun node (which is
            // instanceof AST_Scope) but we get to the symbol a bit
            // later.
-            mark_export((node.scope = defun.parent_scope.get_defun_scope()).def_function(node), 1);
+            mark_export((node.scope = defun.parent_scope.get_defun_scope()).def_function(node, defun), 1);
        }
        else if (node instanceof AST_SymbolClass) {
-            mark_export(defun.def_variable(node), 1);
+            mark_export(defun.def_variable(node, defun), 1);
        }
        else if (node instanceof AST_SymbolImport) {
            scope.def_variable(node);
@@ -194,12 +195,17 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
        else if (node instanceof AST_SymbolDefClass) {
            // This deals with the name of the class being available
            // inside the class.
-            mark_export((node.scope = defun.parent_scope).def_function(node), 1);
+            mark_export((node.scope = defun.parent_scope).def_function(node, defun), 1);
        }
        else if (node instanceof AST_SymbolVar
            || node instanceof AST_SymbolLet
            || node instanceof AST_SymbolConst) {
-            var def = ((node instanceof AST_SymbolBlockDeclaration) ? scope : defun).def_variable(node);
+            var def;
+            if (node instanceof AST_SymbolBlockDeclaration) {
+                def = scope.def_variable(node);
+            } else {
+                def = defun.def_variable(node, node.TYPE == "SymbolVar" ? null : undefined);
+            }
            if (!all(def.orig, function(sym) {
                if (sym === node) return true;
                if (node instanceof AST_SymbolBlockDeclaration) {
@@ -284,6 +290,10 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            }
            node.thedef = sym;
            node.reference(options);
+            if (node.scope.is_block_scope()
+                && !(sym.orig[0] instanceof AST_SymbolBlockDeclaration)) {
+                node.scope = node.scope.get_defun_scope();
+            }
            return true;
        }
        // ensure mangling works if catch reuses a scope variable
@@ -330,10 +340,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            });
        }
    }
-
-    if (options.cache) {
-        this.cname = options.cache.cname;
-    }
 });

 AST_Toplevel.DEFMETHOD("def_global", function(node){
@@ -403,29 +409,32 @@ AST_Scope.DEFMETHOD("find_variable", function(name){
        || (this.parent_scope && this.parent_scope.find_variable(name));
 });

-AST_Scope.DEFMETHOD("def_function", function(symbol){
-    var def = this.def_variable(symbol);
+AST_Scope.DEFMETHOD("def_function", function(symbol, init){
+    var def = this.def_variable(symbol, init);
+    if (!def.init) def.init = init;
    this.functions.set(symbol.name, def);
    return def;
 });

-AST_Scope.DEFMETHOD("def_variable", function(symbol){
-    var def;
-    if (!this.variables.has(symbol.name)) {
-        def = new SymbolDef(this, symbol);
+AST_Scope.DEFMETHOD("def_variable", function(symbol, init){
+    var def = this.variables.get(symbol.name);
+    if (def) {
+        def.orig.push(symbol);
+        if (def.init && (def.scope !== symbol.scope || def.init instanceof AST_Function)) {
+            def.init = init;
+        }
+    } else {
+        def = new SymbolDef(this, symbol, init);
        this.variables.set(symbol.name, def);
        def.global = !this.parent_scope;
-    } else {
-        def = this.variables.get(symbol.name);
-        def.orig.push(symbol);
    }
    return symbol.thedef = def;
 });

-AST_Scope.DEFMETHOD("next_mangled", function(options){
-    var ext = this.enclosed;
+function next_mangled(scope, options) {
+    var ext = scope.enclosed;
    out: while (true) {
-        var m = base54(++this.cname);
+        var m = base54(++scope.cname);
        if (!is_identifier(m)) continue; // skip over "do"

        // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
@@ -442,6 +451,18 @@ AST_Scope.DEFMETHOD("next_mangled", function(options){
        }
        return m;
    }
+}
+
+AST_Scope.DEFMETHOD("next_mangled", function(options){
+    return next_mangled(this, options);
+});
+
+AST_Toplevel.DEFMETHOD("next_mangled", function(options){
+    var name;
+    do {
+        name = next_mangled(this, options);
+    } while (member(name, this.mangled_names));
+    return name;
 });

 AST_Function.DEFMETHOD("next_mangled", function(options, def){
@@ -455,7 +476,7 @@ AST_Function.DEFMETHOD("next_mangled", function(options, def){
    var tricky_name = tricky_def ? tricky_def.mangled_name || tricky_def.name : null;

    while (true) {
-        var name = AST_Lambda.prototype.next_mangled.call(this, options, def);
+        var name = next_mangled(this, options);
        if (!tricky_name || tricky_name != name)
            return name;
    }
@@ -507,8 +528,14 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
    var lname = -1;
    var to_mangle = [];

+    var mangled_names = this.mangled_names = [];
    if (options.cache) {
        this.globals.each(collect);
+        if (options.cache.props) {
+            options.cache.props.each(function(mangled_name) {
+                push_uniq(mangled_names, mangled_name);
+            });
+        }
    }

    var tw = new TreeWalker(function(node, descend){
@@ -542,10 +569,6 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
        def.mangle(options);
    });

-    if (options.cache) {
-        options.cache.cname = this.cname;
-    }
-
    function collect(symbol) {
        if (!member(symbol.name, options.reserved)) {
            to_mangle.push(symbol);
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "https://github.com/mishoo/UglifyJS2/tree/harmony",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.3.0",
+  "version": "3.3.5",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/benchmark.js
+++ b/test/benchmark.js
@@ -21,6 +21,7 @@ var urls = [
    "http://builds.emberjs.com/tags/v2.11.0/ember.prod.js",
    "https://cdn.jsdelivr.net/lodash/4.17.4/lodash.js",
    "https://cdnjs.cloudflare.com/ajax/libs/d3/4.5.0/d3.js",
+    "https://raw.githubusercontent.com/kangax/html-minifier/v3.5.7/dist/htmlminifier.js",
 ];
 var results = {};
 var remaining = 2 * urls.length;
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -4180,10 +4180,9 @@ recursive_function_replacement: {
        console.log(f(c));
    }
    expect: {
-        function f(n) {
-            return x(y(f(n)));
-        }
-        console.log(f(c));
+        console.log(function n(o) {
+            return x(y(n(o)));
+        }(c));
    }
 }

--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -1203,3 +1203,24 @@ issue_2560: {
        "2",
    ]
 }
+
+hoist_decl: {
+    options = {
+        conditionals: true,
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        if (x()) {
+            var a;
+            y();
+        } else {
+            z();
+            var b;
+        }
+    }
+    expect: {
+        var a, b;
+        x() ? y() : z();
+    }
+}
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -1047,3 +1047,84 @@ issue_2597: {
    }
    expect_stdout: "PASS"
 }
+
+issue_2666: {
+    options = {
+        dead_code: true,
+    }
+    input: {
+        function f(a) {
+            return a = {
+                p: function() {
+                    return a;
+                }
+            };
+        }
+        console.log(typeof f().p());
+    }
+    expect: {
+        function f(a) {
+            return a = {
+                p: function() {
+                    return a;
+                }
+            };
+        }
+        console.log(typeof f().p());
+    }
+    expect_stdout: "object"
+}
+
+issue_2692: {
+    options = {
+        dead_code: true,
+        reduce_vars: false,
+    }
+    input: {
+        function f(a) {
+            return a = g;
+            function g() {
+                return a;
+            }
+        }
+        console.log(typeof f()());
+    }
+    expect: {
+        function f(a) {
+            return a = g;
+            function g() {
+                return a;
+            }
+        }
+        console.log(typeof f()());
+    }
+    expect_stdout: "function"
+}
+
+issue_2701: {
+    options = {
+        dead_code: true,
+        inline: false,
+    }
+    input: {
+        function f(a) {
+            return a = function() {
+                return function() {
+                    return a;
+                };
+            }();
+        }
+        console.log(typeof f()());
+    }
+    expect: {
+        function f(a) {
+            return a = function() {
+                return function() {
+                    return a;
+                };
+            }();
+        }
+        console.log(typeof f()());
+    }
+    expect_stdout: "function"
+}
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -1237,6 +1237,7 @@ var_catch_toplevel: {
    options = {
        conditionals: true,
        negate_iife: true,
+        passes: 2,
        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
@@ -1786,3 +1787,234 @@ issue_2418_5: {
        (function f() {});
    }
 }
+
+defun_lambda_same_name: {
+    options = {
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f(n) {
+            return n ? n * f(n - 1) : 1;
+        }
+        console.log(function f(n) {
+            return n ? n * f(n - 1) : 1;
+        }(5));
+    }
+    expect: {
+        console.log(function f(n) {
+            return n ? n * f(n - 1) : 1;
+        }(5));
+    }
+    expect_stdout: "120"
+}
+
+issue_2660_1: {
+    options = {
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 2;
+        function f(b) {
+            return b && f() || a--;
+        }
+        f(1);
+        console.log(a);
+    }
+    expect: {
+        var a = 2;
+        (function f(b) {
+            return b && f() || a--;
+        })(1);
+        console.log(a);
+    }
+    expect_stdout: "1"
+}
+
+issue_2660_2: {
+    options = {
+        collapse_vars: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        function f(b) {
+            b && f();
+            --a, a.toString();
+        }
+        f();
+        console.log(a);
+    }
+    expect: {
+        var a = 1;
+        (function f(b) {
+            b && f(),
+            (--a).toString();
+        })(),
+        console.log(a);
+    }
+    expect_stdout: "0"
+}
+
+issue_2665: {
+    options = {
+        evaluate: true,
+        inline: true,
+        keep_fargs: false,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        function g() {
+            a-- && g();
+        }
+        typeof h == "function" && h();
+        function h() {
+            typeof g == "function" && g();
+        }
+        console.log(a);
+    }
+    expect: {
+        var a = 1;
+        !function g() {
+            a-- && g();
+        }();
+        console.log(a);
+    }
+    expect_stdout: "-1"
+}
+
+double_assign_1: {
+    options = {
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        function f1() {
+            var a = {};
+            var a = [];
+            return a;
+        }
+        function f2() {
+            var a = {};
+            a = [];
+            return a;
+        }
+        function f3() {
+            a = {};
+            var a = [];
+            return a;
+        }
+        function f4(a) {
+            a = {};
+            a = [];
+            return a;
+        }
+        function f5(a) {
+            var a = {};
+            a = [];
+            return a;
+        }
+        function f6(a) {
+            a = {};
+            var a = [];
+            return a;
+        }
+        console.log(f1(), f2(), f3(), f4(), f5(), f6());
+    }
+    expect: {
+        function f1() {
+            return [];
+        }
+        function f2() {
+            var a;
+            a = [];
+            return a;
+        }
+        function f3() {
+            return [];
+        }
+        function f4(a) {
+            a = [];
+            return a;
+        }
+        function f5(a) {
+            a = [];
+            return a;
+        }
+        function f6(a) {
+            a = [];
+            return a;
+        }
+        console.log(f1(), f2(), f3(), f4(), f5(), f6());
+    }
+    expect_stdout: true
+}
+
+double_assign_2: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        for (var i = 0; i < 2; i++)
+            a = void 0, a = {}, console.log(a);
+        var a;
+    }
+    expect: {
+        for (var i = 0; i < 2; i++)
+            void 0, a = {}, console.log(a);
+        var a;
+    }
+}
+
+double_assign_3: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        for (var i = 0; i < 2; i++)
+            a = void 0, a = { a: a }, console.log(a);
+        var a;
+    }
+    expect: {
+        for (var i = 0; i < 2; i++)
+            a = void 0, a = { a: a }, console.log(a);
+        var a;
+    }
+}
+
+cascade_drop_assign: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a, b = a = "PASS";
+        console.log(b);
+    }
+    expect: {
+        var b = "PASS";
+        console.log(b);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -800,12 +800,12 @@ issue_2601_1: {
    expect: {
        var a = "FAIL";
        (function() {
+            var b;
            b = "foo",
            function(b) {
                b && b();
            }(),
            b && (a = "PASS");
-            var b;
        })(),
        console.log(a);
    }
@@ -1318,7 +1318,7 @@ issue_2630_1: {
    expect: {
        var c = 0;
        (function() {
-            while (c++, void (c = 1 + c));
+            while (void (c = 1 + ++c));
        })(),
        console.log(c);
    }
@@ -1332,6 +1332,7 @@ issue_2630_2: {
        passes: 2,
        reduce_vars: true,
        sequences: true,
+        side_effects: true,
        unused: true,
    }
    input: {
@@ -1349,7 +1350,7 @@ issue_2630_2: {
    expect: {
        var c = 0;
        !function() {
-            while (c += 1, void (c = 1 + c));
+            while (void (c = 1 + (c += 1)));
        }(), console.log(c);
    }
    expect_stdout: "2"
@@ -1378,11 +1379,10 @@ issue_2630_3: {
    expect: {
        var x = 2, a = 1;
        (function() {
-            function f1(a) {
+            (function f1(a) {
                f2();
                --x >= 0 && f1({});
-            }
-            f1(a++);
+            })(a++);
            function f2() {
                a++;
            }
@@ -1450,9 +1450,670 @@ issue_2630_5: {
        !function() {
            do {
                c *= 10;
-            } while (c += 3, (c = 2 + c) < 100);
+            } while ((c = 2 + (c += 3)) < 100);
        }();
        console.log(c);
    }
    expect_stdout: "155"
 }
+
+issue_2647_1: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function(n, o = "FAIL") {
+            console.log(n);
+        })("PASS");
+        (function(n, o = "PASS") {
+            console.log(o);
+        })("FAIL");
+        (function(o = "PASS") {
+            console.log(o);
+        })();
+        (function(n, {o = "FAIL"}) {
+            console.log(n);
+        })("PASS", {});
+    }
+    expect: {
+        console.log("PASS");
+        (function(n, o = "PASS") {
+            console.log(o);
+        })();
+        (function(o = "PASS") {
+            console.log(o);
+        })();
+        (function(n, {o = "FAIL"}) {
+            console.log("PASS");
+        })(0, {});
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+    ]
+    node_version: ">=6"
+}
+
+issue_2647_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function foo(x) {
+                return x.toUpperCase();
+            }
+            console.log((() => foo("pass"))());
+        }());
+    }
+    expect: {
+        (function() {
+            console.log((() => (x = "pass", x.toUpperCase()))());
+            var x;
+        })();
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+issue_2647_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function foo(x) {
+                return x.toUpperCase();
+            }
+            console.log((() => {
+                return foo("pass");
+            })());
+        }());
+    }
+    expect: {
+        (function() {
+            console.log("pass".toUpperCase());
+        })();
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
+recursive_inline_1: {
+    options = {
+        inline: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            h();
+        }
+        function g(a) {
+            a();
+        }
+        function h(b) {
+            g();
+            if (b) x();
+        }
+    }
+    expect: {}
+}
+
+recursive_inline_2: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f(n) {
+            return n ? n * f(n - 1) : 1;
+        }
+        console.log(f(5));
+    }
+    expect: {
+        console.log(function f(n) {
+            return n ? n * f(n - 1) : 1;
+        }(5));
+    }
+    expect_stdout: "120"
+}
+
+issue_2657: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        sequences: true,
+        unused: true,
+    }
+    input: {
+        "use strict";
+        console.log(function f() {
+            return h;
+            function g(b) {
+                return b || b();
+            }
+            function h(a) {
+                g(a);
+                return a;
+            }
+        }()(42));
+    }
+    expect: {
+        "use strict";
+        console.log(function(a) {
+            return b = a, b || b(), a;
+            var b;
+        }(42));
+    }
+    expect_stdout: "42"
+}
+
+issue_2663_1: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var i, o = {};
+            function createFn(j) {
+                return function() {
+                    console.log(j);
+                };
+            }
+            for (i in { a: 1, b: 2, c: 3 })
+                o[i] = createFn(i);
+            for (i in o)
+                o[i]();
+        })();
+    }
+    expect: {
+        (function() {
+            var i, o = {};
+            function createFn(j) {
+                return function() {
+                    console.log(j);
+                };
+            }
+            for (i in { a: 1, b: 2, c: 3 })
+                o[i] = createFn(i);
+            for (i in o)
+                o[i]();
+        })();
+    }
+    expect_stdout: [
+        "a",
+        "b",
+        "c",
+    ]
+}
+
+issue_2663_2: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var i;
+            function fn(j) {
+                return function() {
+                    console.log(j);
+                }();
+            }
+            for (i in { a: 1, b: 2, c: 3 })
+                fn(i);
+        })();
+    }
+    expect: {
+        (function() {
+            var i;
+            for (i in { a: 1, b: 2, c: 3 })
+                j = i, console.log(j);
+            var j;
+        })();
+    }
+    expect_stdout: [
+        "a",
+        "b",
+        "c",
+    ]
+}
+
+issue_2663_3: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function () {
+            var outputs = [
+                { type: 0, target: null, eventName: "ngSubmit", propName: null },
+                { type: 0, target: null, eventName: "submit", propName: null },
+                { type: 0, target: null, eventName: "reset", propName: null },
+            ];
+            function listenToElementOutputs(outputs) {
+                var handlers = [];
+                for (var i = 0; i < outputs.length; i++) {
+                    var output = outputs[i];
+                    var handleEventClosure = renderEventHandlerClosure(output.eventName);
+                    handlers.push(handleEventClosure)
+                }
+                var target, name;
+                return handlers;
+            }
+            function renderEventHandlerClosure(eventName) {
+                return function () {
+                    return console.log(eventName);
+                };
+            }
+            listenToElementOutputs(outputs).forEach(function (handler) {
+                return handler()
+            });
+        })();
+    }
+    expect: {
+        (function() {
+            function renderEventHandlerClosure(eventName) {
+                return function() {
+                    return console.log(eventName);
+                };
+            }
+            (function(outputs) {
+                var handlers = [];
+                for (var i = 0; i < outputs.length; i++) {
+                    var output = outputs[i];
+                    var handleEventClosure = renderEventHandlerClosure(output.eventName);
+                    handlers.push(handleEventClosure);
+                }
+                return handlers;
+            })([ {
+                type: 0,
+                target: null,
+                eventName: "ngSubmit",
+                propName: null
+            }, {
+                type: 0,
+                target: null,
+                eventName: "submit",
+                propName: null
+            }, {
+                type: 0,
+                target: null,
+                eventName: "reset",
+                propName: null
+            } ]).forEach(function(handler) {
+                return handler();
+            });
+        })();
+    }
+    expect_stdout: [
+        "ngSubmit",
+        "submit",
+        "reset",
+    ]
+}
+
+duplicate_argnames: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = "PASS";
+        function f(b, b, b) {
+            b && (a = "FAIL");
+        }
+        f(0, console);
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        console, b && (a = "FAIL");
+        var b;
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+loop_init_arg: {
+    options = {
+        inline: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = "PASS";
+        for (var k in "12") (function (b) {
+            (b >>= 1) && (a = "FAIL"), b = 2;
+        })();
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        for (var k in "12")
+            b = void 0, (b >>= 1) && (a = "FAIL"), b = 2;
+        var b;
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+inline_false: {
+    options = {
+        inline: false,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+inline_0: {
+    options = {
+        inline: 0,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+inline_1: {
+    options = {
+        inline: 1,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        console.log(1);
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+inline_2: {
+    options = {
+        inline: 2,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        console.log(1);
+        a = 2, console.log(a);
+        var a;
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+inline_3: {
+    options = {
+        inline: 3,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        console.log(1);
+        a = 2, console.log(a);
+        var a;
+        b = 3, c = b, console.log(c);
+        var b, c;
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+inline_true: {
+    options = {
+        inline: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            console.log(1);
+        })();
+        (function(a) {
+            console.log(a);
+        })(2);
+        (function(b) {
+            var c = b;
+            console.log(c);
+        })(3);
+    }
+    expect: {
+        console.log(1);
+        a = 2, console.log(a);
+        var a;
+        b = 3, c = b, console.log(c);
+        var b, c;
+    }
+    expect_stdout: [
+        "1",
+        "2",
+        "3",
+    ]
+}
+
+use_before_init_in_loop: {
+    options = {
+        inline: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = "PASS";
+        for (var b = 2; --b >= 0;) (function() {
+            var c = function() {
+                return 1;
+            }(c && (a = "FAIL"));
+        })();
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        for (var b = 2; --b >= 0;)
+            c = void 0, c = (c && (a = "FAIL"), 1);
+        var c;
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+duplicate_arg_var: {
+    options = {
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        console.log(function(b) {
+            return b;
+            var b;
+        }("PASS"));
+    }
+    expect: {
+        console.log((b = "PASS", b));
+        var b;
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2737_1: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(a) {
+            while (a());
+        })(function f() {
+            console.log(typeof f);
+        });
+    }
+    expect: {
+        (function(a) {
+            while (a());
+        })(function f() {
+            console.log(typeof f);
+        });
+    }
+    expect_stdout: "function"
+}
+
+issue_2737_2: {
+    options = {
+        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 qux() {
+            return console.log("PASS"), qux;
+        });
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/harmony.js
+++ b/test/compress/harmony.js
@@ -1197,3 +1197,18 @@ class_method_using_arguments: {
    expect_stdout: "PASS"
    node_version: ">=6"
 }
+
+issue_2676: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        class A {}
+        A.a = 42;
+    }
+    expect: {
+        (class {}).a = 42;
+    }
+}
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -827,3 +827,73 @@ issue_2519: {
    }
    expect_stdout: "5.5"
 }
+
+toplevel_const: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: false,
+    }
+    input: {
+        const a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect: {
+        const a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect_stdout: "3"
+}
+
+toplevel_let: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: false,
+    }
+    input: {
+        let a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect: {
+        let a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect_stdout: "3"
+    node_version: ">=6"
+}
+
+toplevel_var: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+        toplevel: false,
+    }
+    input: {
+        var a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect: {
+        var a = {
+            b: 1,
+            c: 2
+        };
+        console.log(a.b + a.c);
+    }
+    expect_stdout: "3"
+}
--- a/test/compress/if_return.js
+++ b/test/compress/if_return.js
@@ -384,3 +384,73 @@ issue_1317_strict: {
    expect_stdout: "1"
    node_version: ">=4"
 }
+
+if_var_return: {
+    options = {
+        conditionals: true,
+        if_return: true,
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        function f() {
+            var a;
+            return;
+            var b;
+        }
+        function g() {
+            var a;
+            if (u()) {
+                var b;
+                return v();
+                var c;
+            }
+            var d;
+            if (w()) {
+                var e;
+                return x();
+                var f;
+            } else {
+                var g;
+                y();
+                var h;
+            }
+            var i;
+            z();
+            var j;
+        }
+    }
+    expect: {
+        function f() {
+            var a, b;
+        }
+        function g() {
+            var a, b, c, d, e, f, g, h, i, j;
+            return u() ? v() : w() ? x() : (y(), z(), void 0);
+        }
+    }
+}
+
+if_if_return_return: {
+    options = {
+        conditionals: true,
+        if_return: true,
+    }
+    input: {
+        function f(a, b) {
+            if (a) {
+                if (b)
+                    return b;
+                return;
+            }
+            g();
+        }
+    }
+    expect: {
+        function f(a, b) {
+            if (a)
+                return b || void 0;
+            g();
+        }
+    }
+}
--- a/test/compress/issue-2652.js
+++ b/test/compress/issue-2652.js
@@ -0,0 +1,33 @@
+insert_semicolon: {
+    beautify = {
+        beautify: true,
+        comments: "all",
+    }
+    input: {
+        var a
+        /* foo */ var b
+    }
+    expect_exact: [
+        "var a",
+        "/* foo */;",
+        "",
+        "var b;",
+    ]
+}
+
+unary_postfix: {
+    beautify = {
+        beautify: true,
+        comments: "all",
+    }
+    input: {
+        a
+        /* foo */++b
+    }
+    expect_exact: [
+        "a",
+        "/* foo */;",
+        "",
+        "++b;",
+    ]
+}
--- a/test/compress/issue-269.js
+++ b/test/compress/issue-269.js
@@ -64,3 +64,27 @@ strings_concat: {
 		);
 	}
 }
+
+regexp: {
+	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:78,2]',
+	]
+}
--- a/test/compress/issue-2719.js
+++ b/test/compress/issue-2719.js
@@ -0,0 +1,32 @@
+warn: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            return g();
+        }
+        function g() {
+            return g["call" + "er"].arguments;
+        }
+        // 3
+        console.log(f(1, 2, 3).length);
+    }
+    expect: {
+        // TypeError: Cannot read property 'arguments' of null
+        console.log(function g() {
+            return g.caller.arguments;
+        }().length);
+    }
+    expect_warnings: [
+        "WARN: Function.protoype.caller not supported [test/compress/issue-2719.js:17,19]",
+        "WARN: Function.protoype.arguments not supported [test/compress/issue-2719.js:17,19]",
+    ]
+}
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -569,12 +569,18 @@ native_prototype: {
    }
    input: {
        Array.prototype.splice.apply(a, [1, 2, b, c]);
+        Function.prototype.call.apply(console.log, console, [ "foo" ]);
+        Number.prototype.toFixed.call(Math.PI, 2);
        Object.prototype.hasOwnProperty.call(d, "foo");
+        RegExp.prototype.test.call(/foo/, "bar");
        String.prototype.indexOf.call(e, "bar");
    }
    expect: {
        [].splice.apply(a, [1, 2, b, c]);
+        (function() {}).call.apply(console.log, console, [ "foo" ]);
+        0..toFixed.call(Math.PI, 2);
        ({}).hasOwnProperty.call(d, "foo");
+        /t/.test.call(/foo/, "bar");
        "".indexOf.call(e, "bar");
    }
 }
--- a/test/compress/pure_funcs.js
+++ b/test/compress/pure_funcs.js
@@ -414,3 +414,124 @@ issue_2638: {
        "/* */(a()||b())(c(),d());",
    ]
 }
+
+issue_2705_1: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a();
+        /*@__PURE__*/ (new b());
+        new (/*@__PURE__*/ c)();
+        (/*@__PURE__*/ new d());
+    }
+    expect_exact: [
+        "new/* */c;",
+    ]
+}
+
+issue_2705_2: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a(1)(2)(3);
+        /*@__PURE__*/ new (b(1))(2)(3);
+        /*@__PURE__*/ new (c(1)(2))(3);
+        /*@__PURE__*/ new (d(1)(2)(3));
+        new (/*@__PURE__*/ e)(1)(2)(3);
+        (/*@__PURE__*/ new f(1))(2)(3);
+        (/*@__PURE__*/ new g(1)(2))(3);
+        (/*@__PURE__*/ new h(1)(2)(3));
+    }
+    expect_exact: [
+        "new/* */e(1)(2)(3);",
+        "/* */new f(1)(2)(3);",
+        "/* */new g(1)(2)(3);",
+    ]
+}
+
+issue_2705_3: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a.x(1).y(2).z(3);
+        /*@__PURE__*/ new (b.x)(1).y(2).z(3);
+        /*@__PURE__*/ new (c.x(1)).y(2).z(3);
+        /*@__PURE__*/ new (d.x(1).y)(2).z(3);
+        /*@__PURE__*/ new (e.x(1).y(2)).z(3);
+        /*@__PURE__*/ new (f.x(1).y(2).z)(3);
+        /*@__PURE__*/ new (g.x(1).y(2).z(3));
+        new (/*@__PURE__*/ h).x(1).y(2).z(3);
+        /* */ new (/*@__PURE__*/ i.x)(1).y(2).z(3);
+        (/*@__PURE__*/ new j.x(1)).y(2).z(3);
+        (/*@__PURE__*/ new k.x(1).y)(2).z(3);
+        (/*@__PURE__*/ new l.x(1).y(2)).z(3);
+        (/*@__PURE__*/ new m.x(1).y(2).z)(3);
+        (/*@__PURE__*/ new n.x(1).y(2).z(3));
+    }
+    expect_exact: [
+        "new/* */h.x(1).y(2).z(3);",
+        "/* */new/* */i.x(1).y(2).z(3);",
+        "/* */new j.x(1).y(2).z(3);",
+        "/* */new k.x(1).y(2).z(3);",
+        "/* */new l.x(1).y(2).z(3);",
+        "/* */new m.x(1).y(2).z(3);",
+    ]
+}
+
+issue_2705_4: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        (/*@__PURE__*/ new x(), y());
+        (w(), /*@__PURE__*/ new x(), y());
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2705_5: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        [ /*@__PURE__*/ new x() ];
+        [ /*@__PURE__*/ new x(), y() ];
+        [ w(), /*@__PURE__*/ new x(), y() ];
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2705_6: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/new (g() || h())(x(), y());
+        /* */ new (/*@__PURE__*/ (a() || b()))(c(), d());
+    }
+    expect_exact: [
+        "/* */x(),y();",
+        "/* */new(/* */a()||b())(c(),d());",
+    ]
+}
--- a/test/compress/pure_getters.js
+++ b/test/compress/pure_getters.js
@@ -348,6 +348,57 @@ set_immutable_4: {
    expect_stdout: true
 }

+set_immutable_5: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        "use strict";
+        var a = 1;
+        a.foo += "";
+        if (a.foo) console.log("FAIL");
+        else console.log("PASS");
+    }
+    expect: {
+        "use strict";
+        1..foo += "";
+        1..foo ? console.log("FAIL") : console.log("PASS");
+    }
+    expect_stdout: true
+}
+
+set_immutable_6: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        a.foo += "";
+        if (a.foo) console.log("FAIL");
+        else console.log("PASS");
+    }
+    expect: {
+        1..foo ? console.log("FAIL") : console.log("PASS");
+    }
+    expect_stdout: true
+}
+
 set_mutable_1: {
    options = {
        collapse_vars: true,
@@ -735,3 +786,35 @@ issue_2313_7: {
    expect_stdout: "2 1"
    node_version: ">=6"
 }
+
+issue_2678: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        var a = 1, c = "FAIL";
+        (function f() {
+            (a-- && f()).p;
+            return {
+                get p() {
+                    c = "PASS";
+                }
+            };
+        })();
+        console.log(c);
+    }
+    expect: {
+        var a = 1, c = "FAIL";
+        (function f() {
+            (a-- && f()).p;
+            return {
+                get p() {
+                    c = "PASS";
+                }
+            };
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -299,7 +299,7 @@ unsafe_evaluate_modified: {
        console.log(function(){ var o={p:1}; o.p++; console.log(o.p); return o.p; }());
        console.log(function(){ var o={p:2}; --o.p; console.log(o.p); return o.p; }());
        console.log(function(){ var o={p:3}; o.p += ""; console.log(o.p); return o.p; }());
-        console.log(function(){ var o={p:4}; o = {}; console.log(o.p); return o.p; }());
+        console.log(function(){ var o; o = {}; console.log(o.p); return o.p; }());
        console.log(function(){ var o={p:5}; o.p = -9; console.log(o.p); return o.p; }());
        function inc() { this.p++; }
        console.log(function(){ var o={p:6}; inc.call(o); console.log(o.p); return o.p; }());
@@ -1355,10 +1355,9 @@ defun_inline_1: {
        function f() {
            return function(b) {
                return b;
-            }(2) + h();
-            function h() {
+            }(2) + function h() {
                return h();
-            }
+            }();
        }
    }
 }
@@ -1382,12 +1381,11 @@ defun_inline_2: {
    }
    expect: {
        function f() {
-            function h() {
-                return h();
-            }
            return function(b) {
                return b;
-            }(2) + h();
+            }(2) + function h() {
+                return h();
+            }();
        }
    }
 }
@@ -1557,10 +1555,10 @@ defun_label: {
        !function() {
            console.log(function(a) {
                L: {
-                    if (a) break L;
+                    if (2) break L;
                    return 1;
                }
-            }(2));
+            }());
        }();
    }
    expect_stdout: true
@@ -2314,8 +2312,7 @@ delay_def: {
    }
    expect: {
        function f() {
-            return a;
-            var a;
+            return;
        }
        function g() {
            return a;
@@ -2326,6 +2323,28 @@ delay_def: {
    expect_stdout: true
 }

+delay_def_lhs: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function() {
+            long_name++;
+            return long_name;
+            var long_name;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            long_name++;
+            return long_name;
+            var long_name;
+        }());
+    }
+    expect_stdout: "NaN"
+}
+
 booleans: {
    options = {
        booleans: true,
@@ -3368,9 +3387,7 @@ obj_for_1: {
            console.log(i);
    }
    expect: {
-        // TODO make this work on harmony
-        var o = { a: 1 };
-        for (var i = o.a--; i; i--)
+        for (var i = { a: 1 }.a--; i; i--)
            console.log(i);
    }
    expect_stdout: "1"
@@ -3409,9 +3426,7 @@ array_forin_1: {
            console.log(b);
    }
    expect: {
-        // TODO make this work on harmony
-        var a = [ 1, 2, 3 ];
-        for (var b in a)
+        for (var b in [ 1, 2, 3 ])
            console.log(b);
    }
    expect_stdout: [
@@ -3456,9 +3471,7 @@ array_forof_1: {
            console.log(b);
    }
    expect: {
-        // TODO make this work on harmony
-        var a = [ 1, 2, 3 ];
-        for (var b of a)
+        for (var b of [ 1, 2, 3 ])
            console.log(b);
    }
    expect_stdout: [
@@ -5162,10 +5175,8 @@ escape_local_throw: {
    }
    expect: {
        function baz() {
-            // TODO: improve to match `master`
-            function foo() {}
            try {
-                throw foo;
+                throw function() {};
            } catch (bar) {
                return bar;
            }
@@ -5446,3 +5457,355 @@ issue_2598: {
    }
    expect_stdout: "true"
 }
+
+issue_2669: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        let foo;
+        console.log(([ foo ] = [ "PASS" ]) && foo);
+    }
+    expect: {
+        let foo;
+        console.log(([ foo ] = [ "PASS" ]) && foo);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=6"
+}
+
+issue_2670: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        const obj = {};
+        obj.prop = "PASS";
+        const {prop: value} = obj;
+        console.log(value);
+    }
+    expect: {
+        const obj = {};
+        obj.prop = "PASS";
+        const {prop: value} = obj;
+        console.log(value);
+    }
+    expect_stdout: "PASS"
+    node_version: ">=6"
+}
+
+var_if: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            if (x()) {
+                var a;
+                if (!g) a = true;
+                if (a) g();
+            }
+        }
+    }
+    expect: {
+        function f() {
+            if (x()) {
+                var a;
+                if (!g) a = true;
+                if (a) g();
+            }
+        }
+    }
+}
+
+defun_assign: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        console.log(typeof a);
+        a = 42;
+        console.log(typeof a);
+        function a() {}
+        console.log(typeof a);
+    }
+    expect: {
+        console.log(typeof a);
+        a = 42;
+        console.log(typeof a);
+        function a() {}
+        console.log(typeof a);
+    }
+    expect_stdout: [
+        "function",
+        "number",
+        "number",
+    ]
+}
+
+defun_var_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        var a = 42, b;
+        function a() {}
+        function b() {}
+        console.log(typeof a, typeof b);
+    }
+    expect: {
+        var a = 42;
+        function a() {}
+        console.log(typeof a, "function");
+    }
+    expect_stdout: "number function"
+}
+
+defun_var_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        function a() {}
+        function b() {}
+        var a = 42, b;
+        console.log(typeof a, typeof b);
+    }
+    expect: {
+        function a() {}
+        var a = 42;
+        console.log(typeof a, "function");
+    }
+    expect_stdout: "number function"
+}
+
+defun_var_3: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        function a() {}
+        function b() {}
+        console.log(typeof a, typeof b);
+        var a = 42, b;
+    }
+    expect: {
+        function a() {}
+        console.log(typeof a, "function");
+        var a = 42;
+    }
+    expect_stdout: "function function"
+}
+
+defun_catch_1: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function a() {}
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect: {
+        // TODO: drop unused AST_Defun
+        function a() {}
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect_stdout: "42"
+}
+
+defun_catch_2: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            function a() {}
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect: {
+        try {
+            // TODO: drop unused AST_Defun
+            function a() {}
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect_stdout: "42"
+}
+
+defun_catch_3: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            throw 42;
+            function a() {}
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect: {
+        try {
+            throw 42;
+            // TODO: drop unused AST_Defun
+            function a() {}
+        } catch (a) {
+            console.log(a);
+        }
+    }
+    expect_stdout: "42"
+}
+
+defun_catch_4: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            throw 42;
+        } catch (a) {
+            function a() {}
+            console.log(a);
+        }
+    }
+    expect: {
+        try {
+            throw 42;
+        } catch (a) {
+            function a() {}
+            console.log(a);
+        }
+    }
+    expect_stdout: true
+}
+
+defun_catch_5: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+            function a() {}
+        }
+    }
+    expect: {
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+            function a() {}
+        }
+    }
+    expect_stdout: true
+}
+
+defun_catch_6: {
+    options = {
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+        function a() {}
+    }
+    expect: {
+        try {
+            throw 42;
+        } catch (a) {
+            console.log(a);
+        }
+        // TODO: drop unused AST_Defun
+        function a() {}
+    }
+    expect_stdout: "42"
+}
+
+duplicate_lambda_defun_name_1: {
+    options = {
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function f(a) {
+            function f() {}
+            return f.length;
+        }());
+    }
+    expect: {
+        console.log(function f(a) {
+            function f() {}
+            return f.length;
+        }());
+    }
+    expect_stdout: "0"
+}
+
+duplicate_lambda_defun_name_2: {
+    options = {
+        passes: 2,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function f(a) {
+            function f() {}
+            return f.length;
+        }());
+    }
+    expect: {
+        console.log(function(a) {
+            return function() {}.length;
+        }());
+    }
+    expect_stdout: "0"
+}
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -820,3 +820,66 @@ cascade_assignment_in_return: {
        }
    }
 }
+
+hoist_defun: {
+    options = {
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        x();
+        function f() {}
+        y();
+    }
+    expect: {
+        function f() {}
+        x(), y();
+    }
+}
+
+hoist_decl: {
+    options = {
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        var a;
+        w();
+        var b = x();
+        y();
+        for (var c; 0;) z();
+        var d;
+    }
+    expect: {
+        var a;
+        w();
+        var b = x(), c, d;
+        for (y(); 0;) z();
+    }
+}
+
+for_init_var: {
+    options = {
+        join_vars: true,
+        unused: false,
+    }
+    input: {
+        var a = "PASS";
+        (function() {
+            var b = 42;
+            for (var c = 5; c > 0;) c--;
+            a = "FAIL";
+            var a;
+        })();
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        (function() {
+            for (var b = 42, c = 5, a; c > 0;) c--;
+            a = "FAIL";
+        })();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/typeof.js
+++ b/test/compress/typeof.js
@@ -100,7 +100,7 @@ typeof_defun_1: {
        g = 42;
        console.log("YES");
        "function" == typeof g && g();
-        h();
+        "function" == typeof h && h();
    }
    expect_stdout: [
        "YES",
@@ -138,3 +138,166 @@ typeof_defun_2: {
        "2",
    ]
 }
+
+duplicate_defun_arg_name: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function long_name(long_name) {
+            return typeof long_name;
+        }
+        console.log(typeof long_name, long_name());
+    }
+    expect: {
+        function long_name(long_name) {
+            return typeof long_name;
+        }
+        console.log(typeof long_name, long_name());
+    }
+    expect_stdout: "function undefined"
+}
+
+duplicate_lambda_arg_name: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        console.log(function long_name(long_name) {
+            return typeof long_name;
+        }());
+    }
+    expect: {
+        console.log(function long_name(long_name) {
+            return typeof long_name;
+        }());
+    }
+    expect_stdout: "undefined"
+}
+
+issue_2728_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function arguments() {
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function arguments() {
+            console.log(typeof arguments);
+        })();
+    }
+    expect_stdout: "object"
+}
+
+issue_2728_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments() {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect: {
+        function arguments() {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect_stdout: "function object"
+}
+
+issue_2728_3: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function() {
+            function arguments() {
+            }
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function() {
+            function arguments() {
+            }
+            console.log("function");
+        })();
+    }
+    expect_stdout: "function"
+}
+
+issue_2728_4: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments() {
+        }
+        console.log(typeof arguments);
+    }
+    expect: {
+        function arguments() {
+        }
+        console.log("function");
+    }
+    expect_stdout: "function"
+}
+
+issue_2728_5: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function arguments(arguments) {
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function arguments(arguments) {
+            console.log(typeof arguments);
+        })();
+    }
+    expect_stdout: "undefined"
+}
+
+issue_2728_6: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments(arguments) {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect: {
+        function arguments(arguments) {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect_stdout: "function undefined"
+}
--- a/test/compress/yield.js
+++ b/test/compress/yield.js
@@ -88,9 +88,8 @@ yield_before_punctuators: {
        })();
        function* g1() { (yield) }
        function* g2() { [yield] }
-        function* g3() { return {yield} } // Added return to avoid {} drop
-        function* g4() { yield, yield; }
-        function* g5() { (yield) ? yield : yield; }
+        function* g3() { yield, yield; }
+        function* g4() { (yield) ? yield : yield; }
    }
    expect: {
        iter = (function*() {
@@ -98,9 +97,8 @@ yield_before_punctuators: {
        })();
        function* g1() { (yield) }
        function* g2() { [yield] }
-        function* g3() { return {yield} }
-        function* g4() { yield, yield; }
-        function* g5() { (yield) ? yield : yield; }
+        function* g3() { yield, yield; }
+        function* g4() { (yield) ? yield : yield; }
    }
 }

@@ -199,3 +197,17 @@ yield_as_ES5_property: {
    expect_exact: '"use strict";console.log({yield:42}.yield);'
    expect_stdout: "42"
 }
+
+issue_2689: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function* y() {
+            var t = yield x();
+            return new t();
+        }
+    }
+    expect_exact: "function*y(){return new(yield x())}"
+}
--- a/test/input/issue-1242/qux.js
+++ b/test/input/issue-1242/qux.js
@@ -1,4 +1,4 @@
-var a = bar(1+2);
-var b = baz(3+9);
-print('q' + 'u' + 'x', a, b);
+var x = bar(1+2);
+var y = baz(3+9);
+print('q' + 'u' + 'x', x, y);
 foo(5+6);
--- a/test/jetstream.js
+++ b/test/jetstream.js
@@ -5,11 +5,7 @@

 var site = "http://browserbench.org/JetStream";
 if (typeof phantom == "undefined") {
-    // workaround for tty output truncation upon process.exit()
-    [process.stdout, process.stderr].forEach(function(stream){
-        if (stream._handle && stream._handle.setBlocking)
-            stream._handle.setBlocking(true);
-    });
+    require("../tools/exit");
    var args = process.argv.slice(2);
    var debug = args.indexOf("--debug");
    if (debug >= 0) {
--- a/test/mocha/comment.js
+++ b/test/mocha/comment.js
@@ -220,4 +220,24 @@ describe("Comment", function() {
        if (result.error) throw result.error;
        assert.strictEqual(result.code, "/*a*/ /*b*/(function(){/*c*/}/*d*/ /*e*/)();");
    });
+
+    it("Should output line comments after statements", function() {
+        var result = uglify.minify([
+            "x()//foo",
+            "{y()//bar",
+            "}",
+        ].join("\n"), {
+            compress: false,
+            mangle: false,
+            output: {
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "x();//foo",
+            "{y();//bar",
+            "}",
+        ].join("\n"));
+    });
 });
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -42,8 +42,15 @@ describe("minify", function() {
            original += code;
            compressed += result.code;
        });
-        assert.strictEqual(JSON.stringify(cache).slice(0, 20), '{"cname":5,"props":{');
-        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}var c=console.log.bind(console);function l(o){c("Foo:",2*o)}var f=n(3),i=r(12);c("qux",f,i),l(11);');
+        assert.strictEqual(JSON.stringify(cache).slice(0, 10), '{"props":{');
+        assert.strictEqual(compressed, [
+            "function n(n){return 3*n}",
+            "function r(n){return n/2}",
+            "var o=console.log.bind(console);",
+            'function c(n){o("Foo:",2*n)}',
+            "var a=n(3),b=r(12);",
+            'o("qux",a,b),c(11);',
+        ].join(""));
        assert.strictEqual(run_code(compressed), run_code(original));
    });

@@ -68,12 +75,48 @@ describe("minify", function() {
            original += code;
            compressed += result.code;
        });
-        assert.strictEqual(JSON.stringify(cache).slice(0, 28), '{"vars":{"cname":5,"props":{');
-        assert.strictEqual(compressed, 'function n(n){return 3*n}function r(n){return n/2}var c=console.log.bind(console);function l(o){c("Foo:",2*o)}var f=n(3),i=r(12);c("qux",f,i),l(11);');
+        assert.strictEqual(JSON.stringify(cache).slice(0, 18), '{"vars":{"props":{');
+        assert.strictEqual(compressed, [
+            "function n(n){return 3*n}",
+            "function r(n){return n/2}",
+            "var o=console.log.bind(console);",
+            'function c(n){o("Foo:",2*n)}',
+            "var a=n(3),b=r(12);",
+            'o("qux",a,b),c(11);',
+        ].join(""));
        assert.strictEqual(run_code(compressed), run_code(original));
    });

-    it("should not parse invalid use of reserved words", function() {
+    it("Should avoid mangled names in cache", function() {
+        var cache = {};
+        var original = "";
+        var compressed = "";
+        [
+            '"xxxyy";var i={s:1};',
+            '"xxyyy";var j={t:2,u:3},k=4;',
+            'console.log(i.s,j.t,j.u,k);',
+        ].forEach(function(code) {
+            var result = Uglify.minify(code, {
+                compress: false,
+                mangle: {
+                    properties: true,
+                    toplevel: true
+                },
+                nameCache: cache
+            });
+            if (result.error) throw result.error;
+            original += code;
+            compressed += result.code;
+        });
+        assert.strictEqual(compressed, [
+            '"xxxyy";var x={x:1};',
+            '"xxyyy";var y={y:2,a:3},a=4;',
+            'console.log(x.x,y.y,y.a,a);',
+        ].join(""));
+        assert.strictEqual(run_code(compressed), run_code(original));
+    });
+
+    it("Should not parse invalid use of reserved words", function() {
        assert.strictEqual(Uglify.minify("function enum(){}").error, undefined);
        assert.strictEqual(Uglify.minify("function static(){}").error, undefined);
        assert.strictEqual(Uglify.minify("function super(){}").error.message, "Unexpected token: name (super)");
--- a/test/mocha/yield.js
+++ b/test/mocha/yield.js
@@ -8,18 +8,6 @@ describe("Yield", function() {
        assert.strictEqual(result.code, 'function*foo(e){return yield 1,yield 2,3}');
    });

-    it("Should not allow yield as labelIdentifier within generators", function() {
-        var js = "function* g() {yield: 1}"
-        var test = function() {
-            UglifyJS.parse(js);
-        }
-        var expect = function(e) {
-            return e instanceof UglifyJS.JS_Parse_Error &&
-                e.message === "Yield cannot be used as label inside generators";
-        }
-        assert.throws(test, expect);
-    });
-
    it("Should not allow yield* followed by a semicolon in generators", function() {
        var js = "function* test() {yield*\n;}";
        var test = function() {
@@ -65,42 +53,68 @@ describe("Yield", function() {
        );
    });

+    var identifiers = [
+        // Fail in as_symbol
+        'import yield from "bar";',
+        'yield = 123;',
+        'yield: "123";',
+        'for(;;){break yield;}',
+        'for(;;){continue yield;}',
+        'function yield(){}',
+        'try { new Error("")} catch (yield) {}',
+        'var yield = "foo";',
+        'class yield {}',
+        // Fail in as_property_name
+        'var foo = {yield};',
+    ];
+
    it("Should not allow yield to be used as symbol, identifier or shorthand property outside generators in strict mode", function() {
-        var tests = [
-            // Fail in as_symbol
-            '"use strict"; import yield from "bar";',
-            '"use strict"; yield = 123;',
-            '"use strict"; yield: "123";',
-            '"use strict"; for(;;){break yield;}',
-            '"use strict"; for(;;){continue yield;}',
-            '"use strict"; function yield(){}',
-            '"use strict"; function foo(...yield){}',
-            '"use strict"; try { new Error("")} catch (yield) {}',
-            '"use strict"; var yield = "foo";',
-            '"use strict"; class yield {}',
-
-            // Fail in maybe_assign
-            '"use strict"; var foo = yield;',
-            '"use strict"; var foo = bar = yield',
-
-            // Fail in as_property_name
-            '"use strict"; var foo = {yield};',
-        ];
-
-        var fail = function(e) {
+        function fail(e) {
            return e instanceof UglifyJS.JS_Parse_Error &&
                /^Unexpected yield identifier (?:as parameter )?inside strict mode/.test(e.message);
        }

-        var test = function(input) {
+        function test(input) {
            return function() {
                UglifyJS.parse(input);
            }
        }

-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), fail, tests[i]);
+        identifiers.concat([
+            // Fail in as_symbol
+            "function foo(...yield){}",
+            // Fail in maybe_assign
+            'var foo = yield;',
+            'var foo = bar = yield',
+        ]).map(function(code) {
+            return '"use strict"; ' + code;
+        }).forEach(function(code) {
+            assert.throws(test(code), fail, code);
+        });
+    });
+
+    it("Should not allow yield to be used as symbol, identifier or shorthand property inside generators", function() {
+        function fail(e) {
+            return e instanceof UglifyJS.JS_Parse_Error && [
+                "Unexpected token: operator (=)",
+                "Yield cannot be used as identifier inside generators",
+            ].indexOf(e.message) >= 0;
        }
+
+        function test(input) {
+            return function() {
+                UglifyJS.parse(input);
+            }
+        }
+
+        identifiers.map(function(code) {
+            return "function* f() { " + code + " }";
+        }).concat([
+            // Fail in as_symbol
+            "function* f(yield) {}",
+        ]).forEach(function(code) {
+            assert.throws(test(code), fail, code);
+        });
    });

    it("Should allow yield to be used as class/object property name", function() {
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -10,6 +10,7 @@ var semver = require("semver");
 var tests_dir = path.dirname(module.filename);
 var failures = 0;
 var failed_files = {};
+var minify_options = require("./ufuzz.json").map(JSON.stringify);

 run_compress_tests();
 if (failures) {
@@ -100,6 +101,15 @@ function run_compress_tests() {
                quote_style: 3,
                keep_quoted_props: true
            });
+            try {
+                U.parse(input_code);
+            } catch (ex) {
+                log("!!! Cannot parse input\n---INPUT---\n{input}\n--PARSE ERROR--\n{error}\n\n", {
+                    input: input_formatted,
+                    error: ex,
+                });
+                return false;
+            }
            var options = U.defaults(test.options, {
                warnings: false
            });
@@ -139,78 +149,74 @@ function run_compress_tests() {
                    output: output,
                    expected: expect
                });
-                failures++;
-                failed_files[file] = 1;
+                return false;
            }
-            else {
-                // expect == output
-                try {
-                    var reparsed_ast = U.parse(output);
-                } catch (ex) {
-                    log("!!! Test matched expected result but cannot parse output\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n--REPARSE ERROR--\n{error}\n\n", {
+            // expect == output
+            try {
+                U.parse(output);
+            } catch (ex) {
+                log("!!! Test matched expected result but cannot parse output\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n--REPARSE ERROR--\n{error}\n\n", {
+                    input: input_formatted,
+                    output: output,
+                    error: ex,
+                });
+                return false;
+            }
+            if (test.expect_warnings) {
+                U.AST_Node.warn_function = original_warn_function;
+                var expected_warnings = make_code(test.expect_warnings, {
+                    beautify: false,
+                    quote_style: 2, // force double quote to match JSON
+                });
+                warnings_emitted = warnings_emitted.map(function(input) {
+                    return input.split(process.cwd() + path.sep).join("").split(path.sep).join("/");
+                });
+                var actual_warnings = JSON.stringify(warnings_emitted);
+                if (expected_warnings != actual_warnings) {
+                    log("!!! failed\n---INPUT---\n{input}\n---EXPECTED WARNINGS---\n{expected_warnings}\n---ACTUAL WARNINGS---\n{actual_warnings}\n\n", {
                        input: input_formatted,
-                        output: output,
-                        error: ex.toString(),
+                        expected_warnings: expected_warnings,
+                        actual_warnings: actual_warnings,
                    });
-                    failures++;
-                    failed_files[file] = 1;
-                }
-                if (test.expect_warnings) {
-                    U.AST_Node.warn_function = original_warn_function;
-                    var expected_warnings = make_code(test.expect_warnings, {
-                        beautify: false,
-                        quote_style: 2, // force double quote to match JSON
-                    });
-                    warnings_emitted = warnings_emitted.map(function(input) {
-                      return input.split(process.cwd() + path.sep).join("").split(path.sep).join("/");
-                    });
-                    var actual_warnings = JSON.stringify(warnings_emitted);
-                    if (expected_warnings != actual_warnings) {
-                        log("!!! failed\n---INPUT---\n{input}\n---EXPECTED WARNINGS---\n{expected_warnings}\n---ACTUAL WARNINGS---\n{actual_warnings}\n\n", {
-                            input: input_formatted,
-                            expected_warnings: expected_warnings,
-                            actual_warnings: actual_warnings,
-                        });
-                        failures++;
-                        failed_files[file] = 1;
-                    }
-                }
-                if (test.expect_stdout
-                    && (!test.node_version || semver.satisfies(process.version, test.node_version))) {
-                    var stdout = sandbox.run_code(input_code);
-                    if (test.expect_stdout === true) {
-                        test.expect_stdout = stdout;
-                    }
-                    if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
-                        log("!!! Invalid input or expected stdout\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
-                            input: input_formatted,
-                            expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
-                            expected: test.expect_stdout,
-                            actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
-                            actual: stdout,
-                        });
-                        failures++;
-                        failed_files[file] = 1;
-                    } else {
-                        stdout = sandbox.run_code(output);
-                        if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
-                            log("!!! failed\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
-                                input: input_formatted,
-                                expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
-                                expected: test.expect_stdout,
-                                actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
-                                actual: stdout,
-                            });
-                            failures++;
-                            failed_files[file] = 1;
-                        }
-                    }
+                    return false;
                }
            }
+            if (test.expect_stdout
+                && (!test.node_version || semver.satisfies(process.version, test.node_version))) {
+                var stdout = sandbox.run_code(input_code);
+                if (test.expect_stdout === true) {
+                    test.expect_stdout = stdout;
+                }
+                if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
+                    log("!!! Invalid input or expected stdout\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+                        input: input_formatted,
+                        expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
+                        expected: test.expect_stdout,
+                        actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
+                        actual: stdout,
+                    });
+                    return false;
+                }
+                stdout = sandbox.run_code(output);
+                if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
+                    log("!!! failed\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+                        input: input_formatted,
+                        expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
+                        expected: test.expect_stdout,
+                        actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
+                        actual: stdout,
+                    });
+                    return false;
+                }
+            }
+            return true;
        }
        var tests = parse_test(path.resolve(dir, file));
        for (var i in tests) if (tests.hasOwnProperty(i)) {
-            test_case(tests[i]);
+            if (!test_case(tests[i])) {
+                failures++;
+                failed_files[file] = 1;
+            }
        }
    }
    files.forEach(function(file){
@@ -346,3 +352,46 @@ function evaluate(code) {
        code = make_code(code, { beautify: true });
    return new Function("return(" + code + ")")();
 }
+
+// Try to reminify original input with standard options
+// to see if it matches expect_stdout.
+function reminify(orig_options, input_code, input_formatted, expect_stdout) {
+    for (var i = 0; i < minify_options.length; i++) {
+        var options = JSON.parse(minify_options[i]);
+        if (options.compress) [
+            "keep_fargs",
+            "keep_fnames",
+        ].forEach(function(name) {
+            if (name in orig_options) {
+                options.compress[name] = orig_options[name];
+            }
+        });
+        var options_formatted = JSON.stringify(options, null, 4);
+        var result = U.minify(input_code, options);
+        if (result.error) {
+            log("!!! failed input reminify\n---INPUT---\n{input}\n--ERROR---\n{error}\n\n", {
+                input: input_formatted,
+                error: result.error,
+            });
+            return false;
+        } else {
+            var stdout = sandbox.run_code(result.code);
+            if (typeof expect_stdout != "string" && typeof stdout != "string" && expect_stdout.name == stdout.name) {
+                stdout = expect_stdout;
+            }
+            if (!sandbox.same_stdout(expect_stdout, stdout)) {
+                log("!!! failed running reminified input\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n---OUTPUT---\n{output}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+                    input: input_formatted,
+                    options: options_formatted,
+                    output: result.code,
+                    expected_type: typeof expect_stdout == "string" ? "STDOUT" : "ERROR",
+                    expected: expect_stdout,
+                    actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
+                    actual: stdout,
+                });
+                return false;
+            }
+        }
+    }
+    return true;
+}
--- a/test/ufuzz.js
+++ b/test/ufuzz.js
@@ -6,11 +6,7 @@
 // bin/uglifyjs s.js -c && bin/uglifyjs s.js -c passes=3 && bin/uglifyjs s.js -c passes=3 -m
 // cat s.js | node && node s.js && bin/uglifyjs s.js -c | node && bin/uglifyjs s.js -c passes=3 | node && bin/uglifyjs s.js -c passes=3 -m | node

-// workaround for tty output truncation upon process.exit()
-[process.stdout, process.stderr].forEach(function(stream){
-    if (stream._handle && stream._handle.setBlocking)
-        stream._handle.setBlocking(true);
-});
+require("../tools/exit");

 var UglifyJS = require("..");
 var randomBytes = require("crypto").randomBytes;
@@ -127,6 +123,9 @@ for (var i = 2; i < process.argv.length; ++i) {
 }

 var VALUES = [
+    '"a"',
+    '"b"',
+    '"c"',
    '""',
    'true',
    'false',
@@ -329,7 +328,8 @@ function createTopLevelCode() {
        rng(2) == 0
        ? createStatements(3, MAX_GENERATION_RECURSION_DEPTH, CANNOT_THROW, CANNOT_BREAK, CANNOT_CONTINUE, CANNOT_RETURN, 0)
        : createFunctions(rng(MAX_GENERATED_TOPLEVELS_PER_RUN) + 1, MAX_GENERATION_RECURSION_DEPTH, DEFUN_OK, CANNOT_THROW, 0),
-        'console.log(null, a, b, c);' // preceding `null` makes for a cleaner output (empty string still shows up etc)
+        // preceding `null` makes for a cleaner output (empty string still shows up etc)
+        'console.log(null, a, b, c, Infinity, NaN, undefined);'
    ].join('\n');
 }

@@ -635,6 +635,8 @@ function _createExpression(recurmax, noComma, stmtDepth, canThrow) {
      case p++:
      case p++:
        return getVarName();
+      case p++:
+        return getVarName() + createAssignment() + createExpression(recurmax, COMMA_OK, stmtDepth, canThrow);
      case p++:
        return createExpression(recurmax, COMMA_OK, stmtDepth, canThrow);
      case p++:
--- a/tools/exit.js
+++ b/tools/exit.js
@@ -0,0 +1,15 @@
+// workaround for tty output truncation upon process.exit()
+var exit = process.exit;
+process.exit = function() {
+    var args = [].slice.call(arguments);
+    process.once("uncaughtException", function() {
+        (function callback() {
+            if (process.stdout.bufferSize || process.stderr.bufferSize) {
+                setImmediate(callback);
+            } else {
+                exit.apply(process, args);
+            }
+        })();
+    });
+    throw exit;
+};
Author	SHA1	Message	Date
Alex Lam S.L	1f3f8f25eb	harmony-v3.3.5	2018-01-08 00:30:45 +08:00
alexlamsl	4b1799ecdd	disable `reminify()` fix-up for #2708	2018-01-07 22:32:29 +08:00
alexlamsl	7a8eff62ca	Merge branch 'master' into harmony-v3.3.5	2018-01-07 20:35:53 +08:00
Alex Lam S.L	9336cc8247	v3.3.5	2018-01-07 11:51:36 +00:00
Alex Lam S.L	9809567dfc	improve `process.exit()` workaround (#2741 ) - use public API - fix issue with Node.js 0.10 on WIndows	2018-01-07 17:53:50 +08:00
Alex Lam S.L	1ee8be8d91	fix recursive function `inline` (#2738 ) fixes #2737	2018-01-07 15:31:24 +08:00
Alex Lam S.L	8430c2f9f8	enable AppVeyor CI (#2739 )	2018-01-07 14:14:58 +08:00
Alex Lam S.L	659c8a7632	handle trailing line comments correctly (#2736 ) fixes #2734	2018-01-06 21:05:21 +08:00
Alex Lam S.L	3564b4f20d	compress `RegExp()` in `unsafe` (#2735 )	2018-01-06 21:04:47 +08:00
Alex Lam S.L	3505a3604a	enhance `unsafe_proto` (#2733 )	2018-01-06 06:16:51 +08:00
kzc	9b1bc6c014	ufuzz: add strings "a", "b", "c" to VALUES (#2732 )	2018-01-06 05:54:53 +08:00
Alex Lam S.L	9f23185f2b	fix corner case with `arguments` as function name (#2729 ) fixes #2728	2018-01-05 22:21:18 +08:00
Alex Lam S.L	b82feb9302	improve `if_return` (#2727 )	2018-01-05 20:24:30 +08:00
Alex Lam S.L	7f2a591c7e	warn on deprecated features (#2726 ) - `function.arguments` - `function.callers` fixes #2719	2018-01-05 19:36:02 +08:00
Alex Lam S.L	f76b5e0f43	fix `hoist_props` on `const` (#2724 ) fixes #2710	2018-01-05 06:23:53 +08:00
Alex Lam S.L	afbcebddf6	fix `mangle` name collision across files (#2722 )	2018-01-05 05:08:09 +08:00
Alex Lam S.L	484e484571	fix corner case in `inline` (#2720 )	2018-01-04 23:38:37 +08:00
Alex Lam S.L	6f3f21233f	reminify tests upon `expect_stdout` (#2716 )	2018-01-04 20:13:05 +08:00
Alex Lam S.L	a6873a3859	forbid block-scoped `AST_Defun` in strict mode (#2718 )	2018-01-04 18:45:51 +08:00
Alex Lam S.L	7a6d452b54	preserve constant modification under strict mode (#2717 )	2018-01-04 15:53:53 +08:00
Alex Lam S.L	9b58b54e2d	extend `inline` (#2714 ) - compress `function` with variables within loops - restrict to `AST_Var` for better compatibility with ES6+	2018-01-04 12:58:40 +08:00
Alex Lam S.L	c598a12af9	apply `collapse_vars` to loop conditions (#2712 )	2018-01-04 03:18:28 +08:00
Alex Lam S.L	cfe3a98ce5	drop `unused` assignment based on `reduce_vars` (#2709 )	2018-01-04 01:03:33 +08:00
Alex Lam S.L	14778e049b	fix `reduce_vars` on `AST_Defun` (#2708 )	2018-01-03 17:18:38 +08:00
Alex Lam S.L	446fb0198b	extend `__PURE__` to `AST_New` (#2706 ) fixes #2705	2018-01-03 04:48:07 +08:00
Alex Lam S.L	7d3cddf9d6	inline functions with `AST_Var` (#2688 )	2018-01-03 01:54:44 +08:00
Alex Lam S.L	6dead95eb3	enhance `collapse_vars` (#2704 )	2018-01-02 18:42:15 +08:00
Alex Lam S.L	cc931b3ad8	enhance `if_return` (#2703 )	2018-01-02 15:09:51 +08:00
Alex Lam S.L	ffc64e2279	mark `AST_Var` out of block scopes (#2700 )	2018-01-02 01:37:59 +08:00
Alex Lam S.L	d838b4b52e	reset argument value within loop after `inline` (#2699 )	2018-01-02 01:24:53 +08:00
Alex Lam S.L	2f3bddbaca	scan within IIFEs of assigned values (#2702 ) fixes #2701	2018-01-02 01:24:23 +08:00
Alex Lam S.L	673b071637	enhance `join_vars` & `sequences` (#2697 ) - nudge declarations without assignments - within `AST_BlockStatement` - across `AST_If`	2018-01-01 00:09:26 +08:00
Alex Lam S.L	da82fa59a7	fix `inline` on duplicate argument names (#2698 )	2017-12-31 20:59:58 +08:00
Alex Lam S.L	333792352e	reduce hoisting declarations (#2687 )	2017-12-31 16:15:00 +08:00
Alex Lam S.L	a6653e2102	harmony-v3.3.4	2017-12-31 01:52:35 +08:00
alexlamsl	3bbe839518	Merge branch 'master' into harmony-v3.3.4	2017-12-31 00:05:32 +08:00
Alex Lam S.L	e2ec270b04	v3.3.4	2017-12-31 00:01:14 +08:00
Alex Lam S.L	ace272f0c5	improve test for #2689 (#2694 )	2017-12-30 15:49:49 +08:00
Alex Lam S.L	ed7a0a454e	fix `dead_code` on escaped `return` assignment (#2693 ) fixes #2692	2017-12-30 15:20:25 +08:00
Alex Lam S.L	725aac8b46	fix parse and output of `yield` (#2690 ) fixes #2689	2017-12-30 03:27:26 +08:00
Alex Lam S.L	d819559a01	minor clean-ups (#2686 )	2017-12-29 14:04:52 +08:00
Alex Lam S.L	53600e9869	harmony-v3.3.3	2017-12-29 04:36:27 +08:00
alexlamsl	7dea749f58	Merge branch 'master' into harmony-v3.3.3	2017-12-29 03:30:53 +08:00
Alex Lam S.L	8ca49155a8	v3.3.3	2017-12-29 03:07:39 +08:00
Alex Lam S.L	b95e3338d9	fix `pure_getters` on `AST_Binary` (#2681 ) fixes #2678	2017-12-28 17:01:01 +08:00
Alex Lam S.L	e40a0ee9c6	improve assignment variations (#2671 )	2017-12-28 15:36:55 +08:00
Alex Lam S.L	0a3fac6e68	fix parenthesis output of `AST_ClassExpression` (#2677 ) fixes #2676	2017-12-28 05:07:19 +08:00
Alex Lam S.L	cb62bd98d3	fix function inlining within loops (#2675 ) fixes #2663	2017-12-28 02:53:14 +08:00
Alex Lam S.L	9f7d1f7ac6	fix `reduce_vars` on `AST_Destructuring` (#2672 ) fixes #2669 fixes #2670 fixes #2673	2017-12-27 16:30:57 +08:00
Alex Lam S.L	f30790b11b	fix `dead_code` on `return` assignments (#2668 ) fixes #2666	2017-12-27 07:40:34 +08:00
Alex Lam S.L	5205dbcbf4	retain recursive function names (#2667 ) fixes #2665	2017-12-27 07:00:12 +08:00
Alex Lam S.L	3ff625de7e	fix bugs on substituted `AST_Defun` (#2661 ) fixes #2660	2017-12-27 05:31:37 +08:00
Alex Lam S.L	4832bc5d88	replace single-use recursive functions (#2659 ) fixes #2628	2017-12-26 21:25:35 +08:00
Alex Lam S.L	7f342cb3e3	suppress `inline` within substituted `AST_Scope` (#2658 ) fixes #2657	2017-12-26 18:56:59 +08:00
Alex Lam S.L	05e7d34ed4	improve `unused` over duplicate variable names (#2656 )	2017-12-26 18:29:28 +08:00
Alex Lam S.L	ef74f2eaaf	harmony-v3.3.2	2017-12-26 05:21:31 +08:00
alexlamsl	96082f7a9b	Merge branch 'master' into harmony-v3.3.2	2017-12-26 01:46:22 +08:00
Alex Lam S.L	86607156e3	v3.3.2	2017-12-26 01:38:56 +08:00
Alex Lam S.L	0fe259e9c5	parse LF & comment correctly (#2653 ) fixes #2652	2017-12-26 01:38:01 +08:00
Alex Lam S.L	a53784e0c5	harmony-v3.3.1	2017-12-25 18:32:00 +08:00
alexlamsl	a3b8dec347	Merge branch 'master' into harmony-v3.3.1	2017-12-25 17:34:16 +08:00
Alex Lam S.L	49ce573971	handle non-ES5 node types in `inline` (#2648 ) fixes #2647	2017-12-25 17:25:38 +08:00
Alex Lam S.L	8701a99a15	v3.3.1	2017-12-25 03:08:28 +08:00
Alex Lam S.L	1476c78b53	add `html-minifier` to benchmarks (#2646 )	2017-12-25 03:07:46 +08:00
Alex Lam S.L	cb6a92892f	fix infinite loop during `inline` (#2645 ) fixes #2644	2017-12-25 01:57:11 +08:00