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

fix corner cases in inline (#4640)

Browse Source 
fixes #4639
This commit is contained in:
Alex Lam S.L
2021-02-10 12:40:57 +00:00
committed by GitHub
parent a98ec7e4df
commit c6e287331d
4 changed files with 77 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/compress.js
View File

@@ -8336,7 +8336,7 @@ merge(Compressor.prototype, {
var can_inline = can_drop && compressor.option("inline") && !self.is_expr_pure(compressor);
if (can_inline && stat instanceof AST_Return) {
var value = stat.value;
if (exp === fn && (!value || value.is_constant_expression() && safe_from_await(value))) {
if (exp === fn && (!value || value.is_constant_expression() && safe_from_await_yield(value))) {
return make_sequence(self, convert_args(value)).optimize(compressor);
}
}
@@ -8506,8 +8506,17 @@ merge(Compressor.prototype, {
return args;
}
function safe_from_await(node) {
if (!is_async(scope || compressor.find_parent(AST_Scope))) return true;
function avoid_await_yield() {
var avoid = [];
var parent_scope = scope || compressor.find_parent(AST_Scope);
if (is_async(parent_scope)) avoid.push("await");
if (is_generator(parent_scope)) avoid.push("yield");
return avoid.length && makePredicate(avoid);
}
function safe_from_await_yield(node) {
var avoid = avoid_await_yield();
if (!avoid) return true;
var safe = true;
var tw = new TreeWalker(function(node) {
if (!safe) return true;
@@ -8515,12 +8524,12 @@ merge(Compressor.prototype, {
if (node === fn) return;
if (is_arrow(node)) {
for (var i = 0; safe && i < node.argnames.length; i++) node.argnames[i].walk(tw);
} else if (node instanceof AST_LambdaDefinition && node.name.name == "await") {
} else if (node instanceof AST_LambdaDefinition && avoid[node.name.name]) {
safe = false;
}
return true;
}
if (node instanceof AST_Symbol && node.name == "await" && node !== fn.name) safe = false;
if (node instanceof AST_Symbol && avoid[node.name] && node !== fn.name) safe = false;
});
node.walk(tw);
return safe;
@@ -8579,10 +8588,10 @@ merge(Compressor.prototype, {
return def.references.length - def.replaced < 2 && def.orig[0] instanceof AST_SymbolFunarg;
})) return;
var abort = false;
var avoid = avoid_await_yield();
var begin;
var in_order = [];
var side_effects = false;
var verify_await = true;
value.walk(new TreeWalker(function(node, descend) {
if (abort) return true;
if (node instanceof AST_Binary && lazy_op[node.operator]
@@ -8591,10 +8600,7 @@ merge(Compressor.prototype, {
return;
}
if (node instanceof AST_Scope) return abort = true;
if (verify_await && node instanceof AST_Symbol && node.name == "await") {
if (is_async(compressor.find_parent(AST_Scope))) return abort = true;
verify_await = false;
}
if (avoid && node instanceof AST_Symbol && avoid[node.name]) return abort = true;
if (node instanceof AST_SymbolRef) {
var def = node.definition();
if (fn.variables.get(node.name) !== def) {
@@ -8697,7 +8703,7 @@ merge(Compressor.prototype, {
} while (!(scope instanceof AST_Scope));
insert = scope.body.indexOf(child) + 1;
if (!insert) return false;
if (!safe_from_await(fn)) return false;
if (!safe_from_await_yield(fn)) return false;
var safe_to_inject = exp !== fn || fn.parent_scope.resolve() === scope;
if (scope instanceof AST_Toplevel) {
if (compressor.toplevel.vars) {