1 files changed, 25 insertions, 26 deletions

diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt
index 5a62e84c0..4663ef8dc 100644
--- a/test/wasm2js/unary-ops.2asm.js.opt
+++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -34,13 +34,12 @@ function asmFunc(global, env, buffer) {
  
  function $7($0) {
   $0 = $0 | 0;
-  var $1_1 = 0;
   if ($0) {
-   $1_1 = 31 - Math_clz32($0 ^ $0 + -1) | 0
+   $0 = 31 - Math_clz32($0 ^ $0 + -1) | 0
   } else {
-   $1_1 = 32
+   $0 = 32
   }
-  return $1_1 | 0;
+  return $0 | 0;
  }
  
  function $8($0, $1_1, $2, $3) {
@@ -71,24 +70,24 @@ function asmFunc(global, env, buffer) {
  }
  
  function legalstub$8($0, $1_1, $2, $3) {
-  var $4 = 0, $5 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0;
-  $8_1 = $0;
+  var $4 = 0, $5 = 0, $6_1 = 0, $7_1 = 0, $8_1 = 0;
+  $6_1 = $0;
   $5 = 32;
   $0 = $5 & 31;
   if (32 >>> 0 <= $5 >>> 0) {
    {
     $4 = $1_1 << $0;
-    $6_1 = 0;
+    $0 = 0;
    }
   } else {
    {
     $4 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $4 << $0;
-    $6_1 = $1_1 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  $9 = $8_1 | $6_1;
-  $10 = $4 | $12;
-  $11 = $2;
+  $5 = $6_1 | $0;
+  $4 = $4 | $7_1;
+  $6_1 = $2;
   $2 = 0;
   $1_1 = $3;
   $3 = 32;
@@ -96,15 +95,15 @@ function asmFunc(global, env, buffer) {
   if (32 >>> 0 <= $3 >>> 0) {
    {
     $2 = $1_1 << $0;
-    $7_1 = 0;
+    $0 = 0;
    }
   } else {
    {
     $2 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2 << $0;
-    $7_1 = $1_1 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  return $8($9, $10, $11 | $7_1, $2 | $13);
+  return $8($5, $4, $6_1 | $0, $2 | $8_1);
  }
  
  function legalstub$9($0, $1_1, $2, $3) {
@@ -112,22 +111,22 @@ function asmFunc(global, env, buffer) {
  }
  
  function __wasm_ctz_i64($0, $1_1) {
-  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6_1 = 0, $7_1 = 0;
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6_1 = 0;
   if ($0 | $1_1) {
    {
-    $3 = 63;
-    $6_1 = $3;
-    $2 = $1_1 + -1 | 0;
-    $4 = -1;
-    $5 = $4 + $0 | 0;
-    if ($5 >>> 0 < $4 >>> 0) {
-     $2 = $2 + 1 | 0
+    $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
     }
-    $7_1 = Math_clz32($0 ^ $5) + 32 | 0;
-    $0 = Math_clz32($1_1 ^ $2);
-    $0 = ($0 | 0) == (32 | 0) ? $7_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 - ($3 >>> 0 < $0 >>> 0) | 0;
+    i64toi32_i32$HIGH_BITS = 0 - ($4 >>> 0 < $0 >>> 0) | 0;
     return $1_1;
    }
   }