1 files changed, 23 insertions, 32 deletions

diff --git a/test/wasm2js/get-set-local.2asm.js b/test/wasm2js/get-set-local.2asm.js
index 06ccfb3b3..c15a9b646 100644
--- a/test/wasm2js/get-set-local.2asm.js
+++ b/test/wasm2js/get-set-local.2asm.js
@@ -21,51 +21,42 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- function $1($0, r, r$hi) {
+ function $1($0, $1_1, $2) {
   $0 = $0 | 0;
-  r = r | 0;
-  r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, $9$hi = 0;
-  i64toi32_i32$0 = r$hi;
-  i64toi32_i32$0 = 0;
-  $9$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = r$hi;
-  i64toi32_i32$0 = $9$hi;
-  return ($0 | 0) == (r | 0) & (i64toi32_i32$0 | 0) == (r$hi | 0) | 0 | 0;
+  $1_1 = $1_1 | 0;
+  $2 = $2 | 0;
+  var $3 = 0;
+  $3 = 0;
+  return ($0 | 0) == ($1_1 | 0) & ($3 | 0) == ($2 | 0) | 0 | 0;
  }
  
  function legalstub$1($0, $1_1, $2) {
   $0 = $0 | 0;
   $1_1 = $1_1 | 0;
   $2 = $2 | 0;
-  var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $12 = 0, $3 = 0, $5 = 0, $5$hi = 0, $8$hi = 0;
-  $3 = $0;
-  i64toi32_i32$0 = 0;
-  $5 = $1_1;
-  $5$hi = i64toi32_i32$0;
-  i64toi32_i32$0 = 0;
-  i64toi32_i32$2 = $2;
-  i64toi32_i32$1 = 0;
-  i64toi32_i32$3 = 32;
-  i64toi32_i32$4 = i64toi32_i32$3 & 31 | 0;
-  if (32 >>> 0 <= (i64toi32_i32$3 & 63 | 0) >>> 0) {
+  var $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0;
+  $7 = $0;
+  $3 = 0;
+  $0 = $3;
+  $3 = 0;
+  $4 = 32;
+  $5 = $4 & 31 | 0;
+  if (32 >>> 0 <= ($4 & 63 | 0) >>> 0) {
    {
-    i64toi32_i32$1 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
-    $12 = 0;
+    $6 = $2 << $5 | 0;
+    $4 = 0;
    }
   } else {
    {
-    i64toi32_i32$1 = ((1 << i64toi32_i32$4 | 0) - 1 | 0) & (i64toi32_i32$2 >>> (32 - i64toi32_i32$4 | 0) | 0) | 0 | (i64toi32_i32$0 << i64toi32_i32$4 | 0) | 0;
-    $12 = i64toi32_i32$2 << i64toi32_i32$4 | 0;
+    $6 = ((1 << $5 | 0) - 1 | 0) & ($2 >>> (32 - $5 | 0) | 0) | 0 | ($3 << $5 | 0) | 0;
+    $4 = $2 << $5 | 0;
    }
   }
-  $8$hi = i64toi32_i32$1;
-  i64toi32_i32$1 = $5$hi;
-  i64toi32_i32$0 = $5;
-  i64toi32_i32$2 = $8$hi;
-  i64toi32_i32$3 = $12;
-  i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2 | 0;
-  return $1($3 | 0, i64toi32_i32$0 | i64toi32_i32$3 | 0 | 0, i64toi32_i32$2 | 0) | 0 | 0;
+  $2 = $6;
+  $6 = $0;
+  $3 = $1_1;
+  $2 = $6 | $2 | 0;
+  return $1($7 | 0, $3 | $4 | 0 | 0, $2 | 0) | 0 | 0;
  }
  
  var FUNCTION_TABLE = [];