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

fix corner case in collapse_vars (#5113)

Browse Source 
fixes #5112
This commit is contained in:
Alex Lam S.L
2021-08-18 03:54:24 +01:00
committed by GitHub
parent c09f63aefb
commit 02eb8baa1c
2 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/compress.js
View File

@@ -1815,7 +1815,11 @@ merge(Compressor.prototype, {
var node = compressor.self(), level = 0; var node = compressor.self(), level = 0;
do { do {
if (node instanceof AST_Catch) { if (node instanceof AST_Catch) {
if (!compressor.parent(level).bfinally) level++; if (compressor.parent(level).bfinally) {
if (!in_try) in_try = {};
in_try.bfinally = true;
}
level++;
} else if (node instanceof AST_Finally) { } else if (node instanceof AST_Finally) {
level++; level++;
} else if (node instanceof AST_IterationStatement) { } else if (node instanceof AST_IterationStatement) {
@@ -1824,7 +1828,9 @@ merge(Compressor.prototype, {
scope = node; scope = node;
break; break;
} else if (node instanceof AST_Try) { } else if (node instanceof AST_Try) {
if (!in_try) in_try = node; if (!in_try) in_try = {};
if (node.bcatch) in_try.bcatch = true;
if (node.bfinally) in_try.bfinally = true;
} }
} while (node = compressor.parent(level++)); } while (node = compressor.parent(level++));
} }

70
test/compress/collapse_vars.js
View File

@@ -9412,3 +9412,73 @@ issue_4977_2: {
} }
expect_stdout: "PASS PASS" expect_stdout: "PASS PASS"
} }
issue_5112_1: {
options = {
collapse_vars: true,
}
input: {
console.log(function(a) {
try {
try {
if (console + (a = "PASS", ""))
return "FAIL 1";
a.p;
} catch (e) {}
} finally {
return a;
}
}("FAIL 2"));
}
expect: {
console.log(function(a) {
try {
try {
if (console + (a = "PASS", ""))
return "FAIL 1";
a.p;
} catch (e) {}
} finally {
return a;
}
}("FAIL 2"));
}
expect_stdout: "PASS"
}
issue_5112_2: {
options = {
collapse_vars: true,
}
input: {
console.log(function(a) {
try {
return function() {
try {
if (console + (a = "PASS", ""))
return "FAIL 1";
a.p;
} catch (e) {}
}();
} finally {
return a;
}
}("FAIL 2"));
}
expect: {
console.log(function(a) {
try {
return function() {
try {
if (console + (a = "PASS", ""))
return "FAIL 1";
a.p;
} catch (e) {}
}();
} finally {
return a;
}
}("FAIL 2"));
}
expect_stdout: "PASS"
}