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

fix corner case in collapse_vars (#3501)

Browse Source
This commit is contained in:
Alex Lam S.L
2019-10-20 03:53:20 +08:00
committed by GitHub
parent 543dd7d3d7
commit ca6dce43fe
2 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/compress.js
View File

@@ -1465,50 +1465,20 @@ merge(Compressor.prototype, {
hit_stack.pop(); hit_stack.pop();
} }
function find_stop(node, level, write_only) { function find_stop(node, level) {
var parent = scanner.parent(level); var parent = scanner.parent(level);
if (parent instanceof AST_Assign) { if (parent instanceof AST_Assign) return node;
if (write_only if (parent instanceof AST_Binary) return node;
&& !(parent.left instanceof AST_PropAccess
|| parent.left.name in lvalues)) {
return find_stop(parent, level + 1, write_only);
}
return node;
}
if (parent instanceof AST_Binary) {
if (write_only && (!lazy_op[parent.operator] || parent.left === node)) {
return find_stop(parent, level + 1, write_only);
}
return node;
}
if (parent instanceof AST_Call) return node; if (parent instanceof AST_Call) return node;
if (parent instanceof AST_Case) return node; if (parent instanceof AST_Case) return node;
if (parent instanceof AST_Conditional) { if (parent instanceof AST_Conditional) return node;
if (write_only && parent.condition === node) { if (parent instanceof AST_Definitions) return find_stop(parent, level + 1);
return find_stop(parent, level + 1, write_only); if (parent instanceof AST_Exit) return node;
} if (parent instanceof AST_If) return node;
return node;
}
if (parent instanceof AST_Definitions) {
return find_stop(parent, level + 1, true);
}
if (parent instanceof AST_Exit) {
return write_only ? find_stop(parent, level + 1, write_only) : node;
}
if (parent instanceof AST_If) {
if (write_only && parent.condition === node) {
return find_stop(parent, level + 1, write_only);
}
return node;
}
if (parent instanceof AST_IterationStatement) return node; if (parent instanceof AST_IterationStatement) return node;
if (parent instanceof AST_PropAccess) return node; if (parent instanceof AST_PropAccess) return node;
if (parent instanceof AST_Sequence) { if (parent instanceof AST_Sequence) return find_stop(parent, level + 1);
return find_stop(parent, level + 1, parent.tail_node() !== node); if (parent instanceof AST_SimpleStatement) return find_stop(parent, level + 1);
}
if (parent instanceof AST_SimpleStatement) {
return find_stop(parent, level + 1, true);
}
if (parent instanceof AST_Switch) return node; if (parent instanceof AST_Switch) return node;
if (parent instanceof AST_Unary) return node; if (parent instanceof AST_Unary) return node;
if (parent instanceof AST_VarDef) return node; if (parent instanceof AST_VarDef) return node;

21
test/compress/collapse_vars.js
View File

@@ -6237,3 +6237,24 @@ issue_3439_2: {
} }
expect_stdout: "number" expect_stdout: "number"
} }
cond_sequence_return: {
options = {
collapse_vars: true,
}
input: {
console.log(function(n) {
var c = 0;
for (var k in [0, 1])
if (c++, k == n) return c;
}(1));
}
expect: {
console.log(function(n) {
var c = 0;
for (var k in [0, 1])
if (c++, k == n) return c;
}(1));
}
expect_stdout: "2"
}