aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Bazon <mihai.bazon@gmail.com>2015-05-18 13:56:04 +0300
committerMihai Bazon <mihai.bazon@gmail.com>2015-05-18 13:56:04 +0300
commita5b60217cede3f214153e62087d32274aa0859e5 (patch)
tree501fa6ea3fe8487df182c62e4d1372a4d07fccee
parent44fd6694ebf1def9974915b163cfc79114eb8e80 (diff)
downloadtracifyjs-a5b60217cede3f214153e62087d32274aa0859e5.tar.gz
tracifyjs-a5b60217cede3f214153e62087d32274aa0859e5.zip
Fix compressing conditionals
Only transform foo() ? EXP(x) : EXP(y) into EXP(foo() ? x : y) if EXP has no side effects. Fix #710
-rw-r--r--lib/compress.js1
-rw-r--r--test/compress/conditionals.js10
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/compress.js b/lib/compress.js
index 944db1d2..530e7c2f 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -2356,6 +2356,7 @@ merge(Compressor.prototype, {
if (consequent instanceof AST_Call
&& alternative.TYPE === consequent.TYPE
&& consequent.args.length == alternative.args.length
+ && !consequent.expression.has_side_effects(compressor)
&& consequent.expression.equivalent_to(alternative.expression)) {
if (consequent.args.length == 0) {
return make_node(AST_Seq, self, {
diff --git a/test/compress/conditionals.js b/test/compress/conditionals.js
index 299097be..1b961812 100644
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -153,6 +153,7 @@ cond_1: {
conditionals: true
};
input: {
+ var do_something; // if undeclared it's assumed to have side-effects
if (some_condition()) {
do_something(x);
} else {
@@ -160,6 +161,7 @@ cond_1: {
}
}
expect: {
+ var do_something;
do_something(some_condition() ? x : y);
}
}
@@ -169,7 +171,7 @@ cond_2: {
conditionals: true
};
input: {
- var x;
+ var x, FooBar;
if (some_condition()) {
x = new FooBar(1);
} else {
@@ -177,7 +179,7 @@ cond_2: {
}
}
expect: {
- var x;
+ var x, FooBar;
x = new FooBar(some_condition() ? 1 : 2);
}
}
@@ -187,6 +189,7 @@ cond_3: {
conditionals: true
};
input: {
+ var FooBar;
if (some_condition()) {
new FooBar(1);
} else {
@@ -194,6 +197,7 @@ cond_3: {
}
}
expect: {
+ var FooBar;
some_condition() ? new FooBar(1) : FooBar(2);
}
}
@@ -203,6 +207,7 @@ cond_4: {
conditionals: true
};
input: {
+ var do_something;
if (some_condition()) {
do_something();
} else {
@@ -210,6 +215,7 @@ cond_4: {
}
}
expect: {
+ var do_something;
some_condition(), do_something();
}
}