aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkzc <zaxxon2011@gmail.com>2016-09-01 09:24:56 -0400
committerkzc <zaxxon2011@gmail.com>2016-09-01 09:24:56 -0400
commit25fc02743af0e3fec6b10ffdb5cee3b7f22b9889 (patch)
tree9dc3e31bf38451f187b19b67745c36773274697d
parent0bd8053524760531eb582ef0716fcfe2104c3014 (diff)
downloadtracifyjs-25fc02743af0e3fec6b10ffdb5cee3b7f22b9889.tar.gz
tracifyjs-25fc02743af0e3fec6b10ffdb5cee3b7f22b9889.zip
Account for side effects in `string + expr` optimization
-rw-r--r--lib/compress.js4
-rw-r--r--test/compress/issue-1275.js49
2 files changed, 51 insertions, 2 deletions
diff --git a/lib/compress.js b/lib/compress.js
index 8f786d73..8a08572f 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -2499,8 +2499,8 @@ merge(Compressor.prototype, {
case "+":
var ll = self.left.evaluate(compressor);
var rr = self.right.evaluate(compressor);
- if ((ll.length > 1 && ll[0] instanceof AST_String && ll[1]) ||
- (rr.length > 1 && rr[0] instanceof AST_String && rr[1])) {
+ if ((ll.length > 1 && ll[0] instanceof AST_String && ll[1] && !self.right.has_side_effects(compressor)) ||
+ (rr.length > 1 && rr[0] instanceof AST_String && rr[1] && !self.left.has_side_effects(compressor))) {
compressor.warn("+ in boolean context always true [{file}:{line},{col}]", self.start);
return make_node(AST_True, self);
}
diff --git a/test/compress/issue-1275.js b/test/compress/issue-1275.js
new file mode 100644
index 00000000..e88e284c
--- /dev/null
+++ b/test/compress/issue-1275.js
@@ -0,0 +1,49 @@
+string_plus_optimization: {
+ options = {
+ side_effects : true,
+ evaluate : true,
+ conditionals : true,
+ comparisons : true,
+ dead_code : true,
+ booleans : true,
+ unused : true,
+ if_return : true,
+ join_vars : true,
+ cascade : true,
+ hoist_funs : true,
+ };
+ input: {
+ function foo(anything) {
+ function throwing_function() {
+ throw "nope";
+ }
+ try {
+ console.log('0' + throwing_function() ? "yes" : "no");
+ } catch (ex) {
+ console.log(ex);
+ }
+ console.log('0' + anything ? "yes" : "no");
+ console.log(anything + '0' ? "Yes" : "No");
+ console.log('' + anything);
+ console.log(anything + '');
+ }
+ foo();
+ }
+ expect: {
+ function foo(anything) {
+ function throwing_function() {
+ throw "nope";
+ }
+ try {
+ console.log('0' + throwing_function() ? "yes" : "no");
+ } catch (ex) {
+ console.log(ex);
+ }
+ console.log("yes");
+ console.log("Yes");
+ console.log('' + anything);
+ console.log(anything + '');
+ }
+ foo();
+ }
+}