aboutsummaryrefslogtreecommitdiff
path: root/lib/compress.js
diff options
context:
space:
mode:
Diffstat (limited to 'lib/compress.js')
-rw-r--r--lib/compress.js20
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/compress.js b/lib/compress.js
index dfee94fc..adfbb793 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3312,6 +3312,11 @@ merge(Compressor.prototype, {
}
} else if (!(value instanceof AST_Node)) {
var exp = branch.expression.evaluate(compressor);
+ if (!(exp instanceof AST_Node) && exp !== value) {
+ eliminate_branch(branch, body[body.length - 1]);
+ continue;
+ }
+ if (exp instanceof AST_Node) exp = branch.expression.tail_node().evaluate(compressor);
if (exp === value) {
exact_match = branch;
if (default_branch) {
@@ -3320,9 +3325,6 @@ merge(Compressor.prototype, {
eliminate_branch(default_branch, body[default_index - 1]);
default_branch = null;
}
- } else if (exp !== branch.expression) {
- eliminate_branch(branch, body[body.length - 1]);
- continue;
}
}
if (aborts(branch)) {
@@ -3365,12 +3367,16 @@ merge(Compressor.prototype, {
});
self.walk(tw);
if (!has_break) {
- body = body[0].body.slice();
- body.unshift(make_node(AST_SimpleStatement, self.expression, {
- body: self.expression
+ var statements = body[0].body.slice();
+ var exp = body[0].expression;
+ if (exp) statements.unshift(make_node(AST_SimpleStatement, exp, {
+ body: exp
+ }));
+ statements.unshift(make_node(AST_SimpleStatement, self.expression, {
+ body:self.expression
}));
return make_node(AST_BlockStatement, self, {
- body: body
+ body: statements
}).optimize(compressor);
}
}