improve compression of loop conditions (#2543)

5 files changed, 8 insertions, 5 deletions

diff --git a/test/compress/dead-code.js b/test/compress/dead-code.js
index 9e7f489d..e0c30397 100644
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -129,8 +129,8 @@ dead_code_constant_boolean_should_warn_more: {
         function bar() {}
         // nothing for the while
         // as for the for, it should keep:
-        var x = 10, y;
         var moo;
+        var x = 10, y;
         bar();
     }
     expect_stdout: true
@@ -165,8 +165,8 @@ dead_code_constant_boolean_should_warn_more_strict: {
         var foo;
         // nothing for the while
         // as for the for, it should keep:
-        var x = 10, y;
         var moo;
+        var x = 10, y;
         bar();
     }
     expect_stdout: true
diff --git a/test/compress/issue-1656.js b/test/compress/issue-1656.js
index 3971ceaa..27d87652 100644
--- a/test/compress/issue-1656.js
+++ b/test/compress/issue-1656.js
@@ -39,7 +39,7 @@ f7: {
         "var b = 10;",
         "",
         "!function() {",
-        "    for (;b = 100, !1; ) ;",
+        "    b = 100;",
         "}(), console.log(100, b);",
     ]
     expect_stdout: true
diff --git a/test/compress/issue-1833.js b/test/compress/issue-1833.js
index 4ffa9d5c..e3c385e8 100644
--- a/test/compress/issue-1833.js
+++ b/test/compress/issue-1833.js
@@ -134,5 +134,5 @@ label_while: {
             L: while (0) continue L;
         }
     }
-    expect_exact: "function f(){L:;}"
+    expect_exact: "function f(){L:0}"
 }
diff --git a/test/compress/loops.js b/test/compress/loops.js
index bac40494..864276a3 100644
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -148,9 +148,11 @@ parse_do_while_without_semicolon: {
 
 evaluate: {
     options = {
-        loops: true,
         dead_code: true,
         evaluate: true,
+        loops: true,
+        passes: 2,
+        side_effects: true,
     };
     input: {
         while (true) {
diff --git a/test/compress/reduce_vars.js b/test/compress/reduce_vars.js
index a8c151f1..bcfa7b35 100644
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -1209,6 +1209,7 @@ toplevel_on_loops_2: {
         loops: true,
         reduce_funcs: true,
         reduce_vars: true,
+        side_effects: true,
         toplevel:true,
         unused: true,
     }