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

fix corner case in merge_vars & reduce_vars (#4313)

Browse Source 
fixes #4312
This commit is contained in:
Alex Lam S.L
2020-11-21 00:57:59 +00:00
committed by GitHub
parent 8d30902ba9
commit cf120c7cea
3 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/compress.js
View File

@@ -752,14 +752,18 @@ merge(Compressor.prototype, {
def(AST_Call, function(tw, descend) {
tw.find_parent(AST_Scope).may_call_this();
var exp = this.expression;
if (exp instanceof AST_Function) {
var tail = exp.tail_node();
if (tail instanceof AST_Function) {
if (exp !== tail) exp.expressions.slice(0, -1).forEach(function(node) {
node.walk(tw);
});
this.args.forEach(function(arg) {
arg.walk(tw);
});
exp.walk(tw);
tail.walk(tw);
return true;
} else if (exp instanceof AST_SymbolRef) {
var def = exp.definition();
} else if (tail instanceof AST_SymbolRef) {
var def = tail.definition();
if (this.TYPE == "Call" && tw.in_boolean_context()) def.bool_fn++;
if (!(def.fixed instanceof AST_Defun)) return;
var defun = mark_defun(tw, def);
@@ -768,11 +772,11 @@ merge(Compressor.prototype, {
defun.walk(tw);
return true;
} else if (this.TYPE == "Call"
&& exp instanceof AST_Assign
&& exp.operator == "="
&& exp.left instanceof AST_SymbolRef
&& tail instanceof AST_Assign
&& tail.operator == "="
&& tail.left instanceof AST_SymbolRef
&& tw.in_boolean_context()) {
exp.left.definition().bool_fn++;
tail.left.definition().bool_fn++;
}
});
def(AST_Conditional, function(tw) {
@@ -4681,6 +4685,19 @@ merge(Compressor.prototype, {
if (!(target instanceof AST_IterationStatement)) insert(target);
return true;
}
if (node instanceof AST_Call) {
var exp = node.expression;
var tail = exp.tail_node();
if (!(tail instanceof AST_Function)) return;
if (exp !== tail) exp.expressions.slice(0, -1).forEach(function(node) {
node.walk(tw);
});
node.args.forEach(function(arg) {
arg.walk(tw);
});
tail.walk(tw);
return true;
}
if (node instanceof AST_Conditional) {
node.condition.walk(tw);
push();