From 992b6b9fcce47ca67ecb14675f10b172ce7a99b5 Mon Sep 17 00:00:00 2001 From: Richard van Velzen Date: Wed, 11 Feb 2015 21:05:49 +0100 Subject: Fix invalid removal of left side in && and || compression See #637. This does not produce the optimal result, but it does prevent the removal of non-side-effect-free code. --- lib/compress.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/compress.js') diff --git a/lib/compress.js b/lib/compress.js index 27285984..b77b5ff3 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -2110,6 +2110,12 @@ merge(Compressor.prototype, { var rr = self.right.evaluate(compressor); if ((ll.length > 1 && !ll[1]) || (rr.length > 1 && !rr[1])) { compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start); + if (self.left.has_side_effects(compressor)) { + return make_node(AST_Seq, self, { + car: self.left, + cdr: make_node(AST_False) + }).optimize(compressor); + } return make_node(AST_False, self); } if (ll.length > 1 && ll[1]) { @@ -2124,6 +2130,12 @@ merge(Compressor.prototype, { var rr = self.right.evaluate(compressor); if ((ll.length > 1 && ll[1]) || (rr.length > 1 && rr[1])) { compressor.warn("Boolean || always true [{file}:{line},{col}]", self.start); + if (self.left.has_side_effects(compressor)) { + return make_node(AST_Seq, self, { + car: self.left, + cdr: make_node(AST_True) + }).optimize(compressor); + } return make_node(AST_True, self); } if (ll.length > 1 && !ll[1]) { -- cgit v1.2.3