1 files changed, 44 insertions, 56 deletions

diff --git a/test/wasm2js/i64-shifts.2asm.js.opt b/test/wasm2js/i64-shifts.2asm.js.opt
index 7e36812fb..5510b754b 100644
--- a/test/wasm2js/i64-shifts.2asm.js.opt
+++ b/test/wasm2js/i64-shifts.2asm.js.opt
@@ -27,20 +27,20 @@ function asmFunc(global, env, buffer) {
   $2_1 = $2_1 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
-  var $5 = 0, $6 = 0;
+  var $5 = 0;
   $5 = $2_1 & 31;
   if (32 >>> 0 <= ($2_1 & 63) >>> 0) {
    {
     $1_1 = $0 << $5;
-    $6 = 0;
+    $0 = 0;
    }
   } else {
    {
     $1_1 = (1 << $5) - 1 & $0 >>> 32 - $5 | $1_1 << $5;
-    $6 = $0 << $5;
+    $0 = $0 << $5;
    }
   }
-  return ($6 | 0) == ($3 | 0) & ($1_1 | 0) == ($4 | 0);
+  return ($0 | 0) == ($3 | 0) & ($1_1 | 0) == ($4 | 0);
  }
  
  function $2($0, $1_1, $2_1, $3, $4) {
@@ -49,124 +49,112 @@ function asmFunc(global, env, buffer) {
   $2_1 = $2_1 | 0;
   $3 = $3 | 0;
   $4 = $4 | 0;
-  var $5 = 0, $6 = 0;
+  var $5 = 0;
   $5 = $2_1 & 31;
   if (32 >>> 0 <= ($2_1 & 63) >>> 0) {
    {
     $2_1 = $1_1 >> 31;
-    $6 = $1_1 >> $5;
+    $0 = $1_1 >> $5;
    }
   } else {
    {
     $2_1 = $1_1 >> $5;
-    $6 = ((1 << $5) - 1 & $1_1) << 32 - $5 | $0 >>> $5;
+    $0 = ((1 << $5) - 1 & $1_1) << 32 - $5 | $0 >>> $5;
    }
   }
-  return ($6 | 0) == ($3 | 0) & ($2_1 | 0) == ($4 | 0);
+  return ($0 | 0) == ($3 | 0) & ($2_1 | 0) == ($4 | 0);
  }
  
  function legalstub$1($0, $1_1, $2_1, $3, $4, $5) {
-  var $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0;
-  $11 = $0;
-  $7 = 32;
-  $0 = $7 & 31;
-  if (32 >>> 0 <= $7 >>> 0) {
+  var $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  $6 = $0;
+  $8 = 32;
+  $0 = $8 & 31;
+  if (32 >>> 0 <= $8 >>> 0) {
    {
-    $6 = $1_1 << $0;
-    $8 = 0;
+    $7 = $1_1 << $0;
+    $0 = 0;
    }
   } else {
    {
-    $6 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $6 << $0;
-    $8 = $1_1 << $0;
+    $7 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $7 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  $12 = $11 | $8;
-  $13 = $6 | $16;
-  $14 = $2_1;
+  $8 = $6 | $0;
+  $7 = $7 | $9;
+  $6 = $2_1;
   $2_1 = 0;
   $1_1 = $3;
   $3 = 32;
   $0 = $3 & 31;
   if (32 >>> 0 <= $3 >>> 0) {
-   {
-    $2_1 = $1_1 << $0;
-    $9 = 0;
-   }
+   $0 = 0
   } else {
-   {
-    $2_1 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2_1 << $0;
-    $9 = $1_1 << $0;
-   }
+   $0 = $1_1 << $0
   }
-  $15 = $14 | $9;
+  $6 = $6 | $0;
   $2_1 = 0;
   $1_1 = $5;
   $0 = 32 & 31;
   if (32 >>> 0 <= $3 >>> 0) {
    {
     $2_1 = $1_1 << $0;
-    $10 = 0;
+    $0 = 0;
    }
   } else {
    {
     $2_1 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2_1 << $0;
-    $10 = $1_1 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  return $1($12, $13, $15, $10 | $4, $2_1 | $17);
+  return $1($8, $7, $6, $0 | $4, $2_1 | $10);
  }
  
  function legalstub$2($0, $1_1, $2_1, $3, $4, $5) {
-  var $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0;
-  $11 = $0;
-  $7 = 32;
-  $0 = $7 & 31;
-  if (32 >>> 0 <= $7 >>> 0) {
+  var $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
+  $6 = $0;
+  $8 = 32;
+  $0 = $8 & 31;
+  if (32 >>> 0 <= $8 >>> 0) {
    {
-    $6 = $1_1 << $0;
-    $8 = 0;
+    $7 = $1_1 << $0;
+    $0 = 0;
    }
   } else {
    {
-    $6 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $6 << $0;
-    $8 = $1_1 << $0;
+    $7 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $7 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  $12 = $11 | $8;
-  $13 = $6 | $16;
-  $14 = $2_1;
+  $8 = $6 | $0;
+  $7 = $7 | $9;
+  $6 = $2_1;
   $2_1 = 0;
   $1_1 = $3;
   $3 = 32;
   $0 = $3 & 31;
   if (32 >>> 0 <= $3 >>> 0) {
-   {
-    $2_1 = $1_1 << $0;
-    $9 = 0;
-   }
+   $0 = 0
   } else {
-   {
-    $2_1 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2_1 << $0;
-    $9 = $1_1 << $0;
-   }
+   $0 = $1_1 << $0
   }
-  $15 = $14 | $9;
+  $6 = $6 | $0;
   $2_1 = 0;
   $1_1 = $5;
   $0 = 32 & 31;
   if (32 >>> 0 <= $3 >>> 0) {
    {
     $2_1 = $1_1 << $0;
-    $10 = 0;
+    $0 = 0;
    }
   } else {
    {
     $2_1 = (1 << $0) - 1 & $1_1 >>> 32 - $0 | $2_1 << $0;
-    $10 = $1_1 << $0;
+    $0 = $1_1 << $0;
    }
   }
-  return $2($12, $13, $15, $10 | $4, $2_1 | $17);
+  return $2($8, $7, $6, $0 | $4, $2_1 | $10);
  }
  
  var FUNCTION_TABLE = [];