v3.5.14

fix corner case in arguments (#3421 )
fixes #3420
2019-05-20 00:13:06 +08:00 · 2019-05-19 12:59:40 +08:00 · 2019-05-17 14:10:33 +08:00 · 2019-05-17 01:28:18 +08:00 · 2019-05-16 16:15:03 +08:00 · 2019-05-15 23:26:57 +08:00
48 changed files with 2895 additions and 903 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,46 @@
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - libstdc++-4.9-dev
 cache:
  directories: tmp
 language: generic
 matrix:
  fast_finish: true
-sudo: false
 env:
-  global:
-    - UGLIFYJS_TEST_ALL=1
-  matrix:
-    - NODEJS_VER=node/0.10
-    - NODEJS_VER=node/0.12
-    - NODEJS_VER=node/4
-    - NODEJS_VER=node/6
-    - NODEJS_VER=node/8
-    - NODEJS_VER=node/10
-    - NODEJS_VER=node/latest
+  - NODE=0.10   TYPE=compress
+  - NODE=0.10   TYPE=mocha
+  - NODE=0.10   TYPE=release/benchmark
+  - NODE=0.10   TYPE=release/jetstream
+  - NODE=0.12   TYPE=compress
+  - NODE=0.12   TYPE=mocha
+  - NODE=0.12   TYPE=release/benchmark
+  - NODE=0.12   TYPE=release/jetstream
+  - NODE=4      TYPE=compress
+  - NODE=4      TYPE=mocha
+  - NODE=4      TYPE=release/benchmark
+  - NODE=4      TYPE=release/jetstream
+  - NODE=6      TYPE=compress
+  - NODE=6      TYPE=mocha
+  - NODE=6      TYPE=release/benchmark
+  - NODE=6      TYPE=release/jetstream
+  - NODE=8      TYPE=compress
+  - NODE=8      TYPE=mocha
+  - NODE=8      TYPE=release/benchmark
+  - NODE=8      TYPE=release/jetstream
+  - NODE=10     TYPE=compress
+  - NODE=10     TYPE=mocha
+  - NODE=10     TYPE=release/benchmark
+  - NODE=10     TYPE=release/jetstream
+  - NODE=latest TYPE=compress
+  - NODE=latest TYPE=mocha
+  - NODE=latest TYPE=release/benchmark
+  - NODE=latest TYPE=release/jetstream
 before_install:
-  - git clone --branch v1.4.2 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
+  - git clone --branch v1.5.2 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
  - . ~/.nvs/nvs.sh
  - nvs --version
 install:
-  - nvs add $NODEJS_VER
-  - nvs use $NODEJS_VER
+  - nvs add node/$NODE
+  - nvs use node/$NODE
  - node --version
  - npm --version --no-update-notifier
-  - npm install --no-optional --no-save --no-update-notifier
+  - npm install --no-audit --no-optional --no-save --no-update-notifier
 script:
-  - npm test --no-update-notifier
+  - node test/$TYPE
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 UglifyJS is released under the BSD license:

-Copyright 2012-2018 (c) Mihai Bazon <mihai.bazon@gmail.com>
+Copyright 2012-2019 (c) Mihai Bazon <mihai.bazon@gmail.com>

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
--- a/README.md
+++ b/README.md
@@ -664,8 +664,9 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u

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

- `keep_fargs` (default: `true`) -- Prevents the compressor from discarding unused
-  function arguments.  You need this for code which relies on `Function.length`.
+- `keep_fargs` (default: `strict`) -- Discard unused function arguments. Code
+  which relies on `Function.length` will break if this is done indiscriminately,
+  i.e. when passing `true`. Pass `false` to always retain function arguments.

 - `keep_fnames` (default: `false`) -- Pass `true` to prevent the
  compressor from discarding function names.  Useful for code relying on
@@ -767,9 +768,6 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `unused` (default: `true`) -- drop unreferenced functions and variables (simple
  direct variable assignments do not count as references unless set to `"keep_assign"`)

- `warnings` (default: `false`) -- display warnings when dropping unreachable
-  code or unused declarations etc.
-
 ## Mangle options

 - `eval` (default `false`) -- Pass `true` to mangle names visible in scopes
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,26 +1,74 @@
-environment:
-  UGLIFYJS_TEST_ALL: 1
-  matrix:
-    - NODEJS_VER: node/0.10
-    - NODEJS_VER: node/0.12
-    - NODEJS_VER: node/4
-    - NODEJS_VER: node/6
-    - NODEJS_VER: node/8
-    - NODEJS_VER: node/10
-    - NODEJS_VER: node/latest
-install:
-  - git clone --branch v1.4.2 --depth 1 https://github.com/jasongin/nvs.git %LOCALAPPDATA%\nvs
-  - set PATH=%LOCALAPPDATA%\nvs;%PATH%
-  - nvs --version
-  - nvs add %NODEJS_VER%
-  - nvs use %NODEJS_VER%
-  - node --version
-  - npm --version --no-update-notifier
-  - npm install --no-optional --no-save --no-update-notifier
 build: off
 cache:
  - tmp
 matrix:
  fast_finish: true
+environment:
+  matrix:
+    - NODE: 0.10
+      TYPE: compress
+    - NODE: 0.10
+      TYPE: mocha
+    - NODE: 0.10
+      TYPE: release/benchmark
+    - NODE: 0.10
+      TYPE: release/jetstream
+    - NODE: 0.12
+      TYPE: compress
+    - NODE: 0.12
+      TYPE: mocha
+    - NODE: 0.12
+      TYPE: release/benchmark
+    - NODE: 0.12
+      TYPE: release/jetstream
+    - NODE: 4
+      TYPE: compress
+    - NODE: 4
+      TYPE: mocha
+    - NODE: 4
+      TYPE: release/benchmark
+    - NODE: 4
+      TYPE: release/jetstream
+    - NODE: 6
+      TYPE: compress
+    - NODE: 6
+      TYPE: mocha
+    - NODE: 6
+      TYPE: release/benchmark
+    - NODE: 6
+      TYPE: release/jetstream
+    - NODE: 8
+      TYPE: compress
+    - NODE: 8
+      TYPE: mocha
+    - NODE: 8
+      TYPE: release/benchmark
+    - NODE: 8
+      TYPE: release/jetstream
+    - NODE: 10
+      TYPE: compress
+    - NODE: 10
+      TYPE: mocha
+    - NODE: 10
+      TYPE: release/benchmark
+    - NODE: 10
+      TYPE: release/jetstream
+    - NODE: latest
+      TYPE: compress
+    - NODE: latest
+      TYPE: mocha
+    - NODE: latest
+      TYPE: release/benchmark
+    - NODE: latest
+      TYPE: release/jetstream
+install:
+  - git clone --branch v1.5.2 --depth 1 https://github.com/jasongin/nvs.git %LOCALAPPDATA%\nvs
+  - set PATH=%LOCALAPPDATA%\nvs;%PATH%
+  - nvs --version
+  - nvs add node/%NODE%
+  - nvs use node/%NODE%
+  - node --version
+  - npm --version --no-update-notifier
+  - npm install --no-audit --no-optional --no-save --no-update-notifier
 test_script:
-  - npm test --no-update-notifier
+  - node test/%TYPE%
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -63,7 +63,7 @@ if (program.configFile) {
    }
 }
 if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
-    fatal("ERROR: cannot write source map to STDOUT");
+    fatal("cannot write source map to STDOUT");
 }
 [
    "compress",
@@ -78,6 +78,15 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
        options[name] = program[name];
    }
 });
