JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into harmony-v3.1.2

Browse Source
This commit is contained in:
alexlamsl
2017-09-24 02:20:47 +08:00
parent 1241600013 55387e8fd0
commit bd84007cf4
6 changed files with 151 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/compress.js
View File

@@ -875,7 +875,7 @@ merge(Compressor.prototype, {
}
}
function has_overlapping_symbol(fn, arg) {
function has_overlapping_symbol(fn, arg, fn_strict) {
var found = false, scan_this = !(fn instanceof AST_Arrow);
arg.walk(new TreeWalker(function(node, descend) {
if (found) return true;
@@ -886,7 +886,7 @@ merge(Compressor.prototype, {
}
return found = true;
}
if (scan_this && node instanceof AST_This) {
if ((fn_strict || scan_this) && node instanceof AST_This) {
return found = true;
}
if (node instanceof AST_Scope && !(node instanceof AST_Arrow)) {
@@ -911,6 +911,8 @@ merge(Compressor.prototype, {
&& all(iife.args, function(arg) {
return !(arg instanceof AST_Expansion);
})) {
var fn_strict = compressor.has_directive("use strict");
if (fn_strict && fn.body.indexOf(fn_strict) < 0) fn_strict = false;
var names = Object.create(null);
for (var i = fn.argnames.length; --i >= 0;) {
var sym = fn.argnames[i];
@@ -919,7 +921,7 @@ merge(Compressor.prototype, {
if (sym instanceof AST_Expansion) {
var elements = iife.args.slice(i);
if (all(elements, function(arg) {
return !has_overlapping_symbol(fn, arg);
return !has_overlapping_symbol(fn, arg, fn_strict);
})) {
candidates.unshift(make_node(AST_VarDef, sym, {
name: sym.expression,
@@ -931,7 +933,7 @@ merge(Compressor.prototype, {
} else {
var arg = iife.args[i];
if (!arg) arg = make_node(AST_Undefined, sym).transform(compressor);
else if (has_overlapping_symbol(fn, arg)) arg = null;
else if (has_overlapping_symbol(fn, arg, fn_strict)) arg = null;
if (arg) candidates.unshift(make_node(AST_VarDef, sym, {
name: sym,
value: arg