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

fix corner cases in inline (#5255)

Browse Source 
fixes #5254
This commit is contained in:
Alex Lam S.L
2022-01-02 13:24:41 +00:00
committed by GitHub
parent f7841bc8b8
commit 7889192cae
4 changed files with 204 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/compress.js
View File

@@ -10317,7 +10317,7 @@ Compressor.prototype.compress = function(node) {
function flatten_vars(decls, expressions) {
var args = [ insert, 0 ];
var decl_var = [], expr_var = [], expr_loop = [], exprs = [];
var decl_var = [], expr_fn = [], expr_var = [], expr_loop = [], exprs = [];
fn.body.filter(in_loop ? function(stat) {
if (!(stat instanceof AST_LambdaDefinition)) return true;
var name = make_node(AST_SymbolVar, stat.name, flatten_var(stat.name));
@@ -10325,7 +10325,7 @@ Compressor.prototype.compress = function(node) {
def.fixed = false;
def.orig.push(name);
def.eliminated++;
append_var(decls, expressions, name, to_func_expr(stat, true));
append_var(decls, expr_fn, name, to_func_expr(stat, true));
return false;
} : function(stat) {
if (!(stat instanceof AST_LambdaDefinition)) return true;
@@ -10351,20 +10351,23 @@ Compressor.prototype.compress = function(node) {
exprs = [];
}
append_var(decl_var, expr_var, name, value);
if (in_loop && !arg_used.has(name.name) && !fn.functions.has(name.name)) {
var def = fn.variables.get(name.name);
var sym = make_node(AST_SymbolRef, name, name);
def.references.push(sym);
expr_loop.push(make_node(AST_Assign, var_def, {
operator: "=",
left: sym,
right: make_node(AST_Undefined, name),
}));
}
if (!in_loop) continue;
if (arg_used.has(name.name)) continue;
var def = fn.variables.get(name.name);
if (fn.functions.has(name.name) && def.orig.length == 1) continue;
var def = fn.variables.get(name.name);
var sym = make_node(AST_SymbolRef, name, name);
def.references.push(sym);
expr_loop.push(make_node(AST_Assign, var_def, {
operator: "=",
left: sym,
right: make_node(AST_Undefined, name),
}));
}
});
[].push.apply(decls, decl_var);
[].push.apply(expressions, expr_loop);
[].push.apply(expressions, expr_fn);
[].push.apply(expressions, expr_var);
return args;
}
@@ -12986,12 +12989,17 @@ Compressor.prototype.compress = function(node) {
scope.enclosed.push(def);
scope.variables.set(name, def);
def.single_use = false;
if (!in_loop || fn.functions.has(name)) return;
if (!in_loop) return;
if (fn.functions.has(name) && def.orig.length == 1) return;
if (def.references.length == def.replaced) return;
var sym = flatten_var(def.orig[0]);
if (sym.TYPE != "SymbolVar") return;
var ref = make_node(AST_SymbolRef, sym, sym);
sym.definition().references.push(ref);
if (!all(def.orig, function(sym) {
return !(sym instanceof AST_SymbolConst
|| sym instanceof AST_SymbolFunarg
|| sym instanceof AST_SymbolLet);
})) return;
var sym = def.orig[0];
var ref = make_node(AST_SymbolRef, sym, flatten_var(sym));
ref.definition().references.push(ref);
body.push(make_node(AST_SimpleStatement, sym, {
body: make_node(AST_Assign, sym, {
operator: "=",