3 files changed, 25 insertions, 35 deletions

diff --git a/test/wasm2js/i64-ctz.2asm.js.opt b/test/wasm2js/i64-ctz.2asm.js.opt
index d1659d374..5fc52a8f0 100644
--- a/test/wasm2js/i64-ctz.2asm.js.opt
+++ b/test/wasm2js/i64-ctz.2asm.js.opt
@@ -17,11 +17,9 @@ function asmFunc(env) {
  var setTempRet0 = env.setTempRet0;
  var i64toi32_i32$HIGH_BITS = 0;
  function legalstub$popcnt64($0, $1) {
-  var $2 = 0, $3 = 0, $4 = 0, $5 = 0;
+  var $2 = 0, $3 = 0, $4 = 0;
   $2 = $1;
   while (1) {
-   $1 = $3;
-   $5 = $4;
    if ($0 | $2) {
     $1 = $0;
     $0 = $0 - 1 & $0;
@@ -32,8 +30,8 @@ function asmFunc(env) {
    }
    break;
   };
-  i64toi32_i32$HIGH_BITS = $5;
-  $0 = $1;
+  i64toi32_i32$HIGH_BITS = $4;
+  $0 = $3;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
   return $0;
  }
diff --git a/test/wasm2js/i64-rotate.2asm.js.opt b/test/wasm2js/i64-rotate.2asm.js.opt
index 33c3d5350..9aeec1118 100644
--- a/test/wasm2js/i64-rotate.2asm.js.opt
+++ b/test/wasm2js/i64-rotate.2asm.js.opt
@@ -24,8 +24,7 @@ function asmFunc(env) {
   if ($6 >>> 0 >= 32) {
    $3 = -1 >>> $3 | 0
   } else {
-   $6 = -1 >>> $3 | 0;
-   $0 = $6;
+   $0 = -1 >>> $3 | 0;
    $3 = $0 | (1 << $3) - 1 << 32 - $3;
   }
   $6 = $3 & $8;
@@ -40,9 +39,8 @@ function asmFunc(env) {
   }
   $3 = $0;
   $2 = 0 - $2 & 63;
-  $7 = $2;
-  $0 = $7 & 31;
-  if ($7 >>> 0 >= 32) {
+  $0 = $2 & 31;
+  if ($2 >>> 0 >= 32) {
    $0 = -1 << $0;
    $7 = 0;
   } else {
@@ -66,7 +64,7 @@ function asmFunc(env) {
  
  function legalstub$2($0, $1, $2, $3, $4, $5) {
   var $6 = 0, $7 = 0, $8 = 0, $9 = 0;
-  $9 = $0;
+  $8 = $0;
   $7 = $2 & 63;
   $3 = $7;
   $0 = $3 & 31;
@@ -77,7 +75,7 @@ function asmFunc(env) {
    $3 = -1 << $0;
    $0 = $3 | (1 << $0) - 1 & -1 >>> 32 - $0;
   }
-  $8 = $3 & $9;
+  $9 = $3 & $8;
   $6 = $0 & $1;
   $3 = $7 & 31;
   if ($7 >>> 0 >= 32) {
@@ -85,21 +83,19 @@ function asmFunc(env) {
    $7 = $6 >>> $3 | 0;
   } else {
    $0 = $6 >>> $3 | 0;
-   $7 = ((1 << $3) - 1 & $6) << 32 - $3 | $8 >>> $3;
+   $7 = ((1 << $3) - 1 & $6) << 32 - $3 | $9 >>> $3;
   }
   $3 = $0;
   $6 = 0 - $2 & 63;
-  $0 = $6;
-  $2 = $0 & 31;
-  if ($0 >>> 0 >= 32) {
+  $2 = $6 & 31;
+  if ($6 >>> 0 >= 32) {
    $0 = 0;
    $2 = -1 >>> $2 | 0;
   } else {
-   $8 = -1 >>> $2 | 0;
-   $0 = $8;
+   $0 = -1 >>> $2 | 0;
    $2 = $0 | (1 << $2) - 1 << 32 - $2;
   }
-  $2 = $2 & $9;
+  $2 = $2 & $8;
   $1 = $0 & $1;
   $0 = $6 & 31;
   if ($6 >>> 0 >= 32) {
diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt
index 86eee0e0a..7bb08bde4 100644
--- a/test/wasm2js/unary-ops.2asm.js.opt
+++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -16,9 +16,8 @@ function asmFunc(env) {
  var i64toi32_i32$HIGH_BITS = 0;
  function $1($0) {
   $0 = $0 | 0;
-  var $1_1 = 0, $2 = 0;
+  var $1_1 = 0;
   while (1) {
-   $2 = $1_1;
    if ($0) {
     $0 = $0 - 1 & $0;
     $1_1 = $1_1 + 1 | 0;
@@ -26,7 +25,7 @@ function asmFunc(env) {
    }
    break;
   };
-  return $2 | 0;
+  return $1_1 | 0;
  }
  
  function $6($0) {
@@ -45,24 +44,21 @@ function asmFunc(env) {
  }
  
  function legalstub$2($0, $1_1, $2, $3) {
-  var $4 = 0, $5 = 0, $6_1 = 0, $7_1 = 0;
-  $5 = $0;
-  $4 = $1_1;
+  var $4 = 0, $5 = 0, $6_1 = 0;
+  $4 = $0;
   while (1) {
-   $1_1 = $6_1;
-   $0 = $7_1;
-   if ($5 | $4) {
-    $0 = $5;
-    $5 = $0 - 1 & $0;
-    $4 = $4 - !$0 & $4;
-    $6_1 = $6_1 + 1 | 0;
-    $7_1 = $6_1 ? $7_1 : $7_1 + 1 | 0;
+   if ($1_1 | $4) {
+    $0 = $4;
+    $4 = $4 - 1 & $4;
+    $1_1 = $1_1 - !$0 & $1_1;
+    $5 = $5 + 1 | 0;
+    $6_1 = $5 ? $6_1 : $6_1 + 1 | 0;
     continue;
    }
    break;
   };
-  i64toi32_i32$HIGH_BITS = $0;
-  return ($1_1 | 0) == ($2 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
+  i64toi32_i32$HIGH_BITS = $6_1;
+  return ($2 | 0) == ($5 | 0) & ($3 | 0) == (i64toi32_i32$HIGH_BITS | 0);
  }
  
  function legalstub$3($0, $1_1, $2) {