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

fix corner cases in collapse_vars (#4249)

Browse Source 
fixes #4248
This commit is contained in:
Alex Lam S.L
2020-10-30 02:04:23 +00:00
committed by GitHub
parent 79e5c3f564
commit 5d12abc41b
4 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/compress.js
View File

@@ -1556,12 +1556,17 @@ merge(Compressor.prototype, {
if (node instanceof AST_Defun) return funarg && lhs.name === node.name.name;
if (node instanceof AST_DWLoop) return true;
if (node instanceof AST_LoopControl) return true;
if (node instanceof AST_SymbolRef) {
if (node.is_declared(compressor) ? node.fixed_value() || all(node.definition().orig, function(sym) {
return !(sym instanceof AST_SymbolConst || sym instanceof AST_SymbolLet);
}) : parent instanceof AST_Assign && parent.operator == "=" && parent.left === node) return false;
if (!replace_all) return true;
scan_rhs = false;
return false;
}
if (node instanceof AST_Try) return true;
if (node instanceof AST_With) return true;
if (replace_all) return false;
return node instanceof AST_SymbolRef
&& !node.is_declared(compressor)
&& !(parent instanceof AST_Assign && parent.operator == "=" && parent.left === node);
return false;
}
function in_conditional(node, parent) {
@@ -1710,6 +1715,8 @@ merge(Compressor.prototype, {
extract_candidates(expr.condition);
extract_candidates(expr.consequent);
extract_candidates(expr.alternative);
} else if (expr instanceof AST_Definitions) {
expr.definitions.forEach(extract_candidates);
} else if (expr instanceof AST_Dot) {
extract_candidates(expr.expression);
} else if (expr instanceof AST_DWLoop) {
@@ -1763,18 +1770,18 @@ merge(Compressor.prototype, {
} else {
extract_candidates(expr.expression);
}
} else if (expr instanceof AST_Var) {
expr.definitions.forEach(extract_candidates);
} else if (expr instanceof AST_VarDef) {
if (expr.value) {
var def = expr.name.definition();
if (def.references.length > def.replaced) {
candidates.push(hit_stack.slice());
if (expr.name instanceof AST_SymbolVar) {
if (expr.value) {
var def = expr.name.definition();
if (def.references.length > def.replaced) {
candidates.push(hit_stack.slice());
}
} else {
declare_only[expr.name.name] = (declare_only[expr.name.name] || 0) + 1;
}
extract_candidates(expr.value);
} else {
declare_only[expr.name.name] = (declare_only[expr.name.name] || 0) + 1;
}
if (expr.value) extract_candidates(expr.value);
}
hit_stack.pop();
}