+if (program.verbose) {
+    options.warnings = "verbose";
+} else if (program.warn) {
+    options.warnings = true;
+}
+if (options.warnings) {
+    UglifyJS.AST_Node.log_function(print_error, options.warnings == "verbose");
+    delete options.warnings;
+}
 if (program.beautify) {
    options.output = typeof program.beautify == "object" ? program.beautify : {};
    if (!("beautify" in options.output)) {
@@ -124,7 +133,7 @@ if (program.parse) {
    if (!program.parse.acorn && !program.parse.spidermonkey) {
        options.parse = program.parse;
    } else if (program.sourceMap && program.sourceMap.content == "inline") {
-        fatal("ERROR: inline source map only works with built-in parser");
+        fatal("inline source map only works with built-in parser");
    }
 }
 if (~program.rawArgs.indexOf("--rename")) {
@@ -144,15 +153,8 @@ if (typeof program.sourceMap == "object" && "base" in program.sourceMap) {
        };
    }();
 }
-if (program.verbose) {
-    options.warnings = "verbose";
-} else if (program.warn) {
-    options.warnings = true;
-}
 if (program.self) {
-    if (program.args.length) {
-        print_error("WARN: Ignoring input files since --self was passed");
-    }
+    if (program.args.length) UglifyJS.AST_Node.warn("Ignoring input files since --self was passed");
    if (!options.wrap) options.wrap = "UglifyJS";
    simple_glob(UglifyJS.FILES).forEach(function(name) {
        files[convert_path(name)] = read_file(name);
@@ -180,12 +182,9 @@ function convert_ast(fn) {
 }

 function run() {
-    UglifyJS.AST_Node.warn_function = function(msg) {
-        print_error("WARN: " + msg);
-    };
    var content = program.sourceMap && program.sourceMap.content;
    if (content && content != "inline") {
-        print_error("INFO: Using input source map: " + content);
+        UglifyJS.AST_Node.info("Using input source map: " + content);
        options.sourceMap.content = read_file(content, content);
    }
    if (program.timings) options.timings = true;
@@ -216,24 +215,26 @@ function run() {
        var ex = result.error;
        if (ex.name == "SyntaxError") {
            print_error("Parse error at " + ex.filename + ":" + ex.line + "," + ex.col);
-            var col = ex.col;
-            var lines = files[ex.filename].split(/\r?\n/);
-            var line = lines[ex.line - 1];
-            if (!line && !col) {
-                line = lines[ex.line - 2];
-                col = line.length;
-            }
-            if (line) {
-                var limit = 70;
-                if (col > limit) {
-                    line = line.slice(col - limit);
-                    col = limit;
+            var file = files[ex.filename];
+            if (file) {
+                var col = ex.col;
+                var lines = file.split(/\r?\n/);
+                var line = lines[ex.line - 1];
+                if (!line && !col) {
+                    line = lines[ex.line - 2];
+                    col = line.length;
+                }
+                if (line) {
+                    var limit = 70;
+                    if (col > limit) {
+                        line = line.slice(col - limit);
+                        col = limit;
+                    }
+                    print_error(line.slice(0, 80));
+                    print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
                }
-                print_error(line.slice(0, 80));
-                print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
            }
-        }
-        if (ex.defs) {
+        } else if (ex.defs) {
            print_error("Supported options:");
            print_error(format_object(ex.defs));
        }
@@ -293,7 +294,11 @@ function run() {
 }

 function fatal(message) {
-    if (message instanceof Error) message = message.stack.replace(/^\S*?Error:/, "ERROR:")
+    if (message instanceof Error) {
+        message = message.stack.replace(/^\S*?Error:/, "ERROR:")
+    } else {
+        message = "ERROR: " + message;
+    }
    print_error(message);
    process.exit(1);
 }
@@ -370,9 +375,9 @@ function parse_js(flag) {
                    });
                }
            }));
-        } catch(ex) {
+        } catch (ex) {
            if (flag) {
-                fatal("Error parsing arguments for '" + flag + "': " + value);
+                fatal("cannot parse arguments for '" + flag + "': " + value);
            } else {
                options[value] = null;
            }
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -118,9 +118,25 @@ var AST_Node = DEFNODE("Node", "start end", {
    }
 }, null);

-AST_Node.warn = function(txt, props) {
-    if (AST_Node.warn_function) AST_Node.warn_function(string_template(txt, props));
-};
+(AST_Node.log_function = function(fn, verbose) {
+    var printed = Object.create(null);
+    if (fn) {
+        AST_Node.info = verbose ? function(text, props) {
+            log("INFO: " + string_template(text, props));
+        } : noop;
+        AST_Node.warn = function(text, props) {
+            log("WARN: " + string_template(text, props));
+        };
+    } else {
+        AST_Node.info = AST_Node.warn = noop;
+    }
+
+    function log(msg) {
+        if (printed[msg]) return;
+        printed[msg] = true;
+        fn(msg);
+    }
+})();

 /* -----[ statements ]----- */

@@ -321,18 +337,25 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
    $propdoc: {
        globals: "[Object/S] a map of name -> SymbolDef for all undeclared names",
    },
-    wrap_commonjs: function(name) {
+    wrap: function(name) {
        var body = this.body;
-        var wrapped_tl = "(function(exports){'$ORIG';})(typeof " + name + "=='undefined'?(" + name + "={}):" + name + ");";
-        wrapped_tl = parse(wrapped_tl);
-        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function(node) {
+        return parse([
+            "(function(exports){'$ORIG';})(typeof ",
+            name,
+            "=='undefined'?(",
+            name,
+            "={}):",
+            name,
+            ");"
+        ].join(""), {
+            filename: "wrap=" + JSON.stringify(name)
+        }).transform(new TreeTransformer(function(node) {
            if (node instanceof AST_Directive && node.value == "$ORIG") {
                return MAP.splice(body);
            }
        }));
-        return wrapped_tl;
    },
-    wrap_enclose: function(args_values) {
+    enclose: function(args_values) {
        if (typeof args_values != "string") args_values = "";
        var index = args_values.indexOf(":");
        if (index < 0) index = args_values.length;
@@ -343,7 +366,9 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
            '){"$ORIG"})(',
            args_values.slice(index + 1),
            ")"
-        ].join("")).transform(new TreeTransformer(function(node) {
+        ].join(""), {
+            filename: "enclose=" + JSON.stringify(args_values)
+        }).transform(new TreeTransformer(function(node) {
            if (node instanceof AST_Directive && node.value == "$ORIG") {
                return MAP.splice(body);
            }
@@ -351,7 +376,7 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
    }
 }, AST_Scope);

-var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
+var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments length_read", {
    $documentation: "Base class for functions",
    $propdoc: {
        name: "[AST_SymbolDeclaration?] the name of this function",
@@ -589,6 +614,18 @@ var AST_PropAccess = DEFNODE("PropAccess", "expression property", {
    $propdoc: {
        expression: "[AST_Node] the “container” expression",
        property: "[AST_Node|string] the property to access.  For AST_Dot this is always a plain string, while for AST_Sub it's an arbitrary AST_Node"
+    },
+    getProperty: function() {
+        var p = this.property;
+        if (p instanceof AST_Constant) {
+            return p.getValue();
+        }
+        if (p instanceof AST_UnaryPrefix
+            && p.operator == "void"
+            && p.expression instanceof AST_Constant) {
+            return;
+        }
+        return p;
    }
 });

--- a/lib/compress.js
+++ b/lib/compress.js
@@ -69,7 +69,7 @@ function Compressor(options, false_by_default) {
        if_return       : !false_by_default,
        inline          : !false_by_default,
        join_vars       : !false_by_default,
-        keep_fargs      : true,
+        keep_fargs      : false_by_default || "strict",
        keep_fnames     : false,
        keep_infinity   : false,
        loops           : !false_by_default,
@@ -94,7 +94,6 @@ function Compressor(options, false_by_default) {
        unsafe_regexp   : false,
        unsafe_undefined: false,
        unused          : !false_by_default,
-        warnings        : false,
    }, true);
    var global_defs = this.options["global_defs"];
    if (typeof global_defs == "object") for (var key in global_defs) {
@@ -105,6 +104,17 @@ function Compressor(options, false_by_default) {
        }
    }
    if (this.options["inline"] === true) this.options["inline"] = 3;
+    var keep_fargs = this.options["keep_fargs"];
+    this.drop_fargs = keep_fargs == "strict" ? function(lambda, parent) {
+        if (lambda.length_read) return false;
+        var name = lambda.name;
+        if (!name) return parent && parent.TYPE == "Call";
+        if (name.fixed_value() !== lambda) return false;
+        var def = name.definition();
+        if (def.direct_access) return false;
+        var escaped = def.escaped;
+        return escaped && escaped.depth != 1;
+    } : keep_fargs ? return_false : return_true;
    var pure_funcs = this.options["pure_funcs"];
    if (typeof pure_funcs == "function") {
        this.pure_funcs = pure_funcs;
@@ -119,6 +129,8 @@ function Compressor(options, false_by_default) {
    } else {
        this.pure_funcs = return_true;
    }
+    var sequences = this.options["sequences"];
+    this.sequences_limit = sequences == 1 ? 800 : sequences | 0;
    var top_retain = this.options["top_retain"];
    if (top_retain instanceof RegExp) {
        this.top_retain = function(def) {
@@ -142,9 +154,6 @@ function Compressor(options, false_by_default) {
        funcs: toplevel,
        vars: toplevel
    };
-    var sequences = this.options["sequences"];
-    this.sequences_limit = sequences == 1 ? 800 : sequences | 0;
-    this.warnings_produced = {};
 }

 Compressor.prototype = new TreeTransformer;
@@ -175,7 +184,7 @@ merge(Compressor.prototype, {
                node.walk(new TreeWalker(function() {
                    count++;
                }));
-                this.info("pass " + pass + ": last_count: " + min_count + ", count: " + count);
+                AST_Node.info("pass " + pass + ": last_count: " + min_count + ", count: " + count);
                if (count < min_count) {
                    min_count = count;
                    stopping = false;
@@ -191,24 +200,6 @@ merge(Compressor.prototype, {
        }
        return node;
    },
-    info: function() {
-        if (this.options.warnings == "verbose") {
-            AST_Node.warn.apply(AST_Node, arguments);
-        }
-    },
-    warn: function(text, props) {
-        if (this.options.warnings) {
-            // only emit unique warnings
-            var message = string_template(text, props);
-            if (!(message in this.warnings_produced)) {
-                this.warnings_produced[message] = true;
-                AST_Node.warn.apply(AST_Node, arguments);
-            }
-        }
-    },
-    clear_warnings: function() {
-        this.warnings_produced = {};
-    },
    before: function(node, descend, in_list) {
        if (node._squeezed) return node;
        var is_scope = node instanceof AST_Scope;
@@ -292,14 +283,19 @@ merge(Compressor.prototype, {
        self.transform(tt);
    });

-    function read_property(obj, key) {
-        key = get_value(key);
+    function read_property(obj, node) {
+        var key = node.getProperty();
        if (key instanceof AST_Node) return;
        var value;
        if (obj instanceof AST_Array) {
            var elements = obj.elements;
            if (key == "length") return make_node_from_constant(elements.length, obj);
            if (typeof key == "number" && key in elements) value = elements[key];
+        } else if (obj instanceof AST_Lambda) {
+            if (key == "length") {
+                obj.length_read = true;
+                return make_node_from_constant(obj.argnames.length, obj);
+            }
        } else if (obj instanceof AST_Object) {
            key = "" + key;
            var props = obj.properties;
@@ -346,11 +342,17 @@ merge(Compressor.prototype, {
            return is_modified(compressor, tw, obj, obj, level + 2);
        }
        if (parent instanceof AST_PropAccess && parent.expression === node) {
-            var prop = read_property(value, parent.property);
+            var prop = read_property(value, parent);
            return !immutable && is_modified(compressor, tw, parent, prop, level + 1);
        }
    }

+    function is_arguments(def) {
+        if (def.name != "arguments") return false;
+        var orig = def.orig;
+        return orig.length == 1 && orig[0] instanceof AST_SymbolFunarg;
+    }
+
    (function(def) {
        def(AST_Node, noop);

@@ -448,9 +450,9 @@ merge(Compressor.prototype, {
            if (def.single_use == "m") return false;
            if (tw.safe_ids[def.id]) {
                if (def.fixed == null) {
-                    var orig = def.orig[0];
-                    if (orig instanceof AST_SymbolFunarg || orig.name == "arguments") return false;
-                    def.fixed = make_node(AST_Undefined, orig);
+                    if (is_arguments(def)) return false;
+                    if (def.global && def.name == "arguments") return false;
+                    def.fixed = make_node(AST_Undefined, def.orig);
                }
                return true;
            }
@@ -510,23 +512,24 @@ merge(Compressor.prototype, {
                var obj = tw.parent(level + 1);
                mark_escaped(tw, d, scope, obj, obj, level + 2, depth);
            } else if (parent instanceof AST_PropAccess && node === parent.expression) {
-                value = read_property(value, parent.property);
+                value = read_property(value, parent);
                mark_escaped(tw, d, scope, parent, value, level + 1, depth + 1);
                if (value) return;
            }
            if (level > 0) return;
+            if (parent instanceof AST_Call && node === parent.expression) return;
            if (parent instanceof AST_Sequence && node !== parent.tail_node()) return;
            if (parent instanceof AST_SimpleStatement) return;
+            if (parent instanceof AST_Unary && !unary_side_effects[parent.operator]) return;
            d.direct_access = true;
        }

        function mark_assignment_to_arguments(node) {
            if (!(node instanceof AST_Sub)) return;
            var expr = node.expression;
-            var prop = node.property;
-            if (expr instanceof AST_SymbolRef && expr.name == "arguments" && prop instanceof AST_Number) {
-                expr.definition().reassigned = true;
-            }
+            if (!(expr instanceof AST_SymbolRef)) return;
+            var def = expr.definition();
+            if (is_arguments(def) && node.property instanceof AST_Number) def.reassigned = true;
        }

        var suppressor = new TreeWalker(function(node) {
@@ -793,7 +796,7 @@ merge(Compressor.prototype, {
        });
        def(AST_Unary, function(tw, descend) {
            var node = this;
-            if (node.operator != "++" && node.operator != "--") return;
+            if (!unary_arithmetic[node.operator]) return;
            var exp = node.expression;
            if (!(exp instanceof AST_SymbolRef)) {
                mark_assignment_to_arguments(exp);
@@ -889,9 +892,13 @@ merge(Compressor.prototype, {
        return orig.length == 1 && orig[0] instanceof AST_SymbolLambda;
    });

-    function is_lhs_read_only(lhs) {
+    function is_lhs_read_only(lhs, compressor) {
        if (lhs instanceof AST_This) return true;
-        if (lhs instanceof AST_SymbolRef) return lhs.definition().orig[0] instanceof AST_SymbolLambda;
+        if (lhs instanceof AST_SymbolRef) {
+            var def = lhs.definition();
+            return def.orig[0] instanceof AST_SymbolLambda
+                || compressor.exposed(def) && identifier_atom[def.name];
+        }
        if (lhs instanceof AST_PropAccess) {
            lhs = lhs.expression;
            if (lhs instanceof AST_SymbolRef) {
@@ -900,7 +907,7 @@ merge(Compressor.prototype, {
            }
            if (!lhs) return true;
            if (lhs.is_constant()) return true;
-            return is_lhs_read_only(lhs);
+            return is_lhs_read_only(lhs, compressor);
        }
        return false;
    }
@@ -1138,7 +1145,7 @@ merge(Compressor.prototype, {
                        if (value_def && candidate instanceof AST_VarDef) return node;
                    }
                    CHANGED = abort = true;
-                    compressor.info("Collapsing {name} [{file}:{line},{col}]", {
+                    AST_Node.info("Collapsing {name} [{file}:{line},{col}]", {
                        name: node.print_to_string(),
                        file: node.start.file,
                        line: node.start.line,
@@ -1215,7 +1222,7 @@ merge(Compressor.prototype, {
                    var stop_if_hit = null;
                    var lhs = get_lhs(candidate);
                    var side_effects = lhs && lhs.has_side_effects(compressor);
-                    var scan_lhs = lhs && !side_effects && !is_lhs_read_only(lhs);
+                    var scan_lhs = lhs && !side_effects && !is_lhs_read_only(lhs, compressor);
                    var scan_rhs = foldable(get_rhs(candidate));
                    if (!scan_lhs && !scan_rhs) continue;
                    // Locate symbols which may execute code outside of scanning range
@@ -1439,7 +1446,7 @@ merge(Compressor.prototype, {
                    extract_candidates(expr.expression);
                    expr.body.forEach(extract_candidates);
                } else if (expr instanceof AST_Unary) {
-                    if (expr.operator == "++" || expr.operator == "--") {
+                    if (unary_arithmetic[expr.operator]) {
                        candidates.push(hit_stack.slice());
                    } else {
                        extract_candidates(expr.expression);
@@ -1509,9 +1516,9 @@ merge(Compressor.prototype, {
            function mangleable_var(var_def) {
                var value = var_def.value;
                if (!(value instanceof AST_SymbolRef)) return;
-                if (value.name == "arguments") return;
                var def = value.definition();
                if (def.undeclared) return;
+                if (is_arguments(def)) return;
                return value_def = def;
            }

@@ -1963,7 +1970,7 @@ merge(Compressor.prototype, {
            statements.length = n;
            CHANGED = n != len;
            if (has_quit) has_quit.forEach(function(stat) {
-                extract_declarations_from_unreachable_code(compressor, stat, statements);
+                extract_declarations_from_unreachable_code(stat, statements);
            });
        }

@@ -2216,13 +2223,13 @@ merge(Compressor.prototype, {
        }
    }

-    function extract_declarations_from_unreachable_code(compressor, stat, target) {
+    function extract_declarations_from_unreachable_code(stat, target) {
        if (!(stat instanceof AST_Defun)) {
-            compressor.warn("Dropping unreachable code [{file}:{line},{col}]", stat.start);
+            AST_Node.warn("Dropping unreachable code [{file}:{line},{col}]", stat.start);
        }
        stat.walk(new TreeWalker(function(node) {
            if (node instanceof AST_Definitions) {
-                compressor.warn("Declarations in unreachable code! [{file}:{line},{col}]", node.start);
+                AST_Node.warn("Declarations in unreachable code! [{file}:{line},{col}]", node.start);
                node.remove_initializers();
                target.push(node);
                return true;
@@ -2237,18 +2244,6 @@ merge(Compressor.prototype, {
        }));
    }

-    function get_value(key) {
-        if (key instanceof AST_Constant) {
-            return key.getValue();
-        }
-        if (key instanceof AST_UnaryPrefix
-            && key.operator == "void"
-            && key.expression instanceof AST_Constant) {
-            return;
-        }
-        return key;
-    }
-
    function is_undefined(node, compressor) {
        return node.is_undefined
            || node instanceof AST_Undefined
@@ -2327,6 +2322,7 @@ merge(Compressor.prototype, {
            if (!is_strict(compressor)) return false;
            if (is_undeclared_ref(this) && this.is_declared(compressor)) return false;
            if (this.is_immutable()) return false;
+            if (is_arguments(this.definition())) return false;
            var fixed = this.fixed_value();
            if (!fixed) return true;
            this._dot_throw = return_true;
@@ -2354,7 +2350,7 @@ merge(Compressor.prototype, {
              case "&&":
                return this.left.is_defined(compressor) && this.right.is_defined(compressor);
              case "||":
-                return this.left.is_defined(compressor) || this.right.is_defined(compressor);
+                return this.left.is_truthy() || this.right.is_defined(compressor);
              default:
                return true;
            }
@@ -2374,7 +2370,7 @@ merge(Compressor.prototype, {
            if (this.is_immutable()) return true;
            var fixed = this.fixed_value();
            if (!fixed) return false;
-            this.is_defined = return_true;
+            this.is_defined = return_false;
            var result = fixed.is_defined(compressor);
            delete this.is_defined;
            return result;
@@ -2553,9 +2549,6 @@ merge(Compressor.prototype, {
            return this.tail_node().is_string(compressor);
        });
        def(AST_String, return_true);
-        def(AST_Sub, function(compressor) {
-            return this.expression.is_string(compressor) && this.property instanceof AST_Number;
-        });
        def(AST_SymbolRef, function(compressor) {
            var fixed = this.fixed_value();
            if (!fixed) return false;
@@ -2572,6 +2565,7 @@ merge(Compressor.prototype, {
    });

    var lazy_op = makePredicate("&& ||");
+    var unary_arithmetic = makePredicate("++ --");
    var unary_side_effects = makePredicate("delete ++ --");

    function is_lhs(node, parent) {
@@ -2602,8 +2596,8 @@ merge(Compressor.prototype, {
            return make_node_from_constant(value, orig);
        }

-        function warn(compressor, node) {
-            compressor.warn("global_defs " + node.print_to_string() + " redefined [{file}:{line},{col}]", node.start);
+        function warn(node) {
+            AST_Node.warn("global_defs " + node.print_to_string() + " redefined [{file}:{line},{col}]", node.start);
        }

        AST_Toplevel.DEFMETHOD("resolve_defines", function(compressor) {
@@ -2619,7 +2613,7 @@ merge(Compressor.prototype, {
                    child = parent;
                }
                if (is_lhs(child, parent)) {
-                    warn(compressor, node);
+                    warn(node);
                    return;
                }
                return def;
@@ -2631,7 +2625,7 @@ merge(Compressor.prototype, {
        });
        def(AST_SymbolDeclaration, function(compressor) {
            if (!this.global()) return;
-            if (HOP(compressor.option("global_defs"), this.name)) warn(compressor, this);
+            if (HOP(compressor.option("global_defs"), this.name)) warn(this);
        });
        def(AST_SymbolRef, function(compressor, suffix) {
            if (!this.global()) return;
@@ -2994,7 +2988,8 @@ merge(Compressor.prototype, {
                    val = global_objs[exp.name];
                } else {
                    val = exp._eval(compressor, cached, depth + 1);
-                    if (!val || val === exp || !HOP(val, key)) return this;
+                    if (!val || val === exp) return this;
+                    if (typeof val == "object" && !HOP(val, key)) return this;
                    if (typeof val == "function") switch (key) {
                      case "name":
                        return val.node.name ? val.node.name.name : "";
@@ -3039,7 +3034,7 @@ merge(Compressor.prototype, {
                try {
                    return val[key].apply(val, args);
                } catch (ex) {
-                    compressor.warn("Error evaluating {code} [{file}:{line},{col}]", {
+                    AST_Node.warn("Error evaluating {code} [{file}:{line},{col}]", {
                        code: this.print_to_string(),
                        file: this.start.file,
                        line: this.start.line,
@@ -3643,14 +3638,14 @@ merge(Compressor.prototype, {
                node.name = null;
            }
            if (node instanceof AST_Lambda && !(node instanceof AST_Accessor)) {
-                var trim = !compressor.option("keep_fargs");
+                var trim = compressor.drop_fargs(node, parent);
                for (var a = node.argnames, i = a.length; --i >= 0;) {
                    var sym = a[i];
                    if (!(sym.definition().id in in_use_ids)) {
                        sym.__unused = true;
                        if (trim) {
                            a.pop();
-                            compressor[sym.unreferenced() ? "warn" : "info"]("Dropping unused function argument {name} [{file}:{line},{col}]", template(sym));
+                            AST_Node[sym.unreferenced() ? "warn" : "info"]("Dropping unused function argument {name} [{file}:{line},{col}]", template(sym));
                        }
                    } else {
                        trim = false;
@@ -3660,7 +3655,7 @@ merge(Compressor.prototype, {
            if (drop_funcs && node instanceof AST_Defun && node !== self) {
                var def = node.name.definition();
                if (!(def.id in in_use_ids)) {
-                    compressor[node.name.unreferenced() ? "warn" : "info"]("Dropping unused function {name} [{file}:{line},{col}]", template(node.name));
+                    AST_Node[node.name.unreferenced() ? "warn" : "info"]("Dropping unused function {name} [{file}:{line},{col}]", template(node.name));
                    def.eliminated++;
                    return make_node(AST_EmptyStatement, node);
                }
@@ -3681,7 +3676,7 @@ merge(Compressor.prototype, {
                        }
                        var var_defs = var_defs_by_id.get(sym.id);
                        if (var_defs.length > 1 && (!def.value || sym.orig.indexOf(def.name) > sym.eliminated)) {
-                            compressor.warn("Dropping duplicated definition of variable {name} [{file}:{line},{col}]", template(def.name));
+                            AST_Node.warn("Dropping duplicated definition of variable {name} [{file}:{line},{col}]", template(def.name));
                            if (def.value) {
                                var ref = make_node(AST_SymbolRef, def.name, def.name);
                                sym.references.push(ref);
@@ -3704,9 +3699,10 @@ merge(Compressor.prototype, {
                        } else if (compressor.option("functions")
                            && def.value === def.name.fixed_value()
                            && def.value instanceof AST_Function
+                            && !(def.value.name && def.value.name.definition().assignments)
                            && can_rename(def.value, def.name.name)
                            && (!compressor.has_directive("use strict") || parent instanceof AST_Scope)) {
-                            compressor.warn("Declaring {name} as function [{file}:{line},{col}]", template(def.name));
+                            AST_Node.warn("Declaring {name} as function [{file}:{line},{col}]", template(def.name));
                            var defun = make_node(AST_Defun, def, def.value);
                            defun.name = make_node(AST_SymbolDefun, def.name, def.name);
                            var name_def = def.name.scope.resolve().def_function(defun.name);
@@ -3743,10 +3739,10 @@ merge(Compressor.prototype, {
                    } else {
                        var value = def.value && def.value.drop_side_effect_free(compressor);
                        if (value) {
-                            compressor.warn("Side effects in initialization of unused variable {name} [{file}:{line},{col}]", template(def.name));
+                            AST_Node.warn("Side effects in initialization of unused variable {name} [{file}:{line},{col}]", template(def.name));
                            side_effects.push(value);
                        } else {
-                            compressor[def.name.unreferenced() ? "warn" : "info"]("Dropping unused variable {name} [{file}:{line},{col}]", template(def.name));
+                            AST_Node[def.name.unreferenced() ? "warn" : "info"]("Dropping unused variable {name} [{file}:{line},{col}]", template(def.name));
                        }
                        sym.eliminated++;
                    }
@@ -3833,6 +3829,7 @@ merge(Compressor.prototype, {
                };
            }
        });
+        tt.push(compressor.parent());
        self.transform(tt);

        function verify_safe_usage(def, read, modified) {
@@ -4073,6 +4070,16 @@ merge(Compressor.prototype, {
                }));
                return make_sequence(node, assignments);
            }
+            if (node instanceof AST_Unary
+                && !unary_side_effects[node.operator]
+                && node.expression instanceof AST_SymbolRef
+                && node.expression.definition().id in defs_by_id) {
+                node = node.clone();
+                node.expression = make_node(AST_Object, node, {
+                    properties: []
+                });
+                return node;
+            }
            if (node instanceof AST_VarDef && can_hoist(node.name, node.value, 0)) {
                descend(node, this);
                var defs = new Dictionary();
@@ -4089,7 +4096,7 @@ merge(Compressor.prototype, {
            if (node instanceof AST_PropAccess && node.expression instanceof AST_SymbolRef) {
                var defs = defs_by_id[node.expression.definition().id];
                if (defs) {
-                    var def = defs.get(get_value(node.property));
+                    var def = defs.get(node.getProperty());
                    var sym = make_node(AST_SymbolRef, node, {
                        name: def.name,
                        scope: node.expression.scope,
@@ -4211,9 +4218,7 @@ merge(Compressor.prototype, {
                }
                return this;
            }
-            if (this.pure) {
-                compressor.warn("Dropping __PURE__ call [{file}:{line},{col}]", this.start);
-            }
+            if (this.pure) AST_Node.warn("Dropping __PURE__ call [{file}:{line},{col}]", this.start);
            var args = trim(this.args, compressor, first_in_statement);
            return args && make_sequence(this, args);
        });
@@ -4296,7 +4301,7 @@ merge(Compressor.prototype, {
            var body = self.body;
            var node = body.drop_side_effect_free(compressor, true);
            if (!node) {
-                compressor.warn("Dropping side-effect-free statement [{file}:{line},{col}]", self.start);
+                AST_Node.warn("Dropping side-effect-free statement [{file}:{line},{col}]", self.start);
                return make_node(AST_EmptyStatement, self);
            }
            if (node !== body) {
@@ -4375,7 +4380,7 @@ merge(Compressor.prototype, {
                    body: self.condition
                }));
            }
-            extract_declarations_from_unreachable_code(compressor, self.body, body);
+            extract_declarations_from_unreachable_code(self.body, body);
            return make_node(AST_BlockStatement, self, {
                body: body
            });
@@ -4429,8 +4434,9 @@ merge(Compressor.prototype, {

    OPT(AST_For, function(self, compressor) {
        if (!compressor.option("loops")) return self;
-        if (compressor.option("side_effects") && self.init) {
-            self.init = self.init.drop_side_effect_free(compressor);
+        if (compressor.option("side_effects")) {
+            if (self.init) self.init = self.init.drop_side_effect_free(compressor);
+            if (self.step) self.step = self.step.drop_side_effect_free(compressor);
        }
        if (self.condition) {
            var cond = self.condition.evaluate(compressor);
@@ -4448,7 +4454,7 @@ merge(Compressor.prototype, {
            if (!cond) {
                if (compressor.option("dead_code")) {
                    var body = [];
-                    extract_declarations_from_unreachable_code(compressor, self.body, body);
+                    extract_declarations_from_unreachable_code(self.body, body);
                    if (self.init instanceof AST_Statement) {
                        body.push(self.init);
                    } else if (self.init) {
@@ -4495,20 +4501,18 @@ merge(Compressor.prototype, {
                cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
            }
            if (!cond) {
-                compressor.warn("Condition always false [{file}:{line},{col}]", self.condition.start);
+                AST_Node.warn("Condition always false [{file}:{line},{col}]", self.condition.start);
                var body = [];
-                extract_declarations_from_unreachable_code(compressor, self.body, body);
+                extract_declarations_from_unreachable_code(self.body, body);
                body.push(make_node(AST_SimpleStatement, self.condition, {
                    body: self.condition
                }));
                if (self.alternative) body.push(self.alternative);
                return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
            } else if (!(cond instanceof AST_Node)) {
-                compressor.warn("Condition always true [{file}:{line},{col}]", self.condition.start);
+                AST_Node.warn("Condition always true [{file}:{line},{col}]", self.condition.start);
                var body = [];
-                if (self.alternative) {
-                    extract_declarations_from_unreachable_code(compressor, self.alternative, body);
-                }
+                if (self.alternative) extract_declarations_from_unreachable_code(self.alternative, body);
                body.push(make_node(AST_SimpleStatement, self.condition, {
                    body: self.condition
                }));
@@ -4723,7 +4727,7 @@ merge(Compressor.prototype, {
            if (prev && !aborts(prev)) {
                prev.body = prev.body.concat(branch.body);
            } else {
-                extract_declarations_from_unreachable_code(compressor, branch, decl);
+                extract_declarations_from_unreachable_code(branch, decl);
            }
        }
    });
@@ -4734,7 +4738,7 @@ merge(Compressor.prototype, {
        if (compressor.option("dead_code") && all(self.body, is_empty)) {
            var body = [];
            if (self.bcatch) {
-                extract_declarations_from_unreachable_code(compressor, self.bcatch, body);
+                extract_declarations_from_unreachable_code(self.bcatch, body);
                body.forEach(function(stat) {
                    if (!(stat instanceof AST_Definitions)) return;
                    stat.definitions.forEach(function(var_def) {
@@ -4846,7 +4850,7 @@ merge(Compressor.prototype, {
                            elements: elements
                        });
                    } catch (ex) {
-                        compressor.warn("Invalid array length: {length} [{file}:{line},{col}]", {
+                        AST_Node.warn("Invalid array length: {length} [{file}:{line},{col}]", {
                            length: length,
                            file: self.start.file,
                            line: self.start.line,
@@ -4906,7 +4910,7 @@ merge(Compressor.prototype, {
                            value: RegExp.apply(RegExp, params),
                        }));
                    } catch (ex) {
-                        compressor.warn("Error converting {expr} [{file}:{line},{col}]", {
+                        AST_Node.warn("Error converting {expr} [{file}:{line},{col}]", {
                            expr: self.print_to_string(),
                            file: self.start.file,
                            line: self.start.line,
@@ -5089,8 +5093,8 @@ merge(Compressor.prototype, {
                    return self;
                } catch (ex) {
                    if (ex instanceof JS_Parse_Error) {
-                        compressor.warn("Error parsing code passed to new Function [{file}:{line},{col}]", self.args[self.args.length - 1].start);
-                        compressor.warn(ex.toString());
+                        AST_Node.warn("Error parsing code passed to new Function [{file}:{line},{col}]", self.args[self.args.length - 1].start);
+                        AST_Node.warn(ex.toString());
                    } else {
                        throw ex;
                    }
@@ -5420,7 +5424,8 @@ merge(Compressor.prototype, {

    OPT(AST_UnaryPrefix, function(self, compressor) {
        var e = self.expression;
-        if (self.operator == "delete"
+        if (compressor.option("evaluate")
+            && self.operator == "delete"
            && !(e instanceof AST_SymbolRef
                || e instanceof AST_PropAccess
                || is_identifier_atom(e))) {
@@ -5460,7 +5465,7 @@ merge(Compressor.prototype, {
              case "typeof":
                // typeof always returns a non-empty string, thus it's
                // always true in booleans
-                compressor.warn("Boolean expression always true [{file}:{line},{col}]", self.start);
+                AST_Node.warn("Boolean expression always true [{file}:{line},{col}]", self.start);
                return (e instanceof AST_SymbolRef ? make_node(AST_True, self) : make_sequence(self, [
                    e,
                    make_node(AST_True, self)
@@ -5569,7 +5574,7 @@ merge(Compressor.prototype, {
          case "===":
          case "!==":
            if (is_undefined(self.left, compressor) && self.right.is_defined(compressor)) {
-                compressor.warn("Expression always defined [{file}:{line},{col}]", self.start);
+                AST_Node.warn("Expression always defined [{file}:{line},{col}]", self.start);
                return make_sequence(self, [
                    self.right,
                    make_node(self.operator == "===" ? AST_False : AST_True, self)
@@ -5648,14 +5653,14 @@ merge(Compressor.prototype, {
            var ll = self.left.evaluate(compressor);
            var rr = self.right.evaluate(compressor);
            if (ll && typeof ll == "string") {
-                compressor.warn("+ in boolean context always true [{file}:{line},{col}]", self.start);
+                AST_Node.warn("+ in boolean context always true [{file}:{line},{col}]", self.start);
                return make_sequence(self, [
                    self.right,
                    make_node(AST_True, self)
                ]).optimize(compressor);
            }
            if (rr && typeof rr == "string") {
-                compressor.warn("+ in boolean context always true [{file}:{line},{col}]", self.start);
+                AST_Node.warn("+ in boolean context always true [{file}:{line},{col}]", self.start);
                return make_sequence(self, [
                    self.left,
                    make_node(AST_True, self)
@@ -5715,16 +5720,16 @@ merge(Compressor.prototype, {
              case "&&":
                var ll = fuzzy_eval(self.left);
                if (!ll) {
-                    compressor.warn("Condition left of && always false [{file}:{line},{col}]", self.start);
+                    AST_Node.warn("Condition left of && always false [{file}:{line},{col}]", self.start);
                    return maintain_this_binding(compressor, compressor.parent(), compressor.self(), self.left).optimize(compressor);
                } else if (!(ll instanceof AST_Node)) {
-                    compressor.warn("Condition left of && always true [{file}:{line},{col}]", self.start);
+                    AST_Node.warn("Condition left of && always true [{file}:{line},{col}]", self.start);
                    return make_sequence(self, [ self.left, self.right ]).optimize(compressor);
                }
                var rr = self.right.evaluate(compressor);
                if (!rr) {
                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
-                        compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start);
+                        AST_Node.warn("Boolean && always false [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
                            make_node(AST_False, self)
@@ -5734,7 +5739,7 @@ merge(Compressor.prototype, {
                    var parent = compressor.parent();
                    if (parent.operator == "&&" && parent.left === compressor.self()
                        || compressor.option("booleans") && compressor.in_boolean_context()) {
-                        compressor.warn("Dropping side-effect-free && [{file}:{line},{col}]", self.start);
+                        AST_Node.warn("Dropping side-effect-free && [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
                }
@@ -5751,10 +5756,10 @@ merge(Compressor.prototype, {
              case "||":
                var ll = fuzzy_eval(self.left);
                if (!ll) {
-                    compressor.warn("Condition left of || always false [{file}:{line},{col}]", self.start);
+                    AST_Node.warn("Condition left of || always false [{file}:{line},{col}]", self.start);
                    return make_sequence(self, [ self.left, self.right ]).optimize(compressor);
                } else if (!(ll instanceof AST_Node)) {
-                    compressor.warn("Condition left of || always true [{file}:{line},{col}]", self.start);
+                    AST_Node.warn("Condition left of || always true [{file}:{line},{col}]", self.start);
                    return maintain_this_binding(compressor, compressor.parent(), compressor.self(), self.left).optimize(compressor);
                }
                var rr = self.right.evaluate(compressor);
@@ -5762,12 +5767,12 @@ merge(Compressor.prototype, {
                    var parent = compressor.parent();
                    if (parent.operator == "||" && parent.left === compressor.self()
                        || compressor.option("booleans") && compressor.in_boolean_context()) {
-                        compressor.warn("Dropping side-effect-free || [{file}:{line},{col}]", self.start);
+                        AST_Node.warn("Dropping side-effect-free || [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
                } else if (!(rr instanceof AST_Node)) {
                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
-                        compressor.warn("Boolean || always true [{file}:{line},{col}]", self.start);
+                        AST_Node.warn("Boolean || always true [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
                            make_node(AST_True, self)
@@ -5962,11 +5967,10 @@ merge(Compressor.prototype, {
                }
            }
        }
-        if (compressor.option("unsafe")
-            && self.right instanceof AST_Call
-            && self.right.expression instanceof AST_Dot
-            && indexFns[self.right.expression.property]) {
+        if (compressor.option("unsafe")) {
+            var indexRight = is_indexFn(self.right);
            if (compressor.option("booleans")
+                && indexRight
                && (self.operator == "==" || self.operator == "!=")
                && self.left instanceof AST_Number
                && self.left.getValue() == 0
@@ -5976,18 +5980,26 @@ merge(Compressor.prototype, {
                    expression: self.right
                }) : self.right).optimize(compressor);
            }
+            var indexLeft = is_indexFn(self.left);
            if (compressor.option("comparisons") && is_indexOf_match_pattern()) {
                var node = make_node(AST_UnaryPrefix, self, {
                    operator: "!",
                    expression: make_node(AST_UnaryPrefix, self, {
                        operator: "~",
-                        expression: self.right
+                        expression: indexLeft ? self.left : self.right
                    })
                });
-                if (self.operator == "!=" || self.operator == "<=") node = make_node(AST_UnaryPrefix, self, {
-                    operator: "!",
-                    expression: node
-                });
+                switch (self.operator) {
+                  case "<":
+                    if (indexLeft) break;
+                  case "<=":
+                  case "!=":
+                    node = make_node(AST_UnaryPrefix, self, {
+                        operator: "!",
+                        expression: node
+                    });
+                    break;
+                }
                return node.optimize(compressor);
            }
        }
@@ -6025,17 +6037,26 @@ merge(Compressor.prototype, {
            return node.evaluate(compressor);
        }

+        function is_indexFn(node) {
+            return node instanceof AST_Call
+                && node.expression instanceof AST_Dot
+                && indexFns[node.expression.property];
+        }
+
        function is_indexOf_match_pattern() {
            switch (self.operator) {
-              case ">":
              case "<=":
-                // 0 > array.indexOf(string) => !~array.indexOf(string)
                // 0 <= array.indexOf(string) => !!~array.indexOf(string)
-                return self.left instanceof AST_Number && self.left.getValue() == 0;
+                return indexRight && self.left instanceof AST_Number && self.left.getValue() == 0;
+              case "<":
+                // array.indexOf(string) < 0 => !~array.indexOf(string)
+                if (indexLeft && self.right instanceof AST_Number && self.right.getValue() == 0) return true;
+                // -1 < array.indexOf(string) => !!~array.indexOf(string)
              case "==":
              case "!=":
                // -1 == array.indexOf(string) => !~array.indexOf(string)
                // -1 != array.indexOf(string) => !!~array.indexOf(string)
+                if (!indexRight) return false;
                return self.left instanceof AST_Number && self.left.getValue() == -1
                    || self.left instanceof AST_UnaryPrefix && self.left.operator == "-"
                        && self.left.expression instanceof AST_Number && self.left.expression.getValue() == 1;
@@ -6069,7 +6090,7 @@ merge(Compressor.prototype, {
            }
        }
        var parent = compressor.parent();
-        if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
+        if (compressor.option("reduce_vars") && is_lhs(compressor.self(), parent) !== compressor.self()) {
            var def = self.definition();
            var fixed = self.fixed_value();
            var single_use = def.single_use && !(parent instanceof AST_Call && parent.is_expr_pure(compressor));
@@ -6128,7 +6149,6 @@ merge(Compressor.prototype, {
                    }));
                } else {
                    value = fixed.optimize(compressor);
-                    if (value === fixed) value = fixed.clone(true);
                }
                def.replaced++;
                return value;
@@ -6280,6 +6300,7 @@ merge(Compressor.prototype, {
        if (compressor.option("dead_code")
            && self.left instanceof AST_SymbolRef
            && (def = self.left.definition()).scope === compressor.find_parent(AST_Lambda)) {
+            if (self.left.is_immutable()) return strip_assignment();
            var level = 0, node, parent = self;
            do {
                node = parent;
@@ -6287,16 +6308,12 @@ merge(Compressor.prototype, {
                if (parent instanceof AST_Exit) {
                    if (in_try(level, parent)) break;
                    if (is_reachable(def.scope, [ def ])) break;
-                    if (self.operator == "=") return self.right.optimize(compressor);
                    def.fixed = false;
-                    return make_node(AST_Binary, self, {
-                        operator: self.operator.slice(0, -1),
-                        left: self.left,
-                        right: self.right
-                    }).optimize(compressor);
+                    return strip_assignment();
                }
            } while (parent instanceof AST_Binary && parent.right === node
-                || parent instanceof AST_Sequence && parent.tail_node() === node);
+                || parent instanceof AST_Sequence && parent.tail_node() === node
+                || parent instanceof AST_UnaryPrefix);
        }
        self = self.lift_sequences(compressor);
        if (!compressor.option("assignments")) return self;
@@ -6344,6 +6361,14 @@ merge(Compressor.prototype, {
                }
            }
        }
+
+        function strip_assignment() {
+            return (self.operator != "=" ? make_node(AST_Binary, self, {
+                operator: self.operator.slice(0, -1),
+                left: self.left,
+                right: self.right
+            }) : maintain_this_binding(compressor, compressor.parent(), self, self.right)).optimize(compressor);
+        }
    });

    OPT(AST_Conditional, function(self, compressor) {
@@ -6357,10 +6382,10 @@ merge(Compressor.prototype, {
        }
        var cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
        if (!cond) {
-            compressor.warn("Condition always false [{file}:{line},{col}]", self.start);
+            AST_Node.warn("Condition always false [{file}:{line},{col}]", self.start);
            return make_sequence(self, [ self.condition, self.alternative ]).optimize(compressor);
        } else if (!(cond instanceof AST_Node)) {
-            compressor.warn("Condition always true [{file}:{line},{col}]", self.start);
+            AST_Node.warn("Condition always true [{file}:{line},{col}]", self.start);
            return make_sequence(self, [ self.condition, self.consequent ]).optimize(compressor);
        }
        var negated = cond.negate(compressor, first_in_statement(compressor));
@@ -6599,7 +6624,7 @@ merge(Compressor.prototype, {
        });
        var p = compressor.parent();
        if (p instanceof AST_Binary && (p.operator == "==" || p.operator == "!=")) {
-            compressor.warn("Non-strict equality against boolean: {operator} {value} [{file}:{line},{col}]", {
+            AST_Node.warn("Non-strict equality against boolean: {operator} {value} [{file}:{line},{col}]", {
                operator : p.operator,
                value    : self.value,
                file     : p.start.file,
@@ -6655,24 +6680,30 @@ merge(Compressor.prototype, {
                }
            }
        }
-        var fn;
+        var parent = compressor.parent();
+        var def, fn, fn_parent;
        if (compressor.option("arguments")
            && expr instanceof AST_SymbolRef
-            && expr.name == "arguments"
-            && expr.definition().orig.length == 1
+            && is_arguments(def = expr.definition())
            && prop instanceof AST_Number
-            && (fn = expr.scope) === compressor.find_parent(AST_Lambda)) {
+            && (fn = expr.scope) === find_lambda()) {
            var index = prop.getValue();
+            if (parent instanceof AST_UnaryPrefix && parent.operator == "delete") {
+                if (!def.deleted) def.deleted = [];
+                def.deleted[index] = true;
+            }
            var argname = fn.argnames[index];
-            if (argname && compressor.has_directive("use strict")) {
-                var def = argname.definition();
+            if (def.deleted && def.deleted[index]) {
+                argname = null;
+            } else if (argname && compressor.has_directive("use strict")) {
+                var arg_def = argname.definition();
                if (!compressor.option("reduce_vars")
-                    || expr.definition().reassigned
-                    || def.assignments
-                    || def.orig.length > 1) {
+                    || def.reassigned
+                    || arg_def.assignments
+                    || arg_def.orig.length > 1) {
                    argname = null;
                }
-            } else if (!argname && !compressor.option("keep_fargs") && index < fn.argnames.length + 5) {
+            } else if (!argname && index < fn.argnames.length + 5 && compressor.drop_fargs(fn, fn_parent)) {
                while (index >= fn.argnames.length) {
                    argname = make_node(AST_SymbolFunarg, fn, {
                        name: fn.make_var_name("argument_" + fn.argnames.length),
@@ -6685,13 +6716,14 @@ merge(Compressor.prototype, {
            if (argname && find_if(function(node) {
                return node.name === argname.name;
            }, fn.argnames) === argname) {
+                def.reassigned = false;
                var sym = make_node(AST_SymbolRef, self, argname);
                sym.reference({});
                delete argname.__unused;
                return sym;
            }
        }
-        if (is_lhs(self, compressor.parent())) return self;
+        if (is_lhs(compressor.self(), parent)) return self;
        if (key !== prop) {
            var sub = self.flatten_object(property, compressor);
            if (sub) {
@@ -6740,6 +6772,16 @@ merge(Compressor.prototype, {
            return best_of(compressor, ev, self);
        }
        return self;
+
+        function find_lambda() {
+            var i = 0, p;
+            while (p = compressor.parent(i++)) {
+                if (p instanceof AST_Lambda) {
+                    fn_parent = compressor.parent(i);
+                    return p;
+                }
+            }
+        }
    });

    AST_Scope.DEFMETHOD("contains_this", function() {
@@ -6782,14 +6824,14 @@ merge(Compressor.prototype, {

    OPT(AST_Dot, function(self, compressor) {
        if (self.property == "arguments" || self.property == "caller") {
-            compressor.warn("Function.prototype.{prop} not supported [{file}:{line},{col}]", {
+            AST_Node.warn("Function.prototype.{prop} not supported [{file}:{line},{col}]", {
                prop: self.property,
                file: self.start.file,
                line: self.start.line,
                col: self.start.col
            });
        }
-        if (is_lhs(self, compressor.parent())) return self;
+        if (is_lhs(compressor.self(), compressor.parent())) return self;
        if (compressor.option("unsafe_proto")
            && self.expression instanceof AST_Dot
            && self.expression.property == "prototype") {
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -8,7 +8,7 @@ var to_base64 = typeof btoa == "undefined" ? function(str) {
 } : btoa;

 function read_source_map(name, code) {
-    var match = /\n\/\/# sourceMappingURL=data:application\/json(;.*?)?;base64,(.*)/.exec(code);
+    var match = /\n\/\/# sourceMappingURL=data:application\/json(;.*?)?;base64,(\S+)\s*$/.exec(code);
    if (!match) {
        AST_Node.warn("inline source map not found: " + name);
        return null;
@@ -51,7 +51,6 @@ function to_json(cache) {
 }

 function minify(files, options) {
-    var warn_function = AST_Node.warn_function;
    try {
        options = defaults(options, {
            compress: {},
@@ -78,7 +77,6 @@ function minify(files, options) {
        set_shorthand("ie8", options, [ "compress", "mangle", "output" ]);
        set_shorthand("keep_fnames", options, [ "compress", "mangle" ]);
        set_shorthand("toplevel", options, [ "compress", "mangle" ]);
-        set_shorthand("warnings", options, [ "compress" ]);
        var quoted_props;
        if (options.mangle) {
            options.mangle = defaults(options.mangle, {
@@ -116,11 +114,9 @@ function minify(files, options) {
            }, true);
        }
        var warnings = [];
-        if (options.warnings && !AST_Node.warn_function) {
-            AST_Node.warn_function = function(warning) {
-                warnings.push(warning);
-            };
-        }
+        if (options.warnings) AST_Node.log_function(function(warning) {
+            warnings.push(warning);
+        }, options.warnings == "verbose");
        if (timings) timings.parse = Date.now();
        var source_maps, toplevel;
        if (files instanceof AST_Toplevel) {
@@ -155,12 +151,13 @@ function minify(files, options) {
        if (quoted_props) {
            reserve_quoted_keys(toplevel, quoted_props);
        }
-        if (options.wrap) {
-            toplevel = toplevel.wrap_commonjs(options.wrap);
-        }
-        if (options.enclose) {
-            toplevel = toplevel.wrap_enclose(options.enclose);
-        }
+        [ "enclose", "wrap" ].forEach(function(action) {
+            var option = options[action];
+            if (!option) return;
+            var orig = toplevel.print_to_string().slice(0, -1);
+            toplevel = toplevel[action](option);
+            files[toplevel.start.file] = toplevel.print_to_string().replace(orig, "");
+        });
        if (timings) timings.rename = Date.now();
        if (options.rename) {
            toplevel.figure_out_scope(options.mangle);
@@ -208,10 +205,14 @@ function minify(files, options) {
            result.code = stream.get();
            if (options.sourceMap) {
                result.map = options.output.source_map.toString();
-                if (options.sourceMap.url == "inline") {
-                    result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(result.map);
-                } else if (options.sourceMap.url) {
-                    result.code += "\n//# sourceMappingURL=" + options.sourceMap.url;
+                var url = options.sourceMap.url;
+                if (url) {
+                    result.code = result.code.replace(/\n\/\/# sourceMappingURL=\S+\s*$/, "");
+                    if (url == "inline") {
+                        result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(result.map);
+                    } else {
+                        result.code += "\n//# sourceMappingURL=" + url;
+                    }
                }
            }
        }
@@ -240,7 +241,5 @@ function minify(files, options) {
        return result;
    } catch (ex) {
        return { error: ex };
-    } finally {
-        AST_Node.warn_function = warn_function;
    }
 }
--- a/lib/output.js
+++ b/lib/output.js
@@ -217,23 +217,12 @@ function OutputStream(options) {

    var flush_mappings = mappings ? function() {
        mappings.forEach(function(mapping) {
-            try {
-                options.source_map.add(
-                    mapping.token.file,
-                    mapping.line, mapping.col,
-                    mapping.token.line, mapping.token.col,
-                    !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name
-                );
-            } catch(ex) {
-                AST_Node.warn("Couldn't figure out mapping for {file}:{line},{col} → {cline},{ccol} [{name}]", {
-                    file: mapping.token.file,
-                    line: mapping.token.line,
-                    col: mapping.token.col,
-                    cline: mapping.line,
-                    ccol: mapping.col,
-                    name: mapping.name || ""
-                })
-            }
+            options.source_map.add(
+                mapping.token.file,
+                mapping.line, mapping.col,
+                mapping.token.line, mapping.token.col,
+                !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name
+            );
        });
        mappings = [];
    } : noop;
@@ -462,16 +451,11 @@ function OutputStream(options) {

    function prepend_comments(node) {
        var self = this;
-        var start = node.start;
-        if (!start) return;
-        if (start.comments_before && start.comments_before._dumped === self) return;
-        var comments = start.comments_before;
-        if (!comments) {
-            comments = start.comments_before = [];
-        }
-        comments._dumped = self;
+        var scan = node instanceof AST_Exit && node.value;
+        var comments = dump(node);
+        if (!comments) return;

-        if (node instanceof AST_Exit && node.value) {
+        if (scan) {
            var tw = new TreeWalker(function(node) {
                var parent = tw.parent();
                if (parent instanceof AST_Exit
@@ -482,11 +466,8 @@ function OutputStream(options) {
                    || parent instanceof AST_Sequence && parent.expressions[0] === node
                    || parent instanceof AST_Sub && parent.expression === node
                    || parent instanceof AST_UnaryPostfix) {
-                    var text = node.start.comments_before;
-                    if (text && text._dumped !== self) {
-                        text._dumped = self;
-                        comments = comments.concat(text);
-                    }
+                    var before = dump(node);
+                    if (before) comments = comments.concat(before);
                } else {
                    return true;
                }
@@ -529,13 +510,29 @@ function OutputStream(options) {
            }
        });
        if (!last_nlb) {
-            if (start.nlb) {
+            if (node.start.nlb) {
                print("\n");
                indent();
            } else {
                space();
            }
        }
+
+        function dump(node) {
+            var token = node.start;
+            if (!token) {
+                if (!scan) return;
+                node.start = token = new AST_Token();
+            }
+            var comments = token.comments_before;
+            if (!comments) {
+                if (!scan) return;
+                token.comments_before = comments = [];
+            }
+            if (comments._dumped === self) return;
+            comments._dumped = self;
+            return comments;
+        }
    }

    function append_comments(node, tail) {
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -504,7 +504,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            var regexp = new RegExp(source, mods);
            regexp.raw_source = source;
            return token("regexp", regexp);
-        } catch(e) {
+        } catch (e) {
            parse_error(e.message);
        }
    });
@@ -556,7 +556,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        return function(x) {
            try {
                return cont(x);
-            } catch(ex) {
+            } catch (ex) {
                if (ex === EX_EOF) parse_error(eof_error);
                else throw ex;
            }
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -70,7 +70,7 @@ function configure_error_stack(fn) {
            err.name = this.name;
            try {
                throw err;
-            } catch(e) {
+            } catch (e) {
                return e.stack;
            }
        }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.5.9",
+  "version": "3.5.14",
  "engines": {
    "node": ">=0.8.0"
  },
@@ -31,7 +31,7 @@
    "semver": "~6.0.0"
  },
  "scripts": {
-    "test": "node test/run-tests.js"
+    "test": "node test/compress.js && node test/mocha.js"
  },
  "keywords": [
    "cli",
--- a/test/compress.js
+++ b/test/compress.js
@@ -0,0 +1,450 @@
+var assert = require("assert");
+var child_process = require("child_process");
+var fs = require("fs");
+var path = require("path");
+var sandbox = require("./sandbox");
+var semver = require("semver");
+var U = require("./node");
+
+var file = process.argv[2];
+var dir = path.resolve(path.dirname(module.filename), "compress");
+if (file) {
+    var minify_options = require("./ufuzz.json").map(JSON.stringify);
+    log("--- {file}", { file: file });
+    var tests = parse_test(path.resolve(dir, file));
+    process.exit(Object.keys(tests).filter(function(name) {
+        return !test_case(tests[name]);
+    }).length);
+} else {
+    var files = fs.readdirSync(dir).filter(function(name) {
+        return /\.js$/i.test(name);
+    });
+    var failures = 0;
+    var failed_files = Object.create(null);
+    (function next() {
+        var file = files.shift();
+        if (file) {
+            child_process.spawn(process.argv[0], [ process.argv[1], file ], {
+                stdio: [ "ignore", 1, 2 ]
+            }).on("exit", function(code) {
+                if (code) {
+                    failures += code;
+                    failed_files[file] = code;
+                }
+                next();
+            });
+        } else if (failures) {
+            console.error();
+            console.error("!!! Failed " + failures + " test case(s).");
+            console.error("!!! " + Object.keys(failed_files).join(", "));
+            process.exit(1);
+        }
+    })();
+}
+
+function evaluate(code) {
+    if (code instanceof U.AST_Node) code = make_code(code, { beautify: true });
+    return new Function("return(" + code + ")")();
+}
+
+function log() {
+    console.log("%s", tmpl.apply(null, arguments));
+}
+
+function make_code(ast, options) {
+    var stream = U.OutputStream(options);
+    ast.print(stream);
+    return stream.get();
+}
+
+function parse_test(file) {
+    var script = fs.readFileSync(file, "utf8");
+    // TODO try/catch can be removed after fixing https://github.com/mishoo/UglifyJS2/issues/348
+    try {
+        var ast = U.parse(script, {
+            filename: file
+        });
+    } catch (e) {
+        console.error("Caught error while parsing tests in " + file);
+        console.error(e);
+        process.exit(1);
+    }
+    var tests = Object.create(null);
+    var tw = new U.TreeWalker(function(node, descend) {
+        if (node instanceof U.AST_LabeledStatement
+            && tw.parent() instanceof U.AST_Toplevel) {
+            var name = node.label.name;
+            if (name in tests) {
+                throw new Error('Duplicated test name "' + name + '" in ' + file);
+            }
+            tests[name] = get_one_test(name, node.body);
+            return true;
+        }
+        if (!(node instanceof U.AST_Toplevel)) croak(node);
+    });
+    ast.walk(tw);
+    return tests;
+
+    function croak(node) {
+        throw new Error(tmpl("Can't understand test file {file} [{line},{col}]\n{code}", {
+            file: file,
+            line: node.start.line,
+            col: node.start.col,
+            code: make_code(node, { beautify: false })
+        }));
+    }
+
+    function read_string(stat) {
+        if (stat.TYPE == "SimpleStatement") {
+            var body = stat.body;
+            switch(body.TYPE) {
+              case "String":
+                return body.value;
+              case "Array":
+                return body.elements.map(function(element) {
+                    if (element.TYPE !== "String")
+                        throw new Error("Should be array of strings");
+                    return element.value;
+                }).join("\n");
+            }
+        }
+        throw new Error("Should be string or array of strings");
+    }
+
+    function get_one_test(name, block) {
+        var test = { name: name, options: {} };
+        var tw = new U.TreeWalker(function(node, descend) {
+            if (node instanceof U.AST_Assign) {
+                if (!(node.left instanceof U.AST_SymbolRef)) {
+                    croak(node);
+                }
+                var name = node.left.name;
+                test[name] = evaluate(node.right);
+                return true;
+            }
+            if (node instanceof U.AST_LabeledStatement) {
+                var label = node.label;
+                assert.ok([
+                    "input",
+                    "expect",
+                    "expect_exact",
+                    "expect_warnings",
+                    "expect_stdout",
+                    "node_version",
+                ].indexOf(label.name) >= 0, tmpl("Unsupported label {name} [{line},{col}]", {
+                    name: label.name,
+                    line: label.start.line,
+                    col: label.start.col
+                }));
+                var stat = node.body;
+                if (label.name == "expect_exact" || label.name == "node_version") {
+                    test[label.name] = read_string(stat);
+                } else if (label.name == "expect_stdout") {
+                    var body = stat.body;
+                    if (body instanceof U.AST_Boolean) {
+                        test[label.name] = body.value;
+                    } else if (body instanceof U.AST_Call) {
+                        var ctor = global[body.expression.name];
+                        assert.ok(ctor === Error || ctor.prototype instanceof Error, tmpl("Unsupported expect_stdout format [{line},{col}]", {
+                            line: label.start.line,
+                            col: label.start.col
+                        }));
+                        test[label.name] = ctor.apply(null, body.args.map(function(node) {
+                            assert.ok(node instanceof U.AST_Constant, tmpl("Unsupported expect_stdout format [{line},{col}]", {
+                                line: label.start.line,
+                                col: label.start.col
+                            }));
+                            return node.value;
+                        }));
+                    } else {
+                        test[label.name] = read_string(stat) + "\n";
+                    }
+                } else {
+                    test[label.name] = stat;
+                }
+                return true;
+            }
+        });
+        block.walk(tw);
+        return test;
+    }
+}
+
+// Try to reminify original input with standard options
+// to see if it matches expect_stdout.
+function reminify(orig_options, input_code, input_formatted, 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",
+                "---INPUT---",
+                "{input}",
+                "---OPTIONS---",
+                "{options}",
+                "--ERROR---",
+                "{error}",
+                "",
+                "",
+            ].join("\n"), {
+                input: input_formatted,
+                options: options_formatted,
+                error: result.error,
+            });
+            return false;
+        } else {
+            var expected = stdout[options.toplevel ? 1 : 0];
+            var actual = run_code(result.code, options.toplevel);
+            if (typeof expected != "string" && typeof actual != "string" && expected.name == actual.name) {
+                actual = expected;
+            }
+            if (!sandbox.same_stdout(expected, actual)) {
+                log([
+                    "!!! failed running reminified input",
+                    "---INPUT---",
+                    "{input}",
+                    "---OPTIONS---",
+                    "{options}",
+                    "---OUTPUT---",
+                    "{output}",
+                    "---EXPECTED {expected_type}---",
+                    "{expected}",
+                    "---ACTUAL {actual_type}---",
+                    "{actual}",
+                    "",
+                    "",
+                ].join("\n"), {
+                    input: input_formatted,
+                    options: options_formatted,
+                    output: result.code,
+                    expected_type: typeof expected == "string" ? "STDOUT" : "ERROR",
+                    expected: expected,
+                    actual_type: typeof actual == "string" ? "STDOUT" : "ERROR",
+                    actual: actual,
+                });
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+function run_code(code, toplevel) {
+    var result = sandbox.run_code(code, toplevel);
+    return typeof result == "string" ? result.replace(/\u001b\[\d+m/g, "") : result;
+}
+
+function test_case(test) {
+    log("    Running test [{name}]", { name: test.name });
+    var output_options = test.beautify || {};
+    var expect;
+    if (test.expect) {
+        expect = make_code(to_toplevel(test.expect, test.mangle), output_options);
+    } else {
+        expect = test.expect_exact;
+    }
+    var input = to_toplevel(test.input, test.mangle);
+    var input_code = make_code(input);
+    var input_formatted = make_code(test.input, {
+        beautify: true,
+        comments: "all",
+        keep_quoted_props: true,
+        quote_style: 3,
+    });
+    try {
+        U.parse(input_code);
+    } catch (ex) {
+        log([
+            "!!! Cannot parse input",
+            "---INPUT---",
+            "{input}",
+            "--PARSE ERROR--",
+            "{error}",
+            "",
+            "",
+        ].join("\n"), {
+            input: input_formatted,
+            error: ex,
+        });
+        return false;
+    }
+    var warnings_emitted = [];
+    if (test.expect_warnings) {
+        var expected_warnings = make_code(test.expect_warnings, {
+            beautify: false,
+            quote_style: 2, // force double quote to match JSON
+        });
+        U.AST_Node.log_function(function(text) {
+            warnings_emitted.push(text);
+        }, /"INFO: /.test(expected_warnings));
+    }
+    if (test.mangle && test.mangle.properties && test.mangle.properties.keep_quoted) {
+        var quoted_props = test.mangle.properties.reserved;
+        if (!Array.isArray(quoted_props)) quoted_props = [];
+        test.mangle.properties.reserved = quoted_props;
+        U.reserve_quoted_keys(input, quoted_props);
+    }
+    if (test.rename) {
+        input.figure_out_scope(test.mangle);
+        input.expand_names(test.mangle);
+    }
+    var cmp = new U.Compressor(test.options, true);
+    var output = cmp.compress(input);
+    output.figure_out_scope(test.mangle);
+    if (test.mangle) {
+        output.compute_char_frequency(test.mangle);
+        output.mangle_names(test.mangle);
+        if (test.mangle.properties) {
+            output = U.mangle_properties(output, test.mangle.properties);
+        }
+    }
+    output = make_code(output, output_options);
+    if (expect != output) {
+        log([
+            "!!! failed",
+            "---INPUT---",
+            "{input}",
+            "---OUTPUT---",
+            "{output}",
+            "---EXPECTED---",
+            "{expected}",
+            "",
+            "",
+        ].join("\n"), {
+            input: input_formatted,
+            output: output,
+            expected: expect
+        });
+        return false;
+    }
+    // expect == output
+    try {
+        U.parse(output);
+    } catch (ex) {
+        log([
+            "!!! Test matched expected result but cannot parse output",
+            "---INPUT---",
+            "{input}",
+            "---OUTPUT---",
+            "{output}",
+            "--REPARSE ERROR--",
+            "{error}",
+            "",
+            "",
+        ].join("\n"), {
+            input: input_formatted,
+            output: output,
+            error: ex,
+        });
+        return false;
+    }
+    if (test.expect_warnings) {
+        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",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED WARNINGS---",
+                "{expected_warnings}",
+                "---ACTUAL WARNINGS---",
+                "{actual_warnings}",
+                "",
+                "",
+            ].join("\n"), {
+                input: input_formatted,
+                expected_warnings: expected_warnings,
+                actual_warnings: actual_warnings,
+            });
+            return false;
+        }
+    }
+    if (test.expect_stdout && (!test.node_version || semver.satisfies(process.version, test.node_version))) {
+        var stdout = [ run_code(input_code), run_code(input_code, true) ];
+        var toplevel = test.options.toplevel;
+        var actual = stdout[toplevel ? 1 : 0];
+        if (test.expect_stdout === true) {
+            test.expect_stdout = actual;
+        }
+        if (!sandbox.same_stdout(test.expect_stdout, actual)) {
+            log([
+                "!!! Invalid input or expected stdout",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED {expected_type}---",
+                "{expected}",
+                "---ACTUAL {actual_type}---",
+                "{actual}",
+                "",
+                "",
+            ].join("\n"), {
+                input: input_formatted,
+                expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
+                expected: test.expect_stdout,
+                actual_type: typeof actual == "string" ? "STDOUT" : "ERROR",
+                actual: actual,
+            });
+            return false;
+        }
+        actual = run_code(output, toplevel);
+        if (!sandbox.same_stdout(test.expect_stdout, actual)) {
+            log([
+                "!!! failed",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED {expected_type}---",
+                "{expected}",
+                "---ACTUAL {actual_type}---",
+                "{actual}",
+                "",
+                "",
+            ].join("\n"), {
+                input: input_formatted,
+                expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
+                expected: test.expect_stdout,
+                actual_type: typeof actual == "string" ? "STDOUT" : "ERROR",
+                actual: actual,
+            });
+            return false;
+        }
+        if (!reminify(test.options, input_code, input_formatted, stdout)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function tmpl() {
+    return U.string_template.apply(null, arguments);
+}
+
+function to_toplevel(input, mangle_options) {
+    if (!(input instanceof U.AST_BlockStatement)) throw new Error("Unsupported input syntax");
+    var directive = true;
+    var offset = input.start.line;
+    var tokens = [];
+    var toplevel = new U.AST_Toplevel(input.transform(new U.TreeTransformer(function(node) {
+        if (U.push_uniq(tokens, node.start)) node.start.line -= offset;
+        if (!directive || node === input) return;
+        if (node instanceof U.AST_SimpleStatement && node.body instanceof U.AST_String) {
+            return new U.AST_Directive(node.body);
+        } else {
+            directive = false;
+        }
+    })));
+    toplevel.figure_out_scope(mangle_options);
+    return toplevel;
+}
--- a/test/compress/arguments.js
+++ b/test/compress/arguments.js
@@ -405,6 +405,52 @@ issue_3273_global_strict_reduce_vars: {
    ]
 }

+issue_3273_keep_fargs_false: {
+    options = {
+        arguments: true,
+        keep_fargs: false,
+        reduce_vars: true,
+    }
+    input: {
+        (function() {
+            "use strict";
+            arguments[0]++;
+            console.log(arguments[0]);
+        })(0);
+    }
+    expect: {
+        (function(argument_0) {
+            "use strict";
+            argument_0++;
+            console.log(argument_0);
+        })(0);
+    }
+    expect_stdout: "1"
+}
+
+issue_3273_keep_fargs_strict: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+        reduce_vars: true,
+    }
+    input: {
+        (function() {
+            "use strict";
+            arguments[0]++;
+            console.log(arguments[0]);
+        })(0);
+    }
+    expect: {
+        (function(argument_0) {
+            "use strict";
+            argument_0++;
+            console.log(argument_0);
+        })(0);
+    }
+    expect_stdout: "1"
+}
+
 issue_3282_1: {
    options = {
        arguments: true,
@@ -576,3 +622,157 @@ issue_3282_2_passes: {
    }
    expect_stdout: true
 }
+
+issue_3420_1: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        console.log(function() {
+            return function() {
+                return arguments[0];
+            };
+        }().length);
+    }
+    expect: {
+        console.log(function() {
+            return function() {
+                return arguments[0];
+            };
+        }().length);
+    }
+    expect_stdout: "0"
+}
+
+issue_3420_2: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        var foo = function() {
+            delete arguments[0];
+        };
+        foo();
+    }
+    expect: {
+        var foo = function() {
+            delete arguments[0];
+        };
+        foo();
+    }
+    expect_stdout: true
+}
+
+issue_3420_3: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        "use strict";
+        var foo = function() {
+            delete arguments[0];
+        };
+        foo();
+    }
+    expect: {
+        "use strict";
+        var foo = function() {
+            delete arguments[0];
+        };
+        foo();
+    }
+    expect_stdout: true
+}
+
+issue_3420_4: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        !function() {
+            console.log(arguments[0]);
+            delete arguments[0];
+            console.log(arguments[0]);
+        }(42);
+    }
+    expect: {
+        !function(argument_0) {
+            console.log(argument_0);
+            delete arguments[0];
+            console.log(arguments[0]);
+        }(42);
+    }
+    expect_stdout: [
+        "42",
+        "undefined",
+    ]
+}
+
+issue_3420_5: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        "use strict";
+        !function() {
+            console.log(arguments[0]);
+            delete arguments[0];
+            console.log(arguments[0]);
+        }(42);
+    }
+    expect: {
+        "use strict";
+        !function(argument_0) {
+            console.log(argument_0);
+            delete arguments[0];
+            console.log(arguments[0]);
+        }(42);
+    }
+    expect_stdout: [
+        "42",
+        "undefined",
+    ]
+}
+
+issue_3420_6: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        console.log(function() {
+            return delete arguments[0];
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return delete arguments[0];
+        }());
+    }
+    expect_stdout: "true"
+}
+
+issue_3420_7: {
+    options = {
+        arguments: true,
+        keep_fargs: "strict",
+    }
+    input: {
+        "use strict";
+        console.log(function() {
+            return delete arguments[0];
+        }());
+    }
+    expect: {
+        "use strict";
+        console.log(function() {
+            return delete arguments[0];
+        }());
+    }
+    expect_stdout: "true"
+}
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -3497,10 +3497,10 @@ issue_2437_1: {
                return Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {}),
                    result;
            }
-            var req, detectFunc = function(){};
-            (req = new XMLHttpRequest()).onreadystatechange = detectFunc;
-            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
-            return req.onreadystatechange = null, result;
+            var req = new XMLHttpRequest(), detectFunc = function(){};
+            return req.onreadystatechange = detectFunc,
+            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc,
+            req.onreadystatechange = null, result;
        }());
    }
 }
@@ -3545,8 +3545,8 @@ issue_2437_2: {
            if (xhrDesc)
                return (req = new XMLHttpRequest()).onreadystatechange,
                    Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {});
-            var req;
-            (req = new XMLHttpRequest).onreadystatechange = function(){},
+            var req = new XMLHttpRequest();
+            req.onreadystatechange = function(){},
            req[SYMBOL_FAKE_ONREADYSTATECHANGE_1],
            req.onreadystatechange = null;
        }();
@@ -4194,7 +4194,7 @@ may_throw_2: {
                var a = x();
                ++b;
                return b(a);
-            } catch(e) {}
+            } catch (e) {}
            console.log(b);
        }
        f(0);
@@ -4204,7 +4204,7 @@ may_throw_2: {
            try {
                var a = x();
                return (++b)(a);
-            } catch(e) {}
+            } catch (e) {}
            console.log(b);
        }
        f(0);
@@ -6178,3 +6178,22 @@ assign_undeclared: {
        "object",
    ]
 }
+
+Infinity_assignment: {
+    options = {
+        collapse_vars: true,
+        pure_getters: "strict",
+        unsafe: true,
+    }
+    input: {
+        var Infinity;
+        Infinity = 42;
+        console.log(Infinity);
+    }
+    expect: {
+        var Infinity;
+        Infinity = 42;
+        console.log(Infinity);
+    }
+    expect_stdout: true
+}
--- a/test/compress/comparisons.js
+++ b/test/compress/comparisons.js
@@ -373,10 +373,70 @@ unsafe_indexOf: {
        unsafe: true,
    }
    input: {
-        if (Object.keys({ foo: 42 }).indexOf("foo") >= 0) console.log("PASS");
+        var a = Object.keys({ foo: 42 });
+        if (a.indexOf("bar") < 0) console.log("PASS");
+        if (0 > a.indexOf("bar")) console.log("PASS");
+        if (a.indexOf("foo") >= 0) console.log("PASS");
+        if (0 <= a.indexOf("foo")) console.log("PASS");
+        if (a.indexOf("foo") > -1) console.log("PASS");
+        if (-1 < a.indexOf("foo")) console.log("PASS");
+        if (a.indexOf("bar") == -1) console.log("PASS");
+        if (-1 == a.indexOf("bar")) console.log("PASS");
+        if (a.indexOf("bar") === -1) console.log("PASS");
+        if (-1 === a.indexOf("bar")) console.log("PASS");
+        if (a.indexOf("foo") != -1) console.log("PASS");
+        if (-1 != a.indexOf("foo")) console.log("PASS");
+        if (a.indexOf("foo") !== -1) console.log("PASS");
+        if (-1 !== a.indexOf("foo")) console.log("PASS");
    }
    expect: {
-        if (~Object.keys({ foo: 42 }).indexOf("foo")) console.log("PASS");
+        var a = Object.keys({ foo: 42 });
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (!~a.indexOf("bar")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+        if (~a.indexOf("foo")) console.log("PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+    ]
+}
+
+issue_3413: {
+    options = {
+        comparisons: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        var b;
+        void 0 !== ("" < b || void 0) || console.log("PASS");
+    }
+    expect: {
+        var b;
+        void 0 !== ("" < b || void 0) || console.log("PASS");
    }
    expect_stdout: "PASS"
 }
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -960,3 +960,56 @@ unsafe_string_replace: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3402: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        functions: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        var f = function f() {
+            f = 42;
+            console.log(typeof f);
+        };
+        "function" == typeof f && f();
+        "function" == typeof f && f();
+        console.log(typeof f);
+    }
+    expect: {
+        function f() {
+            console.log(typeof f);
+        }
+        f();
+        f();
+        console.log(typeof f);
+    }
+    expect_stdout: [
+        "function",
+        "function",
+        "function",
+    ]
+}
+
+issue_3406: {
+    options = {
+        dead_code: true,
+    }
+    input: {
+        console.log(function f(a) {
+            return delete (f = a);
+        }());
+    }
+    expect: {
+        console.log(function f(a) {
+            return delete (0, a);
+        }());
+    }
+    expect_stdout: "true"
+}
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -144,7 +144,7 @@ unused_var_in_catch: {
        function foo() {
            try {
                foo();
-            } catch(ex) {
+            } catch (ex) {
                var x = 10;
            }
        }
@@ -153,7 +153,7 @@ unused_var_in_catch: {
        function foo() {
            try {
                foo();
-            } catch(ex) {}
+            } catch (ex) {}
        }
    }
 }
@@ -166,7 +166,7 @@ used_var_in_catch: {
        function foo() {
            try {
                foo();
-            } catch(ex) {
+            } catch (ex) {
                var x = 10;
            }
            return x;
@@ -176,7 +176,7 @@ used_var_in_catch: {
        function foo() {
            try {
                foo();
-            } catch(ex) {
+            } catch (ex) {
                var x = 10;
            }
            return x;
@@ -797,6 +797,7 @@ assign_chain: {
 issue_1583: {
    options = {
        keep_fargs: true,
+        passes: 2,
        reduce_funcs: true,
        reduce_vars: true,
        unused: true,
@@ -1004,7 +1005,7 @@ issue_1715_4: {
 delete_assign_1: {
    options = {
        booleans: true,
-        side_effects: true,
+        evaluate: true,
        toplevel: true,
        unused: true,
    }
@@ -1023,7 +1024,7 @@ delete_assign_1: {
        console.log((1 / 0, !0));
        console.log((1 / 0, !0));
        console.log((NaN, !0));
-        console.log((0 / 0, !0));
+        console.log((NaN, !0));
    }
    expect_stdout: true
 }
@@ -1031,8 +1032,8 @@ delete_assign_1: {
 delete_assign_2: {
    options = {
        booleans: true,
+        evaluate: true,
        keep_infinity: true,
-        side_effects: true,
        toplevel: true,
        unused: true,
    }
@@ -1051,7 +1052,7 @@ delete_assign_2: {
        console.log((Infinity, !0));
        console.log((1 / 0, !0));
        console.log((NaN, !0));
-        console.log((0 / 0, !0));
+        console.log((NaN, !0));
    }
    expect_stdout: true
 }
@@ -1144,6 +1145,7 @@ var_catch_toplevel: {
    options = {
        conditionals: true,
        negate_iife: true,
+        passes: 2,
        reduce_funcs: true,
        reduce_vars: true,
        side_effects: true,
@@ -1156,7 +1158,7 @@ var_catch_toplevel: {
            try {
                a++;
                x();
-            } catch(a) {
+            } catch (a) {
                if (a) var a;
                var a = 10;
            }
@@ -1167,7 +1169,7 @@ var_catch_toplevel: {
        !function() {
            try {
                x();
-            } catch(a) {
+            } catch (a) {
                var a;
            }
        }();
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -246,7 +246,7 @@ unsafe_constant: {
    }
    expect: {
        console.log(
-            true.a,
+            void 0,
            false.a,
            null.a,
            (void 0).a
@@ -278,7 +278,7 @@ unsafe_object: {
            o + 1,
            2,
            o.b + 1,
-            1..b + 1
+            NaN
        );
    }
    expect_stdout: true
@@ -365,7 +365,7 @@ unsafe_object_repeated: {
            o + 1,
            2,
            o.b + 1,
-            1..b + 1
+            NaN
        );
    }
    expect_stdout: true
@@ -444,8 +444,8 @@ unsafe_integer_key: {
            2,
            2,
            ({0:1})[1] + 1,
-            1[1] + 1,
-            1["1"] + 1
+            NaN,
+            NaN
        );
    }
    expect_stdout: true
@@ -500,8 +500,8 @@ unsafe_float_key: {
            2,
            2,
            ({2.72:1})[3.14] + 1,
-            1[3.14] + 1,
-            1["3.14"] + 1
+            NaN,
+            NaN
        );
    }
    expect_stdout: true
@@ -635,12 +635,12 @@ unsafe_string_bad_index: {
    }
    expect: {
        console.log(
-            "1234".a + 1,
-            "1234"["a"] + 1,
-            "1234"[3.14] + 1
+            NaN,
+            NaN,
+            NaN
        );
    }
-    expect_stdout: true
+    expect_stdout: "NaN NaN NaN"
 }

 prototype_function: {
@@ -1730,3 +1730,30 @@ unsafe_string_replace: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3387_1: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        console.log(1 + (2 + "3"[4]));
+    }
+    expect: {
+        console.log(1 + (2 + "3"[4]));
+    }
+    expect_stdout: "NaN"
+}
+
+issue_3387_2: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(1 + (2 + "3"[4]));
+    }
+    expect: {
+        console.log(NaN);
+    }
+    expect_stdout: "NaN"
+}
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -2860,10 +2860,10 @@ issue_2437: {
                    result;
            }
            function detectFunc() {}
-            var req;
-            (req = new XMLHttpRequest()).onreadystatechange = detectFunc;
-            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
-            return req.onreadystatechange = null, result;
+            var req = new XMLHttpRequest();
+            return req.onreadystatechange = detectFunc,
+            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc,
+            req.onreadystatechange = null, result;
        }());
    }
 }
@@ -3065,3 +3065,86 @@ class_iife: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3400: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(f) {
+            console.log(f()()[0].p);
+        })(function() {
+            function g() {
+                function h(u) {
+                    var o = {
+                        p: u
+                    };
+                    return console.log(o[g]), o;
+                }
+                function e() {
+                    return [ 42 ].map(function(v) {
+                        return h(v);
+                    });
+                }
+                return e();
+            }
+            return g;
+        });
+    }
+    expect: {
+        void console.log(function g() {
+            function e() {
+                return [42].map(function(v) {
+                    return o = {
+                        p: v
+                    }, console.log(o[g]) , o;
+                    var o;
+                });
+            }
+            return e();
+        }()[0].p);
+    }
+    expect_stdout: [
+        "undefined",
+        "42",
+    ]
+}
+
+issue_3402: {
+    options = {
+        evaluate: true,
+        functions: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        var f = function f() {
+            f = 42;
+            console.log(typeof f);
+        };
+        "function" == typeof f && f();
+        "function" == typeof f && f();
+        console.log(typeof f);
+    }
+    expect: {
+        var f = function f() {
+            f = 42;
+            console.log(typeof f);
+        };
+        f();
+        f();
+        console.log(typeof f);
+    }
+    expect_stdout: [
+        "function",
+        "function",
+        "function",
+    ]
+}
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -862,3 +862,27 @@ issue_3071_3: {
    }
    expect_stdout: "2"
 }
+
+issue_3411: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+    }
+    input: {
+        var c = 1;
+        !function f() {
+            var o = {
+                p: --c && f()
+            };
+            +o || console.log("PASS");
+        }();
+    }
+    expect: {
+        var c = 1;
+        !function f() {
+            var o_p = --c && f();
+            +{} || console.log("PASS");
+        }();
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/ie8.js
+++ b/test/compress/ie8.js
@@ -59,9 +59,9 @@ do_screw_try_catch: {
    input: {
        good = function(e){
            return function(error){
-                try{
+                try {
                    e()
-                } catch(e) {
+                } catch (e) {
                    error(e)
                }
            }
@@ -70,9 +70,9 @@ do_screw_try_catch: {
    expect: {
        good = function(n){
            return function(t){
-                try{
+                try {
                    n()
-                } catch(n) {
+                } catch (n) {
                    t(n)
                }
            }
@@ -93,9 +93,9 @@ dont_screw_try_catch: {
    input: {
        bad = function(e){
            return function(error){
-                try{
+                try {
                    e()
-                } catch(e) {
+                } catch (e) {
                    error(e)
                }
            }
@@ -104,9 +104,9 @@ dont_screw_try_catch: {
    expect: {
        bad = function(t){
            return function(n){
-                try{
+                try {
                    t()
-                } catch(t) {
+                } catch (t) {
                    n(t)
                }
            }
@@ -137,7 +137,7 @@ do_screw_try_catch_undefined: {
    }
    expect: {
        function a(o){
-            try{
+            try {
                throw "Stuff"
            } catch (o) {
                console.log("caught: "+o)
@@ -172,7 +172,7 @@ dont_screw_try_catch_undefined: {
    }
    expect: {
        function a(n){
-            try{
+            try {
                throw "Stuff"
            } catch (undefined) {
                console.log("caught: " + undefined)
--- a/test/compress/issue-1034.js
+++ b/test/compress/issue-1034.js
@@ -59,7 +59,6 @@ non_hoisted_function_after_return_2a: {
        passes: 2,
        side_effects: true,
        unused: true,
-        warnings: "verbose",
    }
    input: {
        function foo(x) {
@@ -91,13 +90,13 @@ non_hoisted_function_after_return_2a: {
        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:7,16]",
        "WARN: Dropping unused variable a [test/compress/issue-1034.js:4,20]",
        "WARN: Dropping unused function nope [test/compress/issue-1034.js:11,21]",
-        "WARN: pass 0: last_count: Infinity, count: 37",
+        "INFO: pass 0: last_count: Infinity, count: 37",
        "WARN: Dropping unreachable code [test/compress/issue-1034.js:9,12]",
        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:9,12]",
        "WARN: Dropping unreachable code [test/compress/issue-1034.js:12,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:7,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:9,16]",
-        "WARN: pass 1: last_count: 37, count: 18",
+        "INFO: Dropping unused variable b [test/compress/issue-1034.js:7,20]",
+        "INFO: Dropping unused variable c [test/compress/issue-1034.js:9,16]",
+        "INFO: pass 1: last_count: 37, count: 18",
    ]
 }

@@ -213,7 +212,6 @@ non_hoisted_function_after_return_2a_strict: {
        passes: 2,
        side_effects: true,
        unused: true,
-        warnings: "verbose",
    }
    input: {
        "use strict";
@@ -250,13 +248,13 @@ non_hoisted_function_after_return_2a_strict: {
        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:8,16]",
        "WARN: Dropping unused variable a [test/compress/issue-1034.js:5,20]",
        "WARN: Dropping unused function nope [test/compress/issue-1034.js:12,21]",
-        "WARN: pass 0: last_count: Infinity, count: 48",
+        "INFO: pass 0: last_count: Infinity, count: 48",
        "WARN: Dropping unreachable code [test/compress/issue-1034.js:10,12]",
        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:10,12]",
        "WARN: Dropping unreachable code [test/compress/issue-1034.js:13,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:8,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:10,16]",
-        "WARN: pass 1: last_count: 48, count: 29",
+        "INFO: Dropping unused variable b [test/compress/issue-1034.js:8,20]",
+        "INFO: Dropping unused variable c [test/compress/issue-1034.js:10,16]",
+        "INFO: pass 1: last_count: 48, count: 29",
    ]
 }

--- a/test/compress/issue-1704.js
+++ b/test/compress/issue-1704.js
@@ -366,7 +366,7 @@ mangle_catch_redef_3: {
        console.log(o);
    }
    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: "PASS"
+    expect_stdout: true
 }

 mangle_catch_redef_3_toplevel: {
@@ -389,10 +389,10 @@ mangle_catch_redef_3_toplevel: {
        console.log(o);
    }
    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: "PASS"
+    expect_stdout: true
 }

-mangle_catch_redef_ie8_3: {
+mangle_catch_redef_3_ie8: {
    mangle = {
        ie8: true,
        toplevel: false,
@@ -412,7 +412,7 @@ mangle_catch_redef_ie8_3: {
        console.log(o);
    }
    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: "PASS"
+    expect_stdout: true
 }

 mangle_catch_redef_3_ie8_toplevel: {
@@ -435,5 +435,5 @@ mangle_catch_redef_3_ie8_toplevel: {
        console.log(o);
    }
    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: "PASS"
+    expect_stdout: true
 }
--- a/test/compress/keep_fargs.js
+++ b/test/compress/keep_fargs.js
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -673,3 +673,19 @@ issue_3371: {
    }
    expect_stdout: "PASS"
 }
+
+step: {
+    options = {
+        loops: true,
+        side_effects: true,
+    }
+    input: {
+        for (var i = 0; i < 42; "foo", i++, "bar");
+        console.log(i);
+    }
+    expect: {
+        for (var i = 0; i < 42; i++);
+        console.log(i);
+    }
+    expect_stdout: "42"
+}
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -1862,3 +1862,29 @@ join_expr: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3389: {
+    options = {
+        evaluate: true,
+        properties: true,
+        reduce_vars: true,
+        unsafe: true,
+    }
+    input: {
+        (function() {
+            var a = "PASS";
+            if (delete b)
+                b = a[null] = 42;
+            console.log(a);
+        })();
+    }
+    expect: {
+        (function() {
+            var a = "PASS";
+            if (delete b)
+                b = a.null = 42;
+            console.log(a);
+        })();
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/pure_getters.js
+++ b/test/compress/pure_getters.js
@@ -1161,3 +1161,29 @@ collapse_rhs_lhs: {
    }
    expect_stdout: "1 3"
 }
+
+drop_arguments: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            arguments.slice = function() {
+                console.log("PASS");
+            };
+            arguments[42];
+            arguments.length;
+            arguments.slice();
+        })();
+    }
+    expect: {
+        (function() {
+            arguments.slice = function() {
+                console.log("PASS");
+            };
+            arguments.slice();
+        })();
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -192,38 +192,35 @@ unsafe_evaluate: {
        unused: true,
    }
    input: {
-        function f0(){
-            var a = {
-                b:1
-            };
+        function f0() {
+            var a = { b: 1 };
            console.log(a.b + 3);
        }
-
-        function f1(){
+        function f1() {
            var a = {
-                b:{
-                    c:1
-                },
-                d:2
+                b: { c: 1 },
+                d: 2
            };
            console.log(a.b + 3, a.d + 4, a.b.c + 5, a.d.c + 6);
        }
+        f0();
+        f1();
    }
    expect: {
-        function f0(){
+        function f0() {
            console.log(4);
        }
-
-        function f1(){
+        function f1() {
            var a = {
-                b:{
-                    c:1
-                },
-                d:2
+                b: { c: 1 },
+                d: 2
            };
-            console.log(a.b + 3, 6, 6, 2..c + 6);
+            console.log(a.b + 3, 6, 6, NaN);
        }
+        f0();
+        f1();
    }
+    expect_stdout: true
 }

 unsafe_evaluate_side_effect_free_1: {
--- a/test/compress/sandbox.js
+++ b/test/compress/sandbox.js
@@ -12,3 +12,71 @@ console_log: {
        "% %s",
    ]
 }
+
+typeof_arguments: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var arguments;
+        console.log((typeof arguments).length);
+    }
+    expect: {
+        var arguments;
+        console.log((typeof arguments).length);
+    }
+    expect_stdout: "6"
+}
+
+typeof_arguments_assigned: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var arguments = void 0;
+        console.log((typeof arguments).length);
+    }
+    expect: {
+        console.log("undefined".length);
+    }
+    expect_stdout: "9"
+}
+
+toplevel_Infinity_NaN_undefined: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var Infinity = "foo";
+        var NaN = 42;
+        var undefined = null;
+        console.log(Infinity, NaN, undefined);
+    }
+    expect: {
+        console.log("foo", 42, null);
+    }
+    expect_stdout: "foo 42 null"
+}
+
+log_global: {
+    input: {
+        console.log(function() {
+            return this;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return this;
+        }());
+    }
+    expect_stdout: "[object global]"
+}
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -490,6 +490,7 @@ issue_1758: {
 delete_seq_1: {
    options = {
        booleans: true,
+        evaluate: true,
        side_effects: true,
    }
    input: {
@@ -514,6 +515,7 @@ delete_seq_1: {
 delete_seq_2: {
    options = {
        booleans: true,
+        evaluate: true,
        side_effects: true,
    }
    input: {
@@ -538,6 +540,7 @@ delete_seq_2: {
 delete_seq_3: {
    options = {
        booleans: true,
+        evaluate: true,
        keep_infinity: true,
        side_effects: true,
    }
@@ -563,6 +566,7 @@ delete_seq_3: {
 delete_seq_4: {
    options = {
        booleans: true,
+        evaluate: true,
        sequences: true,
        side_effects: true,
    }
@@ -590,6 +594,7 @@ delete_seq_4: {
 delete_seq_5: {
    options = {
        booleans: true,
+        evaluate: true,
        keep_infinity: true,
        sequences: true,
        side_effects: true,
@@ -618,6 +623,7 @@ delete_seq_5: {
 delete_seq_6: {
    options = {
        booleans: true,
+        evaluate: true,
        side_effects: true,
    }
    input: {
--- a/test/input/issue-3040/expect.js
+++ b/test/input/issue-3040/expect.js
--- a/test/input/issue-3040/input.js
+++ b/test/input/issue-3040/input.js
--- a/test/input/issue-3040/input.js.map
+++ b/test/input/issue-3040/input.js.map
--- a/test/input/issue-3294/input.js
+++ b/test/input/issue-3294/input.js
@@ -0,0 +1,6 @@
+var Foo = function Foo(){console.log(1+2);}; new Foo();
+
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,DeadBeef
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjpudWxsLCJzb3VyY2VzIjpbInN0ZGluIl0sInNvdXJjZXNDb250ZW50IjpbImNsYXNzIEZvbyB7IGNvbnN0cnVjdG9yKCl7Y29uc29sZS5sb2coMSsyKTt9IH0gbmV3IEZvbygpO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQU0sR0FBRyxHQUFDLEFBQUUsWUFBVyxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBLEFBQUUsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDOyJ9
+
+
--- a/test/input/issue-3294/output.js
+++ b/test/input/issue-3294/output.js
@@ -0,0 +1,2 @@
+new function(){console.log(3)};
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIl0sIm5hbWVzIjpbImNvbnNvbGUiLCJsb2ciXSwibWFwcGluZ3MiOiJBQUErQyxJQUFyQyxXQUFnQkEsUUFBUUMsSUFBSSIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIEZvbyB7IGNvbnN0cnVjdG9yKCl7Y29uc29sZS5sb2coMSsyKTt9IH0gbmV3IEZvbygpO1xuIl19
--- a/test/jetstream.js
+++ b/test/jetstream.js
@@ -62,8 +62,17 @@ if (typeof phantom == "undefined") {
        if (debug) {
            console.log("http://localhost:" + port + "/");
        } else {
-            child_process.exec("npm install phantomjs-prebuilt@2.1.14 --no-save", function(error) {
-                if (error) throw error;
+            child_process.spawn(process.platform == "win32" ? "npm.cmd" : "npm", [
+                "install",
+                "phantomjs-prebuilt@2.1.14",
+                "--no-audit",
+                "--no-optional",
+                "--no-save",
+                "--no-update-notifier",
+            ], {
+                stdio: [ "ignore", 1, 2 ]
+            }).on("exit", function(code) {
+                if (code) throw new Error("npm install failed!");
                var program = require("phantomjs-prebuilt").exec(process.argv[1], port);
                program.stdout.pipe(process.stdout);
                program.stderr.pipe(process.stderr);
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -47,7 +47,7 @@ describe("bin/uglifyjs", function() {
        });
    });
    it("Should give sensible error against invalid input source map", function(done) {
-        var command = uglifyjscmd + " test/mocha.js --source-map content=blah,url=inline";
+        var command = uglifyjscmd + " test/mocha.js --source-map content=blah,url=inline --verbose";
        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.deepEqual(stderr.split(/\n/).slice(0, 2), [
@@ -83,6 +83,7 @@ describe("bin/uglifyjs", function() {
            "test/input/issue-2082/sample.js",
            "--source-map", "content=test/input/issue-2082/sample.js.map",
            "--source-map", "url=inline",
+            "--verbose",
        ].join(" ");
        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
@@ -113,13 +114,12 @@ describe("bin/uglifyjs", function() {

        var child = exec(command, function(err, stdout) {
            if (err) throw err;
-
-            assert.strictEqual(stdout, read("test/input/pr-3040/expect.js"));
+            assert.strictEqual(stdout, read("test/input/issue-3040/expect.js"));
            done();
        });
        setTimeout(function() {
-            fs.writeFileSync(mapFile, read("test/input/pr-3040/input.js.map"));
-            child.stdin.end(read("test/input/pr-3040/input.js"));
+            fs.writeFileSync(mapFile, read("test/input/issue-3040/input.js.map"));
+            child.stdin.end(read("test/input/issue-3040/input.js"));
        }, 1000);
    });
    it("Should work with --keep-fnames (mangle only)", function(done) {
@@ -202,7 +202,7 @@ describe("bin/uglifyjs", function() {
        });
    });
    it("Should warn for missing inline source map", function(done) {
-        var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map content=inline,url=inline";
+        var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map content=inline,url=inline --warn";
        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
            assert.strictEqual(stdout, [
@@ -221,6 +221,7 @@ describe("bin/uglifyjs", function() {
            "test/input/issue-520/input.js",
            "test/input/issue-1323/sample.js",
            "--source-map", "content=inline,url=inline",
+            "--warn",
        ].join(" ");
        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
@@ -466,7 +467,7 @@ describe("bin/uglifyjs", function() {
            done();
        });
    });
-    it("Should throw syntax error (catch(eval))", function(done) {
+    it("Should throw syntax error (catch (eval))", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/try.js';
        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
@@ -647,7 +648,7 @@ describe("bin/uglifyjs", function() {
        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
-            assert.strictEqual(stderr, "Error parsing arguments for 'define': a-b\n");
+            assert.strictEqual(stderr, "ERROR: cannot parse arguments for 'define': a-b\n");
            done();
        });
    });
@@ -711,7 +712,7 @@ describe("bin/uglifyjs", function() {
        var command = uglifyjscmd + " test/input/enclose/input.js --enclose window,undefined:window --wrap exports";
        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
-            assert.strictEqual(stdout, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);\n');
+            assert.strictEqual(stdout, '(function(exports){(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window)})(typeof exports=="undefined"?exports={}:exports);\n');
            done();
        });
    });
--- a/test/mocha/comments.js
+++ b/test/mocha/comments.js
@@ -260,6 +260,60 @@ describe("comments", function() {
        ].join("\n"));
    });

+    it("Should handle programmatic AST insertions gracefully", function() {
+        var ast = UglifyJS.parse([
+            "function f() {",
+            "    //foo",
+            "    bar;",
+            "    return;",
+            "}",
+        ].join("\n"));
+        ast.body[0].body[0] = new UglifyJS.AST_Throw({value: ast.body[0].body[0].body});
+        ast.body[0].body[1].value = new UglifyJS.AST_Number({value: 42});
+        assert.strictEqual(ast.print_to_string({comments: "all"}), [
+            "function f(){",
+            "//foo",
+            "throw bar;return 42}",
+        ].join("\n"));
+    });
+
+    it("Should not duplicate sourceMappingURL", function() {
+        var code = [
+            "//# sourceMappingURL=input.map",
+            "print(42);",
+            "//# sourceMappingURL=input.map",
+            "",
+            "//# sourceMappingURL=input.map",
+            "//# sourceMappingURL=input.map",
+            "",
+        ].join("\n");
+
+        var result = UglifyJS.minify(code, {
+            output: { comments: true },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "//# sourceMappingURL=input.map",
+            "print(42);",
+            "//# sourceMappingURL=input.map",
+            "//# sourceMappingURL=input.map",
+            "//# sourceMappingURL=input.map",
+        ].join("\n"));
+
+        result = UglifyJS.minify(code, {
+            output: { comments: true },
+            sourceMap: { url: "output.map" },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "//# sourceMappingURL=input.map",
+            "print(42);",
+            "//# sourceMappingURL=input.map",
+            "//# sourceMappingURL=input.map",
+            "//# sourceMappingURL=output.map",
+        ].join("\n"));
+    });
+
    describe("comment before constant", function() {
        var js = 'function f() { /*c1*/ var /*c2*/ foo = /*c3*/ false; return foo; }';

--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -365,7 +365,7 @@ describe("minify", function() {
                wrap: 'exports',
            });
            if (result.error) throw result.error;
-            assert.strictEqual(result.code, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);');
+            assert.strictEqual(result.code, '(function(exports){(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window)})(typeof exports=="undefined"?exports={}:exports);');
        });
    });
 });
--- a/test/mocha/release.js
+++ b/test/mocha/release.js
@@ -1,50 +0,0 @@
-var assert = require("assert");
-var semver = require("semver");
-var spawn = require("child_process").spawn;
-
-if (!process.env.UGLIFYJS_TEST_ALL) return;
-
-function run(command, args, done) {
-    spawn(command, args, {
-        stdio: [ "ignore", 1, 2 ]
-    }).on("exit", function(code) {
-        assert.strictEqual(code, 0);
-        done();
-    });
-}
-
-describe("test/benchmark.js", function() {
-    this.timeout(10 * 60 * 1000);
-    [
-        "-b",
-        "-b braces",
-        "-m",
-        "-mc passes=3",
-        "-mc passes=3,toplevel",
-        "-mc passes=3,unsafe",
-        "-mc keep_fargs=false,passes=3",
-        "-mc keep_fargs=false,passes=3,pure_getters,unsafe,unsafe_comps,unsafe_math,unsafe_proto",
-    ].forEach(function(options) {
-        it("Should pass with options " + options, function(done) {
-            var args = options.split(/ /);
-            args.unshift("test/benchmark.js");
-            run(process.argv[0], args, done);
-        });
-    });
-});
-
-if (semver.satisfies(process.version, "0.12")) return;
-describe("test/jetstream.js", function() {
-    this.timeout(20 * 60 * 1000);
-    [
-        "-mc",
-        "-mc keep_fargs=false,passes=3,pure_getters,unsafe,unsafe_comps,unsafe_math,unsafe_proto",
-    ].forEach(function(options) {
-        it("Should pass with options " + options, function(done) {
-            var args = options.split(/ /);
-            args.unshift("test/jetstream.js");
-            args.push("-b", "beautify=false,webkit");
-            run(process.argv[0], args, done);
-        });
-    });
-});
--- a/test/mocha/sourcemaps.js
+++ b/test/mocha/sourcemaps.js
@@ -118,51 +118,33 @@ describe("sourcemaps", function() {
            assert.strictEqual(result.code + "\n", readFileSync("test/input/issue-520/output.js", "utf8"));
        });
        it("Should warn for missing inline source map", function() {
-            var warn_function = UglifyJS.AST_Node.warn_function;
-            var warnings = [];
-            UglifyJS.AST_Node.warn_function = function(txt) {
-                warnings.push(txt);
-            };
-            try {
-                var result = UglifyJS.minify(read("./test/input/issue-1323/sample.js"), {
-                    mangle: false,
-                    sourceMap: {
-                        content: "inline"
-                    }
-                });
-                assert.strictEqual(result.code, "var bar=function(bar){return bar};");
-                assert.strictEqual(warnings.length, 1);
-                assert.strictEqual(warnings[0], "inline source map not found: 0");
-            } finally {
-                UglifyJS.AST_Node.warn_function = warn_function;
-            }
+            var result = UglifyJS.minify(read("./test/input/issue-1323/sample.js"), {
+                mangle: false,
+                sourceMap: {
+                    content: "inline"
+                },
+                warnings: true,
+            });
+            assert.strictEqual(result.code, "var bar=function(bar){return bar};");
+            assert.deepEqual(result.warnings, [ "WARN: inline source map not found: 0" ]);
        });
        it("Should handle multiple input and inline source map", function() {
-            var warn_function = UglifyJS.AST_Node.warn_function;
-            var warnings = [];
-            UglifyJS.AST_Node.warn_function = function(txt) {
-                warnings.push(txt);
-            };
-            try {
-                var result = UglifyJS.minify([
-                    read("./test/input/issue-520/input.js"),
-                    read("./test/input/issue-1323/sample.js"),
-                ], {
-                    sourceMap: {
-                        content: "inline",
-                        url: "inline",
-                    }
-                });
-                if (result.error) throw result.error;
-                assert.strictEqual(result.code, [
-                    "var Foo=function(){console.log(3)};new Foo;var bar=function(o){return o};",
-                    "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIiwiMSJdLCJuYW1lcyI6WyJGb28iLCJjb25zb2xlIiwibG9nIiwiYmFyIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFNQSxJQUFJLFdBQWdCQyxRQUFRQyxJQUFJLElBQVMsSUFBSUYsSUNBbkQsSUFBSUcsSUFDQSxTQUFjQSxHQUNWLE9BQU9BIn0=",
-                ].join("\n"));
-                assert.strictEqual(warnings.length, 1);
-                assert.strictEqual(warnings[0], "inline source map not found: 1");
-            } finally {
-                UglifyJS.AST_Node.warn_function = warn_function;
-            }
+            var result = UglifyJS.minify([
+                read("./test/input/issue-520/input.js"),
+                read("./test/input/issue-1323/sample.js"),
+            ], {
+                sourceMap: {
+                    content: "inline",
+                    url: "inline",
+                },
+                warnings: true,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, [
+                "var Foo=function(){console.log(3)};new Foo;var bar=function(o){return o};",
+                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIiwiMSJdLCJuYW1lcyI6WyJGb28iLCJjb25zb2xlIiwibG9nIiwiYmFyIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFNQSxJQUFJLFdBQWdCQyxRQUFRQyxJQUFJLElBQVMsSUFBSUYsSUNBbkQsSUFBSUcsSUFDQSxTQUFjQSxHQUNWLE9BQU9BIn0=",
+            ].join("\n"));
+            assert.deepEqual(result.warnings, [ "WARN: inline source map not found: 1" ]);
        });
        it("Should drop source contents for includeSources=false", function() {
            var result = UglifyJS.minify(read("./test/input/issue-520/input.js"), {
@@ -187,6 +169,18 @@ describe("sourcemaps", function() {
            map = JSON.parse(result.map);
            assert.ok(!("sourcesContent" in map));
        });
+        it("Should parse the correct sourceMappingURL", function() {
+            var result = UglifyJS.minify(read("./test/input/issue-3294/input.js"), {
+                compress: { toplevel: true },
+                sourceMap: {
+                    content: "inline",
+                    includeSources: true,
+                    url: "inline"
+                }
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code + "\n", readFileSync("test/input/issue-3294/output.js", "utf8"));
+        });
    });

    describe("sourceMapInline", function() {
--- a/test/release/benchmark.js
+++ b/test/release/benchmark.js
@@ -0,0 +1,14 @@
+require("./run")([
+    "-b",
+    "-b braces",
+    "-m",
+    "-mc passes=3",
+    "-mc passes=3,toplevel",
+    "-mc passes=3,unsafe",
+    "-mc keep_fargs=false,passes=3",
+    "-mc keep_fargs=false,passes=3,pure_getters,unsafe,unsafe_comps,unsafe_math,unsafe_proto",
+].map(function(options) {
+    var args = options.split(/ /);
+    args.unshift("test/benchmark.js");
+    return args;
+}));
--- a/test/release/jetstream.js
+++ b/test/release/jetstream.js
@@ -0,0 +1,9 @@
+require("./run")([
+    "-mc",
+    "-mc keep_fargs=false,passes=3,pure_getters,unsafe,unsafe_comps,unsafe_math,unsafe_proto",
+].map(function(options) {
+    var args = options.split(/ /);
+    args.unshift("test/jetstream.js");
+    args.push("-b", "beautify=false,webkit");
+    return args;
+}));
--- a/test/release/run.js
+++ b/test/release/run.js
@@ -0,0 +1,16 @@
+var child_process = require("child_process");
+
+module.exports = function(tasks) {
+    (function next() {
+        if (!tasks.length) return;
+        var args = tasks.shift();
+        console.log();
+        console.log("\u001B[36m$> " + args.join(" ") + "\u001B[39m");
+        child_process.spawn(process.argv[0], args, {
+            stdio: [ "ignore", 1, 2 ]
+        }).on("exit", function(code) {
+            if (code) process.exit(code);
+            next();
+        });
+    })();
+};
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -1,367 +0,0 @@
-#! /usr/bin/env node
-
-var U = require("./node");
-var path = require("path");
-var fs = require("fs");
-var assert = require("assert");
-var sandbox = require("./sandbox");
-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) {
-    console.error("\n!!! Failed " + failures + " test cases.");
-    console.error("!!! " + Object.keys(failed_files).join(", "));
-    process.exit(1);
-}
-console.log();
-require("./mocha.js");
-
-/* -----[ utils ]----- */
-
-function evaluate(code) {
-    if (code instanceof U.AST_Node) code = make_code(code, { beautify: true });
-    return new Function("return(" + code + ")")();
-}
-
-function log() {
-    console.log("%s", tmpl.apply(null, arguments));
-}
-
-function make_code(ast, options) {
-    var stream = U.OutputStream(options);
-    ast.print(stream);
-    return stream.get();
-}
-
-function parse_test(file) {
-    var script = fs.readFileSync(file, "utf8");
-    // TODO try/catch can be removed after fixing https://github.com/mishoo/UglifyJS2/issues/348
-    try {
-        var ast = U.parse(script, {
-            filename: file
-        });
-    } catch (e) {
-        console.log("Caught error while parsing tests in " + file + "\n");
-        console.log(e);
-        throw e;
-    }
-    var tests = {};
-    var tw = new U.TreeWalker(function(node, descend) {
-        if (node instanceof U.AST_LabeledStatement
-            && tw.parent() instanceof U.AST_Toplevel) {
-            var name = node.label.name;
-            if (name in tests) {
-                throw new Error('Duplicated test name "' + name + '" in ' + file);
-            }
-            tests[name] = get_one_test(name, node.body);
-            return true;
-        }
-        if (!(node instanceof U.AST_Toplevel)) croak(node);
-    });
-    ast.walk(tw);
-    return tests;
-
-    function croak(node) {
-        throw new Error(tmpl("Can't understand test file {file} [{line},{col}]\n{code}", {
-            file: file,
-            line: node.start.line,
-            col: node.start.col,
-            code: make_code(node, { beautify: false })
-        }));
-    }
-
-    function read_string(stat) {
-        if (stat.TYPE == "SimpleStatement") {
-            var body = stat.body;
-            switch(body.TYPE) {
-              case "String":
-                return body.value;
-              case "Array":
-                return body.elements.map(function(element) {
-                    if (element.TYPE !== "String")
-                        throw new Error("Should be array of strings");
-                    return element.value;
-                }).join("\n");
-            }
-        }
-        throw new Error("Should be string or array of strings");
-    }
-
-    function get_one_test(name, block) {
-        var test = { name: name, options: {} };
-        var tw = new U.TreeWalker(function(node, descend) {
-            if (node instanceof U.AST_Assign) {
-                if (!(node.left instanceof U.AST_SymbolRef)) {
-                    croak(node);
-                }
-                var name = node.left.name;
-                test[name] = evaluate(node.right);
-                return true;
-            }
-            if (node instanceof U.AST_LabeledStatement) {
-                var label = node.label;
-                assert.ok([
-                    "input",
-                    "expect",
-                    "expect_exact",
-                    "expect_warnings",
-                    "expect_stdout",
-                    "node_version",
-                ].indexOf(label.name) >= 0, tmpl("Unsupported label {name} [{line},{col}]", {
-                    name: label.name,
-                    line: label.start.line,
-                    col: label.start.col
-                }));
-                var stat = node.body;
-                if (label.name == "expect_exact" || label.name == "node_version") {
-                    test[label.name] = read_string(stat);
-                } else if (label.name == "expect_stdout") {
-                    var body = stat.body;
-                    if (body instanceof U.AST_Boolean) {
-                        test[label.name] = body.value;
-                    } else if (body instanceof U.AST_Call) {
-                        var ctor = global[body.expression.name];
-                        assert.ok(ctor === Error || ctor.prototype instanceof Error, tmpl("Unsupported expect_stdout format [{line},{col}]", {
-                            line: label.start.line,
-                            col: label.start.col
-                        }));
-                        test[label.name] = ctor.apply(null, body.args.map(function(node) {
-                            assert.ok(node instanceof U.AST_Constant, tmpl("Unsupported expect_stdout format [{line},{col}]", {
-                                line: label.start.line,
-                                col: label.start.col
-                            }));
-                            return node.value;
-                        }));
-                    } else {
-                        test[label.name] = read_string(stat) + "\n";
-                    }
-                } else {
-                    test[label.name] = stat;
-                }
-                return true;
-            }
-        });
-        block.walk(tw);
-        return test;
-    }
-}
-
-// 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---OPTIONS---\n{options}\n--ERROR---\n{error}\n\n", {
-                input: input_formatted,
-                options: options_formatted,
-                error: result.error,
-            });
-            return false;
-        } else {
-            var stdout = 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;
-}
-
-function run_code(code) {
-    var result = sandbox.run_code(code, true);
-    return typeof result == "string" ? result.replace(/\u001b\[\d+m/g, "") : result;
-}
-
-function run_compress_tests() {
-    var dir = path.resolve(tests_dir, "compress");
-    fs.readdirSync(dir).filter(function(name) {
-        return /\.js$/i.test(name);
-    }).forEach(function(file) {
-        log("--- {file}", { file: file });
-        function test_case(test) {
-            log("    Running test [{name}]", { name: test.name });
-            var output_options = test.beautify || {};
-            var expect;
-            if (test.expect) {
-                expect = make_code(to_toplevel(test.expect, test.mangle), output_options);
-            } else {
-                expect = test.expect_exact;
-            }
-            var input = to_toplevel(test.input, test.mangle);
-            var input_code = make_code(input);
-            var input_formatted = make_code(test.input, {
-                beautify: true,
-                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
-            });
-            var warnings_emitted = [];
-            var original_warn_function = U.AST_Node.warn_function;
-            if (test.expect_warnings) {
-                U.AST_Node.warn_function = function(text) {
-                    warnings_emitted.push("WARN: " + text);
-                };
-                if (!options.warnings) options.warnings = true;
-            }
-            if (test.mangle && test.mangle.properties && test.mangle.properties.keep_quoted) {
-                var quoted_props = test.mangle.properties.reserved;
-                if (!Array.isArray(quoted_props)) quoted_props = [];
-                test.mangle.properties.reserved = quoted_props;
-                U.reserve_quoted_keys(input, quoted_props);
-            }
-            if (test.rename) {
-                input.figure_out_scope(test.mangle);
-                input.expand_names(test.mangle);
-            }
-            var cmp = new U.Compressor(options, true);
-            var output = cmp.compress(input);
-            output.figure_out_scope(test.mangle);
-            if (test.mangle) {
-                output.compute_char_frequency(test.mangle);
-                output.mangle_names(test.mangle);
-                if (test.mangle.properties) {
-                    output = U.mangle_properties(output, test.mangle.properties);
-                }
-            }
-            output = make_code(output, output_options);
-            if (expect != output) {
-                log("!!! failed\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n---EXPECTED---\n{expected}\n\n", {
-                    input: input_formatted,
-                    output: output,
-                    expected: expect
-                });
-                return false;
-            }
-            // 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,
-                        expected_warnings: expected_warnings,
-                        actual_warnings: actual_warnings,
-                    });
-                    return false;
-                }
-            }
-            if (test.expect_stdout
-                && (!test.node_version || semver.satisfies(process.version, test.node_version))) {
-                var stdout = 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 = 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;
-                }
-                if (!reminify(test.options, input_code, input_formatted, test.expect_stdout)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        var tests = parse_test(path.resolve(dir, file));
-        for (var i in tests) if (tests.hasOwnProperty(i)) {
-            if (!test_case(tests[i])) {
-                failures++;
-                failed_files[file] = 1;
-            }
-        }
-    });
-}
-
-function tmpl() {
-    return U.string_template.apply(null, arguments);
-}
-
-function to_toplevel(input, mangle_options) {
-    if (!(input instanceof U.AST_BlockStatement)) throw new Error("Unsupported input syntax");
-    var directive = true;
-    var offset = input.start.line;
-    var tokens = [];
-    var toplevel = new U.AST_Toplevel(input.transform(new U.TreeTransformer(function(node) {
-        if (U.push_uniq(tokens, node.start)) node.start.line -= offset;
-        if (!directive || node === input) return;
-        if (node instanceof U.AST_SimpleStatement && node.body instanceof U.AST_String) {
-            return new U.AST_Directive(node.body);
-        } else {
-            directive = false;
-        }
-    })));
-    toplevel.figure_out_scope(mangle_options);
-    return toplevel;
-}
--- a/test/sandbox.js
+++ b/test/sandbox.js
@@ -1,29 +1,7 @@
 var semver = require("semver");
 var vm = require("vm");

-function safe_log(arg, level) {
-    if (arg) switch (typeof arg) {
-      case "function":
-        return arg.toString();
-      case "object":
-        if (/Error$/.test(arg.name)) return arg.toString();
-        arg.constructor.toString();
-        if (level--) for (var key in arg) {
-            var desc = Object.getOwnPropertyDescriptor(arg, key);
-            if (!desc || !desc.get) arg[key] = safe_log(arg[key], level);
-        }
-    }
-    return arg;
-}
-
-function log(msg) {
-    if (arguments.length == 1 && typeof msg == "string") return console.log("%s", msg);
-    return console.log.apply(console, [].map.call(arguments, function(arg) {
-        return safe_log(arg, 3);
-    }));
-}
-
-var func_toString = new vm.Script([
+var setupContext = new vm.Script([
    "[ Array, Boolean, Error, Function, Number, Object, RegExp, String ].forEach(function(f) {",
    "    f.toString = Function.prototype.toString;",
    "});",
@@ -44,40 +22,51 @@ var func_toString = new vm.Script([
    '        return "function(){}";',
    "    };",
    "}();",
+    "this;",
 ]).join("\n"));

 function createContext() {
    var ctx = vm.createContext(Object.defineProperty({}, "console", { value: { log: log } }));
-    func_toString.runInContext(ctx);
+    var global = setupContext.runInContext(ctx);
    return ctx;
+
+    function safe_log(arg, level) {
+        if (arg) switch (typeof arg) {
+        case "function":
+            return arg.toString();
+        case "object":
+            if (arg === global) return "[object global]";
+            if (/Error$/.test(arg.name)) return arg.toString();
+            arg.constructor.toString();
+            if (level--) for (var key in arg) {
+                var desc = Object.getOwnPropertyDescriptor(arg, key);
+                if (!desc || !desc.get) arg[key] = safe_log(arg[key], level);
+            }
+        }
+        return arg;
+    }
+
+    function log(msg) {
+        if (arguments.length == 1 && typeof msg == "string") return console.log("%s", msg);
+        return console.log.apply(console, [].map.call(arguments, function(arg) {
+            return safe_log(arg, 3);
+        }));
+    }
 }

-var context;
-exports.run_code = function(code, reuse) {
+exports.run_code = function(code, toplevel) {
    var stdout = "";
    var original_write = process.stdout.write;
    process.stdout.write = function(chunk) {
        stdout += chunk;
    };
    try {
-        if (!reuse || !context) context = createContext();
-        vm.runInContext([
-            "!function() {",
-            code,
-            "}();",
-        ].join("\n"), context, { timeout: 5000 });
+        vm.runInContext(toplevel ? "(function(){" + code + "})()" : code, createContext(), { timeout: 5000 });
        return stdout;
    } catch (ex) {
        return ex;
    } finally {
        process.stdout.write = original_write;
-        if (!reuse || code.indexOf(".prototype") >= 0) {
-            context = null;
-        } else {
-            vm.runInContext(Object.keys(context).map(function(name) {
-                return "delete " + name;
-            }).join("\n"), context);
-        }
    }
 };

--- a/test/ufuzz.js
+++ b/test/ufuzz.js
@@ -969,7 +969,7 @@ function errorln(msg) {
    process.stderr.write("\n");
 }

-function try_beautify(code, result, printfn) {
+function try_beautify(code, toplevel, result, printfn) {
    var beautified = UglifyJS.minify(code, {
        compress: false,
        mangle: false,
@@ -981,7 +981,7 @@ function try_beautify(code, result, printfn) {
    if (beautified.error) {
        printfn("// !!! beautify failed !!!");
        printfn(beautified.error.stack);
-    } else if (sandbox.same_stdout(sandbox.run_code(beautified.code), result)) {
+    } else if (sandbox.same_stdout(sandbox.run_code(beautified.code, toplevel), result)) {
        printfn("// (beautified)");
        printfn(beautified.code);
        return;
@@ -1009,7 +1009,7 @@ function log_suspects(minify_options, component) {
                errorln("Error testing options." + component + "." + name);
                errorln(result.error.stack);
            } else {
-                var r = sandbox.run_code(result.code);
+                var r = sandbox.run_code(result.code, m.toplevel);
                return sandbox.same_stdout(original_result, r);
            }
        }
@@ -1031,7 +1031,7 @@ function log_rename(options) {
        errorln("Error testing options.rename");
        errorln(result.error.stack);
    } else {
-        var r = sandbox.run_code(result.code);
+        var r = sandbox.run_code(result.code, m.toplevel);
        if (sandbox.same_stdout(original_result, r)) {
            errorln("Suspicious options:");
            errorln("  rename");
@@ -1045,23 +1045,24 @@ function log(options) {
    errorln("//=============================================================");
    if (!ok) errorln("// !!!!!! Failed... round " + round);
    errorln("// original code");
-    try_beautify(original_code, original_result, errorln);
+    try_beautify(original_code, false, original_result, errorln);
    errorln();
    errorln();
    errorln("//-------------------------------------------------------------");
+    options = JSON.parse(options);
    if (typeof uglify_code == "string") {
        errorln("// uglified code");
-        try_beautify(uglify_code, uglify_result, errorln);
+        try_beautify(uglify_code, options.toplevel, uglify_result, errorln);
        errorln();
        errorln();
        errorln("original result:");
-        errorln(typeof original_result == "string" ? original_result : original_result.stack);
+        errorln(errored ? original_result.stack : original_result);
        errorln("uglified result:");
        errorln(typeof uglify_result == "string" ? uglify_result : uglify_result.stack);
    } else {
        errorln("// !!! uglify failed !!!");
        errorln(uglify_code.stack);
-        if (typeof original_result != "string") {
+        if (errored) {
            errorln();
            errorln();
            errorln("original stacktrace:");
@@ -1069,7 +1070,6 @@ function log(options) {
        }
    }
    errorln("minify(options):");
-    options = JSON.parse(options);
    errorln(JSON.stringify(options, null, 2));
    errorln();
    if (!ok && typeof uglify_code == "string") {
@@ -1084,30 +1084,34 @@ var fallback_options = [ JSON.stringify({
    mangle: false
 }) ];
 var minify_options = require("./ufuzz.json").map(JSON.stringify);
-var original_code, original_result;
+var original_code, original_result, errored;
 var uglify_code, uglify_result, ok;
 for (var round = 1; round <= num_iterations; round++) {
    process.stdout.write(round + " of " + num_iterations + "\r");

    original_code = createTopLevelCode();
-    original_result = sandbox.run_code(original_code);
-    (typeof original_result != "string" ? fallback_options : minify_options).forEach(function(options) {
-        uglify_code = UglifyJS.minify(original_code, JSON.parse(options));
+    var orig_result = [ sandbox.run_code(original_code) ];
+    errored = typeof orig_result[0] != "string";
+    if (!errored) orig_result.push(sandbox.run_code(original_code, true));
+    (errored ? fallback_options : minify_options).forEach(function(options) {
+        var o = JSON.parse(options);
+        uglify_code = UglifyJS.minify(original_code, o);
+        original_result = orig_result[o.toplevel ? 1 : 0];
        if (!uglify_code.error) {
            uglify_code = uglify_code.code;
-            uglify_result = sandbox.run_code(uglify_code);
+            uglify_result = sandbox.run_code(uglify_code, o.toplevel);
            ok = sandbox.same_stdout(original_result, uglify_result);
        } else {
            uglify_code = uglify_code.error;
-            if (typeof original_result != "string") {
+            if (errored) {
                ok = uglify_code.name == original_result.name;
            }
        }
        if (verbose || (verbose_interval && !(round % INTERVAL_COUNT)) || !ok) log(options);
-        else if (typeof original_result != "string") {
+        else if (errored) {
            println("//=============================================================");
            println("// original code");
-            try_beautify(original_code, original_result, println);
+            try_beautify(original_code, o.toplevel, original_result, println);
            println();
            println();
            println("original result:");
Author	SHA1	Message	Date
Alex Lam S.L	d357a7aabc	v3.5.14	2019-05-20 00:13:06 +08:00
Alex Lam S.L	ae77ebe5a5	fix corner case in `arguments` (#3421 ) fixes #3420	2019-05-19 12:59:40 +08:00
Alex Lam S.L	04439edcec	v3.5.13	2019-05-17 14:10:33 +08:00
Alex Lam S.L	a246195412	enhance `unsafe` `comparisons` (#3419 )	2019-05-17 01:28:18 +08:00
Alex Lam S.L	8939a36bc7	reduce false positives from fuzzing (#3417 )	2019-05-16 16:15:03 +08:00
Alex Lam S.L	a21c348d93	improve sandbox fidelity (#3415 )	2019-05-15 23:26:57 +08:00
Alex Lam S.L	1f0def10eb	fix corner case in `comparisons` (#3414 ) fixes #3413	2019-05-15 01:01:18 +08:00
Alex Lam S.L	f87caac9d8	fix corner case in `hoist_props` (#3412 ) fixes #3411	2019-05-14 19:12:00 +08:00
Alex Lam S.L	d538a73250	enhance `side_effects` (#3410 )	2019-05-14 05:26:40 +08:00
Alex Lam S.L	2e4fbdeb08	enhance `keep_fargs` (#3409 )	2019-05-13 21:58:04 +08:00
Alex Lam S.L	3bc7cc82bb	v3.5.12	2019-05-12 10:40:13 +08:00
Alex Lam S.L	45fbdbc2dc	improve tests (#3408 )	2019-05-12 09:44:02 +08:00
Alex Lam S.L	54cb678055	fix corner case in `assignments` (#3407 ) fixes #3406	2019-05-12 03:52:46 +08:00
Alex Lam S.L	e88c439eac	improve tests (#3405 )	2019-05-11 22:06:14 +08:00
Alex Lam S.L	9fc8cd4076	fix corner case in `functions` (#3403 ) fixes #3402	2019-05-11 18:55:45 +08:00
Alex Lam S.L	5476cb8f05	fix corner case in `inline` (#3401 ) fixes #3400	2019-05-10 01:22:44 +08:00
Alex Lam S.L	6a30e1d6be	improve tests (#3399 )	2019-05-09 07:18:22 +08:00
Alex Lam S.L	e4881245d9	v3.5.11	2019-05-07 01:45:40 +08:00
Alex Lam S.L	354fec8a9c	make `enclose` & `wrap` work with `sourceMap` (#3396 ) fixes #3313	2019-05-04 20:25:52 +08:00
Alex Lam S.L	11cdab745d	fix corner cases in `sourceMap` (#3397 ) fixes #3255 fixes #3294	2019-05-04 20:08:57 +08:00
Alex Lam S.L	a89d424a0b	render comments in custom ASTs gracefully (#3393 ) fixes #3246	2019-05-02 13:50:51 +08:00
Alex Lam S.L	429d2b56b7	v3.5.10	2019-05-02 00:01:40 +08:00
Alex Lam S.L	2ea96549c5	unify logging functionality (#3392 ) fixes #3253 fixes #3254	2019-04-30 06:32:24 +08:00
Alex Lam S.L	fba008e298	remove blanket safeguard from `source-map` (#3391 ) Things has stabilised since `80a18fe2fa`, so it makes sense to remove the unconditional masking for ease of debugging.	2019-04-30 02:40:36 +08:00
Alex Lam S.L	c37a8e927e	fix corner case in `properties` (#3390 ) fixes #3389	2019-04-29 17:23:00 +08:00
Alex Lam S.L	413bbe0480	fix corner case in `evaluate` (#3388 ) fixes #3387	2019-04-29 08:55:46 +08:00