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

fix corner case in collapse_vars (#4287)

Browse Source 
fixes #4286
This commit is contained in:
Alex Lam S.L
2020-11-17 10:03:31 +00:00
committed by GitHub
parent 8a83c8dd46
commit 383163afa6
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/compress.js
View File

@@ -1972,15 +1972,9 @@ merge(Compressor.prototype, {
function find_stop_value(node, level) { function find_stop_value(node, level) {
var parent = scanner.parent(level); var parent = scanner.parent(level);
if (parent instanceof AST_Array) return find_stop_value(parent, level + 1); if (parent instanceof AST_Array) return find_stop_value(parent, level + 1);
if (parent instanceof AST_Assign) { if (parent instanceof AST_Assign) return may_throw(parent) || parent.left.match_symbol(function(ref) {
if (may_throw(parent)) return node; return ref instanceof AST_SymbolRef && (lhs.name == ref.name || value_def.name == ref.name);
if (parent.left instanceof AST_SymbolRef) { }) ? node : find_stop_value(parent, level + 1);
var name = parent.left.name;
if (lhs.name == name) return node;
if (value_def.name == name) return node;
}
return find_stop_value(parent, level + 1);
}
if (parent instanceof AST_Binary) { if (parent instanceof AST_Binary) {
if (lazy_op[parent.operator] && parent.left !== node) { if (lazy_op[parent.operator] && parent.left !== node) {
do { do {
@@ -2034,12 +2028,9 @@ merge(Compressor.prototype, {
if (parent.operator == "delete") return node; if (parent.operator == "delete") return node;
return find_stop_value(parent, level + 1); return find_stop_value(parent, level + 1);
} }
if (parent instanceof AST_VarDef) { if (parent instanceof AST_VarDef) return parent.name.match_symbol(function(sym) {
var name = parent.name.name; return sym instanceof AST_SymbolDeclaration && (lhs.name == sym.name || value_def.name == sym.name);
if (lhs.name == name) return node; }) ? node : find_stop_value(parent, level + 1);
if (value_def.name == name) return node;
return find_stop_value(parent, level + 1);
}
if (parent instanceof AST_While) { if (parent instanceof AST_While) {
if (parent.condition !== node) return node; if (parent.condition !== node) return node;
return find_stop_value(parent, level + 1); return find_stop_value(parent, level + 1);

37
test/compress/destructured.js
View File

@@ -1403,3 +1403,40 @@ issue_4284_3: {
expect_stdout: "PASS" expect_stdout: "PASS"
node_version: ">=6" node_version: ">=6"
} }
issue_4286_1: {
options = {
collapse_vars: true,
toplevel: true,
}
input: {
var a = "PASS", b;
(0 && a)[{ a } = b = a];
console.log(b);
}
expect: {
var a = "PASS", b;
(0 && a)[{ a } = b = a];
console.log(b);
}
expect_stdout: "PASS"
node_version: ">=6"
}
issue_4286_2: {
options = {
collapse_vars: true,
toplevel: true,
}
input: {
a = [ "PASS" ];
var b, { a } = b = a;
console.log(b[0]);
}
expect: {
var b, { a } = b = a = [ "PASS" ];
console.log(b[0]);
}
expect_stdout: "PASS"
node_version: ">=6"
}