1 files changed, 33 insertions, 47 deletions

diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt
index 4663ef8dc..a095a0a3d 100644
--- a/test/wasm2js/unary-ops.2asm.js.opt
+++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -75,15 +75,11 @@ function asmFunc(global, env, buffer) {
   $5 = 32;
   $0 = $5 & 31;
   if (32 >>> 0 <= $5 >>> 0) {
-   {
-    $4 = $1_1 << $0;
-    $0 = 0;
-   }
+   $4 = $1_1 << $0;
+   $0 = 0;
   } else {
-   {
-    $4 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $4 << $0;
-    $0 = $1_1 << $0;
-   }
+   $4 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $4 << $0;
+   $0 = $1_1 << $0;
   }
   $5 = $6_1 | $0;
   $4 = $4 | $7_1;
@@ -93,15 +89,11 @@ function asmFunc(global, env, buffer) {
   $3 = 32;
   $0 = $3 & 31;
   if (32 >>> 0 <= $3 >>> 0) {
-   {
-    $2 = $1_1 << $0;
-    $0 = 0;
-   }
+   $2 = $1_1 << $0;
+   $0 = 0;
   } else {
-   {
-    $2 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2 << $0;
-    $0 = $1_1 << $0;
-   }
+   $2 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2 << $0;
+   $0 = $1_1 << $0;
   }
   return $8($5, $4, $6_1 | $0, $2 | $8_1);
  }
@@ -113,22 +105,20 @@ function asmFunc(global, env, buffer) {
  function __wasm_ctz_i64($0, $1_1) {
   var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6_1 = 0;
   if ($0 | $1_1) {
-   {
-    $4 = 63;
-    $6_1 = $4;
-    $3 = $1_1 + -1 | 0;
-    $2 = -1;
-    $5 = $2 + $0 | 0;
-    if ($5 >>> 0 < $2 >>> 0) {
-     $3 = $3 + 1 | 0
-    }
-    $2 = Math_clz32($0 ^ $5) + 32 | 0;
-    $0 = Math_clz32($1_1 ^ $3);
-    $0 = ($0 | 0) == (32 | 0) ? $2 : $0;
-    $1_1 = $6_1 - $0 | 0;
-    i64toi32_i32$HIGH_BITS = 0 - ($4 >>> 0 < $0 >>> 0) | 0;
-    return $1_1;
+   $4 = 63;
+   $6_1 = $4;
+   $3 = $1_1 + -1 | 0;
+   $2 = -1;
+   $5 = $2 + $0 | 0;
+   if ($5 >>> 0 < $2 >>> 0) {
+    $3 = $3 + 1 | 0
    }
+   $2 = Math_clz32($0 ^ $5) + 32 | 0;
+   $0 = Math_clz32($1_1 ^ $3);
+   $0 = ($0 | 0) == (32 | 0) ? $2 : $0;
+   $1_1 = $6_1 - $0 | 0;
+   i64toi32_i32$HIGH_BITS = 0 - ($4 >>> 0 < $0 >>> 0) | 0;
+   return $1_1;
   }
   i64toi32_i32$HIGH_BITS = 0;
   return 64;
@@ -139,11 +129,9 @@ function asmFunc(global, env, buffer) {
   label$2 : while (1) {
    $2 = $1_1;
    if ($0) {
-    {
-     $0 = $0 - 1 & $0;
-     $1_1 = $1_1 + 1 | 0;
-     continue;
-    }
+    $0 = $0 - 1 & $0;
+    $1_1 = $1_1 + 1 | 0;
+    continue;
    }
    break;
   };
@@ -156,18 +144,16 @@ function asmFunc(global, env, buffer) {
    $3 = $4;
    $2 = $5;
    if ($0 | $1_1) {
-    {
-     $2 = $0;
-     $3 = 1;
-     $0 = $2 - $3 & $2;
-     $1_1 = $1_1 - ($2 >>> 0 < $3 >>> 0) & $1_1;
-     $2 = 1 + $4 | 0;
-     if ($2 >>> 0 < $3 >>> 0) {
-      $5 = $5 + 1 | 0
-     }
-     $4 = $2;
-     continue;
+    $2 = $0;
+    $3 = 1;
+    $0 = $2 - $3 & $2;
+    $1_1 = $1_1 - ($2 >>> 0 < $3 >>> 0) & $1_1;
+    $2 = 1 + $4 | 0;
+    if ($2 >>> 0 < $3 >>> 0) {
+     $5 = $5 + 1 | 0
     }
+    $4 = $2;
+    continue;
    }
    break;
   };