1 files changed, 51 insertions, 86 deletions
diff --git a/test/wasm2js/call.2asm.js b/test/wasm2js/call.2asm.js
index 47fe18131..44f54ca14 100644
--- a/test/wasm2js/call.2asm.js
+++ b/test/wasm2js/call.2asm.js
@@ -25,73 +25,58 @@ function asmFunc(global, env, buffer) {
  var setTempRet0 = env.setTempRet0;
  var i64toi32_i32$HIGH_BITS = 0;
  function const_i32() {
-  return 306 | 0;
+  return 306;
  }
  
  function const_i64() {
   i64toi32_i32$HIGH_BITS = 0;
-  return 356 | 0;
+  return 356;
  }
  
  function const_f32() {
-  return Math_fround(Math_fround(3890.0));
+  return Math_fround(3890.0);
  }
  
  function const_f64() {
-  return +(3940.0);
+  return 3940.0;
  }
  
  function id_i32($0) {
-  $0 = $0 | 0;
-  return $0 | 0;
+  return $0;
  }
  
  function id_i64($0, $0$hi) {
-  $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return $0 | 0;
+  return $0;
  }
  
  function id_f32($0) {
-  $0 = Math_fround($0);
-  return Math_fround($0);
+  return $0;
  }
  
  function id_f64($0) {
-  $0 = +$0;
-  return +$0;
+  return $0;
  }
  
  function f32_i32($0, $1) {
-  $0 = Math_fround($0);
-  $1 = $1 | 0;
-  return $1 | 0;
+  return $1;
  }
  
  function i32_i64($0, $1, $1$hi) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $1$hi = $1$hi | 0;
   var i64toi32_i32$0 = 0;
   i64toi32_i32$0 = $1$hi;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return $1 | 0;
+  return $1;
  }
  
  function f64_f32($0, $1) {
-  $0 = +$0;
-  $1 = Math_fround($1);
-  return Math_fround($1);
+  return $1;
  }
  
  function i64_f64($0, $0$hi, $1) {
-  $0 = $0 | 0;
-  $0$hi = $0$hi | 0;
-  $1 = +$1;
-  return +$1;
+  return $1;
  }
  
  function $12() {
@@ -100,60 +85,60 @@ function asmFunc(global, env, buffer) {
  
  function $13() {
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
-  i64toi32_i32$0 = const_i64() | 0;
+  i64toi32_i32$0 = const_i64();
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $14() {
-  return Math_fround(Math_fround(const_f32()));
+  return Math_fround(const_f32());
  }
  
  function $15() {
-  return +(+const_f64());
+  return +const_f64();
  }
  
  function $16() {
-  return id_i32(32 | 0) | 0;
+  return id_i32(32) | 0;
  }
  
  function $17() {
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = id_i64(64 | 0, i64toi32_i32$0 | 0) | 0;
+  i64toi32_i32$0 = id_i64(64, i64toi32_i32$0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $18() {
-  return Math_fround(Math_fround(id_f32(Math_fround(Math_fround(1.3200000524520874)))));
+  return Math_fround(id_f32(Math_fround(1.3200000524520874)));
  }
  
  function $19() {
-  return +(+id_f64(+(1.64)));
+  return +id_f64(1.64);
  }
  
  function $20() {
-  return f32_i32(Math_fround(Math_fround(32.099998474121094)), 32 | 0) | 0;
+  return f32_i32(Math_fround(32.099998474121094), 32) | 0;
  }
  
  function $21() {
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = 0;
-  i64toi32_i32$0 = i32_i64(32 | 0, 64 | 0, i64toi32_i32$0 | 0) | 0;
+  i64toi32_i32$0 = i32_i64(32, 64, i64toi32_i32$0);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$0 | 0;
  }
  
  function $22() {
-  return Math_fround(Math_fround(f64_f32(+(64.0), Math_fround(Math_fround(32.0)))));
+  return Math_fround(f64_f32(64.0, Math_fround(32.0)));
  }
  
  function $23() {
-  return +(+i64_f64(64 | 0, 0 | 0, +(64.1)));
+  return +i64_f64(64, 0, 64.1);
  }
  
  function fac($0, $0$hi) {
@@ -174,13 +159,13 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = 1;
     i64toi32_i32$5 = (i64toi32_i32$2 >>> 0 < i64toi32_i32$3 >>> 0) + 0 | 0;
     i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
-    i64toi32_i32$5 = fac(i64toi32_i32$2 - i64toi32_i32$3 | 0, i64toi32_i32$5 | 0) | 0;
+    i64toi32_i32$5 = fac(i64toi32_i32$2 - i64toi32_i32$3 | 0, i64toi32_i32$5);
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
     $6 = i64toi32_i32$5;
     $6$hi = i64toi32_i32$2;
     i64toi32_i32$2 = i64toi32_i32$0;
     i64toi32_i32$5 = $6$hi;
-    i64toi32_i32$5 = __wasm_i64_mul($0 | 0, i64toi32_i32$0 | 0, $6 | 0, i64toi32_i32$5 | 0) | 0;
+    i64toi32_i32$5 = __wasm_i64_mul($0, i64toi32_i32$0, $6, i64toi32_i32$5);
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
     $8 = i64toi32_i32$5;
     $8$hi = i64toi32_i32$2;
@@ -218,13 +203,13 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$5 = $1$hi;
     i64toi32_i32$5 = i64toi32_i32$0;
     i64toi32_i32$2 = $1$hi;
-    i64toi32_i32$2 = __wasm_i64_mul($0 | 0, i64toi32_i32$5 | 0, $1 | 0, i64toi32_i32$2 | 0) | 0;
+    i64toi32_i32$2 = __wasm_i64_mul($0, i64toi32_i32$5, $1, i64toi32_i32$2);
     i64toi32_i32$5 = i64toi32_i32$HIGH_BITS;
     $9 = i64toi32_i32$2;
     $9$hi = i64toi32_i32$5;
     i64toi32_i32$5 = $6$hi;
     i64toi32_i32$2 = $9$hi;
-    i64toi32_i32$2 = fac_acc($6 | 0, i64toi32_i32$5 | 0, $9 | 0, i64toi32_i32$2 | 0) | 0;
+    i64toi32_i32$2 = fac_acc($6, i64toi32_i32$5, $9, i64toi32_i32$2);
     i64toi32_i32$5 = i64toi32_i32$HIGH_BITS;
     $11 = i64toi32_i32$2;
     $11$hi = i64toi32_i32$5;
@@ -260,7 +245,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$6 = i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0;
     i64toi32_i32$5 = i64toi32_i32$6 + i64toi32_i32$0 | 0;
     i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-    i64toi32_i32$5 = fib(i64toi32_i32$4 | 0, i64toi32_i32$5 | 0) | 0;
+    i64toi32_i32$5 = fib(i64toi32_i32$4, i64toi32_i32$5);
     i64toi32_i32$3 = i64toi32_i32$HIGH_BITS;
     $5 = i64toi32_i32$5;
     $5$hi = i64toi32_i32$3;
@@ -273,7 +258,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$6 = i64toi32_i32$2 >>> 0 < i64toi32_i32$1 >>> 0;
     i64toi32_i32$4 = i64toi32_i32$6 + i64toi32_i32$5 | 0;
     i64toi32_i32$4 = i64toi32_i32$3 - i64toi32_i32$4 | 0;
-    i64toi32_i32$4 = fib(i64toi32_i32$0 | 0, i64toi32_i32$4 | 0) | 0;
+    i64toi32_i32$4 = fib(i64toi32_i32$0, i64toi32_i32$4);
     i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
     $8 = i64toi32_i32$4;
     $8$hi = i64toi32_i32$2;
@@ -309,7 +294,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = 1;
     i64toi32_i32$5 = ($0 >>> 0 < i64toi32_i32$3 >>> 0) + 0 | 0;
     i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
-    $6 = odd($0 - i64toi32_i32$3 | 0, i64toi32_i32$5 | 0) | 0;
+    $6 = odd($0 - i64toi32_i32$3 | 0, i64toi32_i32$5);
    }
   }
   return $6 | 0;
@@ -328,7 +313,7 @@ function asmFunc(global, env, buffer) {
     i64toi32_i32$3 = 1;
     i64toi32_i32$5 = ($0 >>> 0 < i64toi32_i32$3 >>> 0) + 0 | 0;
     i64toi32_i32$5 = i64toi32_i32$0 - i64toi32_i32$5 | 0;
-    $6 = even($0 - i64toi32_i32$3 | 0, i64toi32_i32$5 | 0) | 0;
+    $6 = even($0 - i64toi32_i32$3 | 0, i64toi32_i32$5);
    }
   }
   return $6 | 0;
@@ -348,7 +333,7 @@ function asmFunc(global, env, buffer) {
  
  function legalstub$13() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $13() | 0;
+  i64toi32_i32$0 = $13();
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $0 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
@@ -369,16 +354,16 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($7 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0;
  }
  
  function legalstub$14() {
-  return +(+Math_fround($14()));
+  return +$14();
  }
  
  function legalstub$17() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $17() | 0;
+  i64toi32_i32$0 = $17();
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $0 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
@@ -399,16 +384,16 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($7 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0;
  }
  
  function legalstub$18() {
-  return +(+Math_fround($18()));
+  return +$18();
  }
  
  function legalstub$21() {
   var i64toi32_i32$0 = 0, i64toi32_i32$4 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $7 = 0, $0 = 0, $0$hi = 0, i64toi32_i32$2 = 0;
-  i64toi32_i32$0 = $21() | 0;
+  i64toi32_i32$0 = $21();
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $0 = i64toi32_i32$0;
   $0$hi = i64toi32_i32$1;
@@ -429,16 +414,14 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($7 | 0);
   i64toi32_i32$0 = $0$hi;
-  return $0 | 0;
+  return $0;
  }
  
  function legalstub$22() {
-  return +(+Math_fround($22()));
+  return +$22();
  }
  
  function legalstub$fac($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
   $4 = $0;
@@ -465,7 +448,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  i64toi32_i32$2 = fac(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = fac(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $2 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
@@ -486,14 +469,10 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2;
  }
  
  function legalstub$fac_acc($0, $1, $2, $3) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $2 = $2 | 0;
-  $3 = $3 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, $21_1 = 0, $22_1 = 0, $23_1 = 0, $6 = 0, $6$hi = 0, $9$hi = 0, $10 = 0, $10$hi = 0, $12_1 = 0, $12$hi = 0, $15$hi = 0, $16_1 = 0, $16$hi = 0, $4 = 0, $4$hi = 0;
   i64toi32_i32$0 = 0;
   $6 = $0;
@@ -551,7 +530,7 @@ function asmFunc(global, env, buffer) {
   $16$hi = i64toi32_i32$1;
   i64toi32_i32$1 = $10$hi;
   i64toi32_i32$2 = $16$hi;
-  i64toi32_i32$2 = fac_acc($10 | 0, i64toi32_i32$1 | 0, $16_1 | 0, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = fac_acc($10, i64toi32_i32$1, $16_1, i64toi32_i32$2);
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   $4 = i64toi32_i32$2;
   $4$hi = i64toi32_i32$1;
@@ -572,12 +551,10 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($23_1 | 0);
   i64toi32_i32$2 = $4$hi;
-  return $4 | 0;
+  return $4;
  }
  
  function legalstub$fib($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$3 = 0, $12_1 = 0, $13_1 = 0, $4 = 0, $4$hi = 0, $7$hi = 0, $2 = 0, $2$hi = 0;
   i64toi32_i32$0 = 0;
   $4 = $0;
@@ -604,7 +581,7 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $7$hi;
   i64toi32_i32$3 = $12_1;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  i64toi32_i32$2 = fib(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2 | 0) | 0;
+  i64toi32_i32$2 = fib(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $2 = i64toi32_i32$2;
   $2$hi = i64toi32_i32$0;
@@ -625,12 +602,10 @@ function asmFunc(global, env, buffer) {
   }
   setTempRet0($13_1 | 0);
   i64toi32_i32$2 = $2$hi;
-  return $2 | 0;
+  return $2;
  }
  
  function legalstub$even($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10 = 0, $3 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
   $3 = $0;
@@ -657,12 +632,10 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return even(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2 | 0) | 0;
+  return even(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function legalstub$odd($0, $1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
   var i64toi32_i32$2 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$3 = 0, $10 = 0, $3 = 0, $3$hi = 0, $6$hi = 0;
   i64toi32_i32$0 = 0;
   $3 = $0;
@@ -689,14 +662,10 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$2 = $6$hi;
   i64toi32_i32$3 = $10;
   i64toi32_i32$2 = i64toi32_i32$1 | i64toi32_i32$2;
-  return odd(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2 | 0) | 0;
+  return odd(i64toi32_i32$0 | i64toi32_i32$3, i64toi32_i32$2);
  }
  
  function _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0, var$0$hi, var$1, var$1$hi) {
-  var$0 = var$0 | 0;
-  var$0$hi = var$0$hi | 0;
-  var$1 = var$1 | 0;
-  var$1$hi = var$1$hi | 0;
   var i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, var$2 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21_1 = 0, $22_1 = 0, var$6 = 0, $24 = 0, $17_1 = 0, $18_1 = 0, $23_1 = 0, $29 = 0, $45 = 0, $56$hi = 0, $62$hi = 0;
   i64toi32_i32$0 = var$1$hi;
   var$2 = var$1;
@@ -771,23 +740,19 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$2 | i64toi32_i32$3;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
-  return i64toi32_i32$2 | 0;
+  return i64toi32_i32$2;
  }
  
  function __wasm_i64_mul(var$0, var$0$hi, var$1, var$1$hi) {
-  var$0 = var$0 | 0;
-  var$0$hi = var$0$hi | 0;
-  var$1 = var$1 | 0;
-  var$1$hi = var$1$hi | 0;
   var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = var$0$hi;
   i64toi32_i32$0 = var$1$hi;
   i64toi32_i32$0 = var$0$hi;
   i64toi32_i32$1 = var$1$hi;
-  i64toi32_i32$1 = _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0 | 0, i64toi32_i32$0 | 0, var$1 | 0, i64toi32_i32$1 | 0) | 0;
+  i64toi32_i32$1 = _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0, i64toi32_i32$0, var$1, i64toi32_i32$1);
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return i64toi32_i32$1 | 0;
+  return i64toi32_i32$1;
  }
  
  var FUNCTION_TABLE = [];