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

fix corner case in merge_vars (#4505)

Browse Source 
fixes #4504
This commit is contained in:
Alex Lam S.L
2021-01-05 06:23:46 +00:00
committed by GitHub
parent 5fbbb43839
commit fc5aee662d
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/compress.js
View File

@@ -4944,16 +4944,15 @@ merge(Compressor.prototype, {
if (node instanceof AST_DestructuredKeyVal) { if (node instanceof AST_DestructuredKeyVal) {
if (node.key instanceof AST_Node) { if (node.key instanceof AST_Node) {
push(); push();
segment.block = node;
node.key.walk(tw); node.key.walk(tw);
pop();
push();
node.value.walk(marker); node.value.walk(marker);
pop(); pop();
} else { } else {
node.value.walk(marker); node.value.walk(marker);
} }
} else if (node instanceof AST_SymbolRef) { } else if (node instanceof AST_SymbolRef) {
mark(node, false, true); mark(node);
} else { } else {
node.walk(tw); node.walk(tw);
} }
@@ -4963,9 +4962,9 @@ merge(Compressor.prototype, {
return true; return true;
} }
if (lhs instanceof AST_SymbolRef) { if (lhs instanceof AST_SymbolRef) {
if (node.operator != "=") mark(lhs, true, false); if (node.operator != "=") mark(lhs, true);
node.right.walk(tw); node.right.walk(tw);
mark(lhs, false, true); mark(lhs);
return true; return true;
} }
return; return;
@@ -5073,7 +5072,7 @@ merge(Compressor.prototype, {
var marker = node.uses_arguments && !tw.has_directive("use strict") ? function(node) { var marker = node.uses_arguments && !tw.has_directive("use strict") ? function(node) {
if (node instanceof AST_SymbolFunarg) references[node.definition().id] = false; if (node instanceof AST_SymbolFunarg) references[node.definition().id] = false;
} : function(node) { } : function(node) {
if (node instanceof AST_SymbolFunarg) mark(node, false, true); if (node instanceof AST_SymbolFunarg) mark(node);
}; };
var scanner = new TreeWalker(function(ref) { var scanner = new TreeWalker(function(ref) {
if (ref instanceof AST_SymbolDeclaration) references[ref.definition().id] = false; if (ref instanceof AST_SymbolDeclaration) references[ref.definition().id] = false;
@@ -5088,7 +5087,7 @@ merge(Compressor.prototype, {
} else { } else {
var save = segment; var save = segment;
pop(); pop();
mark(ref, true, false); mark(ref, true);
segment = save; segment = save;
} }
return true; return true;
@@ -5125,7 +5124,7 @@ merge(Compressor.prototype, {
return true; return true;
} }
if (node instanceof AST_SymbolRef) { if (node instanceof AST_SymbolRef) {
mark(node, true, false); mark(node, true);
return true; return true;
} }
if (node instanceof AST_Try) { if (node instanceof AST_Try) {
@@ -5153,7 +5152,7 @@ merge(Compressor.prototype, {
if (!UNARY_POSTFIX[node.operator]) return; if (!UNARY_POSTFIX[node.operator]) return;
var sym = node.expression; var sym = node.expression;
if (!(sym instanceof AST_SymbolRef)) return; if (!(sym instanceof AST_SymbolRef)) return;
mark(sym, true, true); mark(sym, true);
return true; return true;
} }
if (node instanceof AST_VarDef) { if (node instanceof AST_VarDef) {
@@ -5161,7 +5160,7 @@ merge(Compressor.prototype, {
node.name.mark_symbol(node.value ? function(node) { node.name.mark_symbol(node.value ? function(node) {
if (!(node instanceof AST_SymbolDeclaration)) return; if (!(node instanceof AST_SymbolDeclaration)) return;
if (node instanceof AST_SymbolVar) { if (node instanceof AST_SymbolVar) {
mark(node, false, true); mark(node, false);
} else { } else {
references[node.definition().id] = false; references[node.definition().id] = false;
} }
@@ -5246,7 +5245,7 @@ merge(Compressor.prototype, {
segment = Object.getPrototypeOf(segment); segment = Object.getPrototypeOf(segment);
} }
function mark(sym, read, write) { function mark(sym, read) {
var def = sym.definition(), ldef; var def = sym.definition(), ldef;
if (def.id in references) { if (def.id in references) {
var refs = references[def.id]; var refs = references[def.id];

26
test/compress/destructured.js
View File

@@ -2326,3 +2326,29 @@ issue_4500: {
expect_stdout: "PASS" expect_stdout: "PASS"
node_version: ">=6" node_version: ">=6"
} }
issue_4504: {
options = {
inline: true,
merge_vars: true,
}
input: {
A = "FAIL";
(function f(a) {
({
[console.log(a)]: 0[(b => console + b)(A)]
} = 0);
})("PASS");
}
expect: {
A = "FAIL";
(function f(a) {
({
[console.log(a)]: 0[b = A, console + b]
} = 0);
var b;
})("PASS");
}
expect_stdout: "PASS"
node_version: ">=6"
}