Merge branch 'master' into harmony-v2.8.6

mishoo · Mar 5, 2017 · aa60549 · aa60549
2 parents 33a26d4 + a5d62a3
commit aa60549
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -2970,7 +2970,7 @@ merge(Compressor.prototype, {
             if (self.car instanceof AST_Assign
                 && !self.car.left.has_side_effects(compressor)) {
                 left = self.car.left;
-            } else if (self.car instanceof AST_UnaryPostfix
+            } else if (self.car instanceof AST_Unary
                 && (self.car.operator == "++" || self.car.operator == "--")) {
                 left = self.car.expression;
             }
@@ -2979,11 +2979,15 @@ merge(Compressor.prototype, {
                 var cdr = self.cdr;
                 while (true) {
                     if (cdr.equivalent_to(left)) {
+                        var car = self.car instanceof AST_UnaryPostfix ? make_node(AST_UnaryPrefix, self.car, {
+                            operator: self.car.operator,
+                            expression: left
+                        }) : self.car;
                         if (parent) {
-                            parent[field] = self.car;
+                            parent[field] = car;
                             return self.cdr;
                         }
-                        return self.car;
+                        return car;
                     }
                     if (cdr instanceof AST_Binary && !(cdr instanceof AST_Assign)) {
                         field = cdr.left.is_constant() ? "right" : "left";

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "homepage": "http://lisperator.net/uglifyjs",
   "author": "Mihai Bazon <[email protected]> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "engines": {
     "node": ">=0.8.0"
   },

diff --git a/test/compress/issue-368.js b/test/compress/issue-368.js
@@ -21,6 +21,16 @@ collapse: {
             var a;
             a = b(a / 2);
             if (a < 0) {
+                a++;
+                ++c;
+                return c / 2;
+            }
+        }
+        function f4(c) {
+            var a;
+            a = b(a / 2);
+            if (a < 0) {
+                a++;
                 c++;
                 return c / 2;
             }
@@ -35,7 +45,11 @@ collapse: {
         }
         function f3(c) {
             var a;
-            if ((a = b(a / 2)) < 0) return c++ / 2;
+            if ((a = b(a / 2)) < 0) return a++, ++c / 2;
+        }
+        function f4(c) {
+            var a;
+            if ((a = b(a / 2)) < 0) return a++, ++c / 2;
         }
     }
 }