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

fix corner case in if_return (#5650)

Browse Source 
fixes #5649
This commit is contained in:
Alex Lam S.L
2022-09-08 03:49:05 +01:00
committed by GitHub
parent 32bd65a87f
commit 4e4a2f8ed3
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/compress.js
View File

@@ -3854,9 +3854,9 @@ Compressor.prototype.compress = function(node) {
return j; return j;
} }
function eliminate_returns(stat, in_block) { function eliminate_returns(stat, keep_throws, in_block) {
if (stat instanceof AST_Exit) { if (stat instanceof AST_Exit) {
var mode = match_return(stat, true); var mode = !(keep_throws && stat instanceof AST_Throw) && match_return(stat, true);
if (mode) { if (mode) {
changed = true; changed = true;
var value = trim_return(stat.value, mode); var value = trim_return(stat.value, mode);
@@ -3864,18 +3864,18 @@ Compressor.prototype.compress = function(node) {
return in_block ? null : make_node(AST_EmptyStatement, stat); return in_block ? null : make_node(AST_EmptyStatement, stat);
} }
} else if (stat instanceof AST_If) { } else if (stat instanceof AST_If) {
stat.body = eliminate_returns(stat.body); stat.body = eliminate_returns(stat.body, keep_throws);
if (stat.alternative) stat.alternative = eliminate_returns(stat.alternative); if (stat.alternative) stat.alternative = eliminate_returns(stat.alternative, keep_throws);
} else if (stat instanceof AST_LabeledStatement) { } else if (stat instanceof AST_LabeledStatement) {
stat.body = eliminate_returns(stat.body); stat.body = eliminate_returns(stat.body, keep_throws);
} else if (stat instanceof AST_Try) { } else if (stat instanceof AST_Try) {
if (!stat.bfinally || !jump.value || jump.value.is_constant()) { if (!stat.bfinally || !jump.value || jump.value.is_constant()) {
if (stat.bcatch) eliminate_returns(stat.bcatch); if (stat.bcatch) eliminate_returns(stat.bcatch, keep_throws);
var trimmed = eliminate_returns(stat.body.pop(), true); var trimmed = eliminate_returns(stat.body.pop(), true, true);
if (trimmed) stat.body.push(trimmed); if (trimmed) stat.body.push(trimmed);
} }
} else if (stat instanceof AST_Block && !(stat instanceof AST_Scope || stat instanceof AST_Switch)) { } else if (stat instanceof AST_Block && !(stat instanceof AST_Scope || stat instanceof AST_Switch)) {
var trimmed = eliminate_returns(stat.body.pop(), true); var trimmed = eliminate_returns(stat.body.pop(), keep_throws, true);
if (trimmed) stat.body.push(trimmed); if (trimmed) stat.body.push(trimmed);
} }
return stat; return stat;

27
test/compress/if_return.js
View File

@@ -2385,3 +2385,30 @@ issue_5619_2: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
issue_5649: {
options = {
if_return: true,
}
input: {
console.log(function() {
try {
throw new Error("FAIL");
} catch (e) {
return "PASS";
}
throw new Error("FAIL");
}());
}
expect: {
console.log(function() {
try {
throw new Error("FAIL");
} catch (e) {
return "PASS";
}
throw new Error("FAIL");
}());
}
expect_stdout: "PASS"
}