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

fix corner case in functions (#4619)

Browse Source 
fixes #4618
This commit is contained in:
Alex Lam S.L
2021-02-07 05:52:09 +00:00
committed by GitHub
parent 5c84dfa151
commit 522cceeccf
2 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/compress.js
View File

@@ -5854,13 +5854,7 @@ merge(Compressor.prototype, {
&& var_defs[sym.id] == 1
&& sym.assignments == 0
&& (value instanceof AST_AsyncFunction || value instanceof AST_Function)
&& (sym.references.length ? all(sym.references, function(ref) {
return value === ref.fixed_value();
}) : value === def.name.fixed_value())
&& (!value.name || (old_def = value.name.definition()).assignments == 0
&& (old_def.name == def.name.name || all(old_def.references, function(ref) {
return ref.scope.find_variable(def.name.name) === def.name.definition();
})))
&& assigned_once(value, sym.references)
&& can_declare_defun()
&& can_rename(value, def.name.name)) {
AST_Node.warn("Declaring {name} as function [{file}:{line},{col}]", template(def.name));
@@ -5902,14 +5896,11 @@ merge(Compressor.prototype, {
sym.eliminated++;
}
function is_catch(node) {
var sym = node.definition();
return sym.orig[0] instanceof AST_SymbolCatch && sym.scope.resolve() === node.scope.resolve();
}
function can_rename(fn, name) {
var def = fn.variables.get(name);
return !def || fn.name && def === fn.name.definition();
function assigned_once(fn, refs) {
if (refs.length == 0) return fn === def.name.fixed_value();
return all(refs, function(ref) {
return fn === ref.fixed_value();
});
}
function can_declare_defun() {
@@ -5919,6 +5910,22 @@ merge(Compressor.prototype, {
|| parent instanceof AST_If;
}
function can_rename(fn, name) {
if (!fn.name) return !fn.variables.get(name);
old_def = fn.name.definition();
if (old_def.assignments > 0) return false;
if (old_def.name == name) return true;
if (name == "await" && is_async(fn)) return false;
return all(old_def.references, function(ref) {
return ref.scope.find_variable(name) === sym;
});
}
function is_catch(node) {
var sym = node.definition();
return sym.orig[0] instanceof AST_SymbolCatch && sym.scope.resolve() === node.scope.resolve();
}
function flush() {
if (side_effects.length > 0) {
if (tail.length == 0) {