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

fix corner cases in conditionals & switches (#5545)

Browse Source 
fixes #5543
fixes #5544
This commit is contained in:
Alex Lam S.L
2022-07-07 07:59:06 +01:00
committed by GitHub
parent d89f0965aa
commit 3dcf098468
3 changed files with 154 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ast.js
View File

@@ -1126,6 +1126,10 @@ var AST_Switch = DEFNODE("Switch", "expression", {
$propdoc: { $propdoc: {
expression: "[AST_Node] the `switch` “discriminant”" expression: "[AST_Node] the `switch` “discriminant”"
}, },
_equals: function(node) {
return this.expression.equals(node.expression)
&& all_equals(this.body, node.body);
},
walk: function(visitor) { walk: function(visitor) {
var node = this; var node = this;
visitor.visit(node, function() { visitor.visit(node, function() {
@@ -1157,6 +1161,10 @@ var AST_Case = DEFNODE("Case", "expression", {
$propdoc: { $propdoc: {
expression: "[AST_Node] the `case` expression" expression: "[AST_Node] the `case` expression"
}, },
_equals: function(node) {
return this.expression.equals(node.expression)
&& all_equals(this.body, node.body);
},
walk: function(visitor) { walk: function(visitor) {
var node = this; var node = this;
visitor.visit(node, function() { visitor.visit(node, function() {

66
test/compress/conditionals.js
View File

@@ -2177,3 +2177,69 @@ issue_5334_2: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
issue_5544_1: {
options = {
conditionals: true,
}
input: {
var a;
if (a)
switch (42) {
case console.log("FAIL"):
case console:
}
else
switch (false) {
case console.log("PASS"):
case console:
}
}
expect: {
var a;
if (a)
switch (42) {
case console.log("FAIL"):
case console:
}
else
switch (false) {
case console.log("PASS"):
case console:
}
}
expect_stdout: "PASS"
}
issue_5544_2: {
options = {
conditionals: true,
}
input: {
var a;
if (a)
switch (42) {
case console.log("FAIL"):
case console:
}
else
switch (42) {
case console.log("PASS"):
case console:
}
}
expect: {
var a;
if (a)
switch (42) {
case console.log("FAIL"):
case console:
}
else
switch (42) {
case console.log("PASS"):
case console:
}
}
expect_stdout: "PASS"
}

80
test/compress/switches.js
View File

@@ -1608,3 +1608,83 @@ issue_5012: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
issue_5543_1: {
options = {
dead_code: true,
switches: true,
}
input: {
var a;
switch (a) {
default:
switch (42) {
case a:
case console.log("PASS"):
}
break;
case null:
switch (false) {
case a:
case console.log("FAIL"):
}
}
}
expect: {
var a;
switch (a) {
default:
switch (42) {
case a:
case console.log("PASS"):
}
break;
case null:
switch (false) {
case a:
case console.log("FAIL"):
}
}
}
expect_stdout: "PASS"
}
issue_5543_2: {
options = {
dead_code: true,
switches: true,
}
input: {
var a;
switch (a) {
default:
switch (42) {
case a:
case console.log("PASS"):
}
break;
case null:
switch (42) {
case a:
case console.log("FAIL"):
}
}
}
expect: {
var a;
switch (a) {
default:
switch (42) {
case a:
case console.log("PASS"):
}
break;
case null:
switch (42) {
case a:
case console.log("FAIL"):
}
}
}
expect_stdout: "PASS"
}