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

fix dead_code on AST_Switch

Browse Source 
Need to call `extract_declarations_from_unreachable_code()`.

fixes #1663
This commit is contained in:
alexlamsl 2017-03-25 15:15:33 +08:00
parent 491f16c766
commit dba64ee93d
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/compress.js
View File

@ -2529,14 +2529,14 @@ merge(Compressor.prototype, {
// no need to descend these node types
return node;
}
else if (node instanceof AST_Switch && node === self) {
else if (node === self) {
node = node.clone();
descend(node, this);
return ruined ? node : make_node(AST_BlockStatement, node, {
body: node.body.reduce(function(a, branch){
return a.concat(branch.body);
}, [])
}).transform(compressor);
body: node.body.map(function(stat) {
return stat instanceof AST_SwitchBranch ? make_node(AST_BlockStatement, stat, stat) : stat;
})
}).optimize(compressor);
}
else if (node instanceof AST_If || node instanceof AST_Try) {
var save = in_if;
@ -2559,10 +2559,10 @@ merge(Compressor.prototype, {
}
if (in_block) return node;
stopped = true;
return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
return skip(node);
}
else if (node instanceof AST_SwitchBranch && this.parent() === self) {
if (stopped) return MAP.skip;
if (stopped) return skip(node);
if (node instanceof AST_Case) {
var exp = node.expression.evaluate(compressor);
if (exp === node.expression) {
@ -2572,13 +2572,16 @@ merge(Compressor.prototype, {
if (exp === value || started) {
started = true;
if (aborts(node)) stopped = true;
descend(node, this);
return node;
} else return skip(node);
}
return MAP.skip;
}
descend(node, this);
return node;
function skip(node) {
var a = [];
extract_declarations_from_unreachable_code(compressor, node, a);
return in_list ? MAP.splice(a) : make_node(AST_BlockStatement, node, {
body: a
});
}
});
tt.stack = compressor.stack.slice(); // so that's able to see parent nodes

32
test/compress/switch.js
View File

@ -258,3 +258,35 @@ keep_default: {
}
}
}
issue_1663: {
options = {
dead_code: true,
evaluate: true,
}
input: {
var a = 100, b = 10;
function f() {
switch (1) {
case 1:
b = a++;
return ++b;
default:
var b;
}
}
f();
console.log(a, b);
}
expect: {
var a = 100, b = 10;
function f() {
b = a++;
return ++b;
var b;
}
f();
console.log(a, b);
}
expect_stdout: true
}