wasm2js: precompute bitwise operations (#2101)

This happens on e.g. an i32 load of a constant offset, then we have constant >> 2.

15 files changed, 183 insertions, 183 deletions

diff --git a/test/wasm2js/br_table_temp.2asm.js.opt b/test/wasm2js/br_table_temp.2asm.js.opt
index b6325ab2e..d857963fb 100644
--- a/test/wasm2js/br_table_temp.2asm.js.opt
+++ b/test/wasm2js/br_table_temp.2asm.js.opt
@@ -25,11 +25,11 @@ function asmFunc(global, env, buffer) {
  }
  
  function $5() {
-  return 1 | 0;
+  return 1;
  }
  
  function $6() {
-  return 2 | 0;
+  return 2;
  }
  
  function $7() {
@@ -42,20 +42,20 @@ function asmFunc(global, env, buffer) {
  
  function $9($0) {
   $0 = $0 | 0;
-  return 22 | 0;
+  return 22;
  }
  
  function $10($0) {
   $0 = $0 | 0;
-  return 33 | 0;
+  return 33;
  }
  
  function $11($0) {
   $0 = $0 | 0;
   if ($0) {
-   return 20 | 0
+   return 20
   }
-  return 22 | 0;
+  return 22;
  }
  
  function $12($0) {
@@ -88,15 +88,15 @@ function asmFunc(global, env, buffer) {
         break block;
        };
       }
-      return 100 | 0;
+      return 100;
      }
-     return 101 | 0;
+     return 101;
     }
-    return 102 | 0;
+    return 102;
    }
-   return 103 | 0;
+   return 103;
   }
-  return 104 | 0;
+  return 104;
  }
  
  function $14($0) {
@@ -119,15 +119,15 @@ function asmFunc(global, env, buffer) {
         break block;
        };
       }
-      return 210 | 0;
+      return 210;
      }
-     return 211 | 0;
+     return 211;
     }
-    return 212 | 0;
+    return 212;
    }
-   return 213 | 0;
+   return 213;
   }
-  return 214 | 0;
+  return 214;
  }
  
  function $15($0) {
@@ -12448,41 +12448,41 @@ function asmFunc(global, env, buffer) {
      break block;
     };
    }
-   return 0 | 0;
+   return 0;
   }
-  return 1 | 0;
+  return 1;
  }
  
  function $20() {
-  return 3 | 0;
+  return 3;
  }
  
  function $21() {
-  return 4 | 0;
+  return 4;
  }
  
  function $22() {
-  return 5 | 0;
+  return 5;
  }
  
  function $23() {
-  return 9 | 0;
+  return 9;
  }
  
  function $25() {
-  return 8 | 0;
+  return 8;
  }
  
  function $28() {
-  return 10 | 0;
+  return 10;
  }
  
  function $29() {
-  return 11 | 0;
+  return 11;
  }
  
  function $30() {
-  return 7 | 0;
+  return 7;
  }
  
  function $32($0, $1) {
@@ -12506,85 +12506,85 @@ function asmFunc(global, env, buffer) {
  function $34($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
-  return 5 | 0;
+  return 5;
  }
  
  function $35($0, $1) {
   $0 = $0 | 0;
   $1 = $1 | 0;
-  return 6 | 0;
+  return 6;
  }
  
  function $38() {
-  return 12 | 0;
+  return 12;
  }
  
  function $39() {
-  return 13 | 0;
+  return 13;
  }
  
  function $40() {
-  return 14 | 0;
+  return 14;
  }
  
  function $41() {
-  return 20 | 0;
+  return 20;
  }
  
  function $42() {
-  return 21 | 0;
+  return 21;
  }
  
  function $43() {
-  return 22 | 0;
+  return 22;
  }
  
  function $44() {
-  return 23 | 0;
+  return 23;
  }
  
  function $45() {
-  return 17 | 0;
+  return 17;
  }
  
  function $47() {
-  return 30 | 0;
+  return 30;
  }
  
  function $49() {
-  return 31 | 0;
+  return 31;
  }
  
  function $50() {
-  return 32 | 0;
+  return 32;
  }
  
  function $51() {
-  return 33 | 0;
+  return 33;
  }
  
  function $54() {
-  return 45 | 0;
+  return 45;
  }
  
  function $55() {
-  return 44 | 0;
+  return 44;
  }
  
  function $56() {
-  return 43 | 0;
+  return 43;
  }
  
  function $57() {
-  return 42 | 0;
+  return 42;
  }
  
  function $58() {
-  return 41 | 0;
+  return 41;
  }
  
  function $59() {
-  return 40 | 0;
+  return 40;
  }
  
  function $60($0) {
diff --git a/test/wasm2js/conversions-modified.2asm.js.opt b/test/wasm2js/conversions-modified.2asm.js.opt
index fc6b306a7..f3e381382 100644
--- a/test/wasm2js/conversions-modified.2asm.js.opt
+++ b/test/wasm2js/conversions-modified.2asm.js.opt
@@ -172,16 +172,16 @@ function asmFunc(global, env, buffer) {
  }
  
  function legalstub$22($0, $1) {
-  wasm2js_scratch_store_i32(0 | 0, $0 | 0);
-  wasm2js_scratch_store_i32(1 | 0, $1 | 0);
+  wasm2js_scratch_store_i32(0, $0 | 0);
+  wasm2js_scratch_store_i32(1, $1 | 0);
   return +wasm2js_scratch_load_f64();
  }
  
  function legalstub$24($0) {
   var $1 = 0, $2 = 0;
   wasm2js_scratch_store_f64(+$0);
-  $1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $2 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $1 = wasm2js_scratch_load_i32(1) | 0;
+  $2 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $1;
   $1 = $2;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
diff --git a/test/wasm2js/emscripten.2asm.js.opt b/test/wasm2js/emscripten.2asm.js.opt
index bb4569b7f..0c0a295e1 100644
--- a/test/wasm2js/emscripten.2asm.js.opt
+++ b/test/wasm2js/emscripten.2asm.js.opt
@@ -26,9 +26,9 @@ function asmFunc(global, env, buffer) {
  var syscall$54 = env.__syscall54;
  // EMSCRIPTEN_START_FUNCS;
  function main() {
-  syscall$6(1 | 0, 2 | 0) | 0;
-  syscall$54(3 | 0, 4 | 0) | 0;
-  FUNCTION_TABLE[HEAP32[1030 >> 2]]();
+  syscall$6(1, 2) | 0;
+  syscall$54(3, 4) | 0;
+  FUNCTION_TABLE[HEAP32[257]]();
  }
  
  function other() {
@@ -40,11 +40,11 @@ function asmFunc(global, env, buffer) {
  }
  
  function bar() {
-  HEAP32[16 >> 2] = 3;
-  HEAPF32[16 >> 2] = 7;
-  HEAPF64[16 >> 3] = 11;
-  HEAP8[16 | 0] = 15;
-  HEAP16[16 >> 1] = 19;
+  HEAP32[4] = 3;
+  HEAPF32[4] = 7;
+  HEAPF64[2] = 11;
+  HEAP8[16] = 15;
+  HEAP16[8] = 19;
  }
  
  function __growWasmMemory($0) {
@@ -63,17 +63,17 @@ function asmFunc(global, env, buffer) {
  
  function select($0) {
   $0 = $0 | 0;
-  return ($0 ? $0 : HEAP32[16 >> 2]) | 0;
+  return ($0 ? $0 : HEAP32[4]) | 0;
  }
  
  function bools($0) {
   $0 = $0 | 0;
-  bools(HEAP8[0 | 0] & 1);
-  bools(HEAP8[0 | 0] & 1);
-  bools(HEAP16[0 >> 1] & 1);
-  bools(HEAP16[0 >> 1] & 1);
-  bools(HEAP32[0 >> 2] & 1);
-  bools(HEAPU8[0 | 0] & 2);
+  bools(HEAP8[0] & 1);
+  bools(HEAP8[0] & 1);
+  bools(HEAP16[0] & 1);
+  bools(HEAP16[0] & 1);
+  bools(HEAP32[0] & 1);
+  bools(HEAPU8[0] & 2);
   bools($0 ^ 1);
   if (!$0) {
    bools(2)
diff --git a/test/wasm2js/float_literals-modified.2asm.js.opt b/test/wasm2js/float_literals-modified.2asm.js.opt
index d32a9dc72..49b2aaca2 100644
--- a/test/wasm2js/float_literals-modified.2asm.js.opt
+++ b/test/wasm2js/float_literals-modified.2asm.js.opt
@@ -38,82 +38,82 @@ function asmFunc(global, env, buffer) {
  var setTempRet0 = env.setTempRet0;
  var i64toi32_i32$HIGH_BITS = 0;
  function $0() {
-  return 2143289344 | 0;
+  return 2143289344;
  }
  
  function $2() {
-  return -4194304 | 0;
+  return -4194304;
  }
  
  function $4() {
-  return 2141192192 | 0;
+  return 2141192192;
  }
  
  function $5() {
-  return -1 | 0;
+  return -1;
  }
  
  function $6() {
-  return 2139169605 | 0;
+  return 2139169605;
  }
  
  function $7() {
-  return 2142257232 | 0;
+  return 2142257232;
  }
  
  function $8() {
-  return -5587746 | 0;
+  return -5587746;
  }
  
  function $9() {
-  return 2139095040 | 0;
+  return 2139095040;
  }
  
  function $11() {
-  return -8388608 | 0;
+  return -8388608;
  }
  
  function $12() {
-  return 0 | 0;
+  return 0;
  }
  
  function $14() {
-  return -2147483648 | 0;
+  return -2147483648;
  }
  
  function $15() {
-  return 1086918619 | 0;
+  return 1086918619;
  }
  
  function $16() {
-  return 1 | 0;
+  return 1;
  }
  
  function $17() {
-  return 8388608 | 0;
+  return 8388608;
  }
  
  function $18() {
-  return 2139095039 | 0;
+  return 2139095039;
  }
  
  function $19() {
-  return 8388607 | 0;
+  return 8388607;
  }
  
  function $20() {
-  return 1149239296 | 0;
+  return 1149239296;
  }
  
  function $29() {
-  return 1343554297 | 0;
+  return 1343554297;
  }
  
  function legalstub$30() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -123,8 +123,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$32() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(-nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -134,8 +134,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$34() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -145,8 +145,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$35() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(-nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -156,8 +156,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$36() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -167,8 +167,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$37() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -178,8 +178,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$38() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(-nan);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -189,8 +189,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$39() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(infinity);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -200,8 +200,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$41() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(-infinity);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -211,8 +211,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$42() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(0.0);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -222,8 +222,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$44() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(-0.0);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -233,8 +233,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$45() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(6.283185307179586);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -244,8 +244,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$46() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(5.0e-324);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -255,8 +255,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$47() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(2.2250738585072014e-308);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -266,8 +266,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$48() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(2.225073858507201e-308);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -277,8 +277,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$49() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(1797693134862315708145274.0e284);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -288,8 +288,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$50() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(1267650600228229401496703.0e6);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
@@ -299,8 +299,8 @@ function asmFunc(global, env, buffer) {
  function legalstub$59() {
   var $0_1 = 0, $1 = 0;
   wasm2js_scratch_store_f64(1.e+100);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1 = wasm2js_scratch_load_i32(0 | 0) | 0;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1 = wasm2js_scratch_load_i32(0) | 0;
   i64toi32_i32$HIGH_BITS = $0_1;
   $0_1 = $1;
   setTempRet0(i64toi32_i32$HIGH_BITS | 0);
diff --git a/test/wasm2js/func-ptr-offset.2asm.js.opt b/test/wasm2js/func-ptr-offset.2asm.js.opt
index 4237ffb05..3feda1f68 100644
--- a/test/wasm2js/func-ptr-offset.2asm.js.opt
+++ b/test/wasm2js/func-ptr-offset.2asm.js.opt
@@ -21,15 +21,15 @@ function asmFunc(global, env, buffer) {
  var nan = global.NaN;
  var infinity = global.Infinity;
  function t1() {
-  return 1 | 0;
+  return 1;
  }
  
  function t2() {
-  return 2 | 0;
+  return 2;
  }
  
  function t3() {
-  return 3 | 0;
+  return 3;
  }
  
  function $3($0) {
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js.opt b/test/wasm2js/grow-memory-tricky.2asm.js.opt
index 0fa078fdb..28fe7c581 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js.opt
+++ b/test/wasm2js/grow-memory-tricky.2asm.js.opt
@@ -22,8 +22,8 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
-  return HEAP32[0 >> 2] | 0;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  return HEAP32[0] | 0;
  }
  
  var FUNCTION_TABLE = [];
diff --git a/test/wasm2js/i64-ctz.2asm.js.opt b/test/wasm2js/i64-ctz.2asm.js.opt
index 50930e442..026cf9d99 100644
--- a/test/wasm2js/i64-ctz.2asm.js.opt
+++ b/test/wasm2js/i64-ctz.2asm.js.opt
@@ -40,14 +40,14 @@ function asmFunc(global, env, buffer) {
   if ($0 | $1) {
    $3 = $1 + -1 | 0;
    $2 = $0 + -1 | 0;
-   if ($2 >>> 0 < -1 >>> 0) {
+   if ($2 >>> 0 < 4294967295) {
     $3 = $3 + 1 | 0
    }
    $2 = Math_clz32($0 ^ $2) + 32 | 0;
    $0 = Math_clz32($1 ^ $3);
-   $0 = ($0 | 0) == (32 | 0) ? $2 : $0;
+   $0 = ($0 | 0) == 32 ? $2 : $0;
    $1 = 63 - $0 | 0;
-   i64toi32_i32$HIGH_BITS = 0 - (63 >>> 0 < $0 >>> 0) | 0;
+   i64toi32_i32$HIGH_BITS = 0 - (63 < $0 >>> 0) | 0;
    return $1;
   }
   i64toi32_i32$HIGH_BITS = 0;
@@ -62,9 +62,9 @@ function asmFunc(global, env, buffer) {
    if ($0 | $1) {
     $2 = $0;
     $0 = $2 - 1 & $2;
-    $1 = $1 - ($2 >>> 0 < 1 >>> 0) & $1;
+    $1 = $1 - ($2 >>> 0 < 1) & $1;
     $2 = $3 + 1 | 0;
-    if ($2 >>> 0 < 1 >>> 0) {
+    if ($2 >>> 0 < 1) {
      $4 = $4 + 1 | 0
     }
     $3 = $2;
diff --git a/test/wasm2js/i64-rotate.2asm.js.opt b/test/wasm2js/i64-rotate.2asm.js.opt
index d2a2c81ad..f02ec7d18 100644
--- a/test/wasm2js/i64-rotate.2asm.js.opt
+++ b/test/wasm2js/i64-rotate.2asm.js.opt
@@ -34,7 +34,7 @@ function asmFunc(global, env, buffer) {
   $6 = $2 & 63;
   $5 = $6;
   $3 = $5 & 31;
-  if (32 >>> 0 <= $5 >>> 0) {
+  if (32 <= $5 >>> 0) {
    $3 = -1 >>> $3
   } else {
    $4 = -1 >>> $3;
@@ -43,7 +43,7 @@ function asmFunc(global, env, buffer) {
   $5 = $3 & $0;
   $3 = $1 & $4;
   $4 = $6 & 31;
-  if (32 >>> 0 <= $6 >>> 0) {
+  if (32 <= $6 >>> 0) {
    $3 = $5 << $4;
    $6 = 0;
   } else {
@@ -54,7 +54,7 @@ function asmFunc(global, env, buffer) {
   $4 = 0 - $2 & 63;
   $3 = $4;
   $2 = $3 & 31;
-  if (32 >>> 0 <= $3 >>> 0) {
+  if (32 <= $3 >>> 0) {
    $3 = -1 << $2;
    $2 = 0;
   } else {
@@ -64,7 +64,7 @@ function asmFunc(global, env, buffer) {
   $0 = $2 & $0;
   $3 = $1 & $3;
   $1 = $4 & 31;
-  if (32 >>> 0 <= $4 >>> 0) {
+  if (32 <= $4 >>> 0) {
    $2 = 0;
    $0 = $3 >>> $1;
   } else {
@@ -80,7 +80,7 @@ function asmFunc(global, env, buffer) {
   var $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0;
   $6 = $2 & 63;
   $3 = $6 & 31;
-  if (32 >>> 0 <= $6 >>> 0) {
+  if (32 <= $6 >>> 0) {
    $4 = -1 << $3;
    $7 = 0;
   } else {
@@ -90,7 +90,7 @@ function asmFunc(global, env, buffer) {
   $7 = $7 & $0;
   $3 = $1 & $4;
   $5 = $6 & 31;
-  if (32 >>> 0 <= $6 >>> 0) {
+  if (32 <= $6 >>> 0) {
    $4 = 0;
    $6 = $3 >>> $5;
   } else {
@@ -100,7 +100,7 @@ function asmFunc(global, env, buffer) {
   $7 = $4;
   $3 = 0 - $2 & 63;
   $5 = $3 & 31;
-  if (32 >>> 0 <= $3 >>> 0) {
+  if (32 <= $3 >>> 0) {
    $4 = 0;
    $2 = -1 >>> $5;
   } else {
@@ -110,7 +110,7 @@ function asmFunc(global, env, buffer) {
   $0 = $2 & $0;
   $1 = $1 & $4;
   $4 = $3 & 31;
-  if (32 >>> 0 <= $3 >>> 0) {
+  if (32 <= $3 >>> 0) {
    $2 = $0 << $4;
    $0 = 0;
   } else {
diff --git a/test/wasm2js/i64-shifts.2asm.js.opt b/test/wasm2js/i64-shifts.2asm.js.opt
index 0cb2501e7..f9844a810 100644
--- a/test/wasm2js/i64-shifts.2asm.js.opt
+++ b/test/wasm2js/i64-shifts.2asm.js.opt
@@ -28,7 +28,7 @@ function asmFunc(global, env, buffer) {
   $4 = $4 | 0;
   var $5 = 0;
   $5 = $2_1 & 31;
-  if (32 >>> 0 <= ($2_1 & 63) >>> 0) {
+  if (32 <= ($2_1 & 63) >>> 0) {
    $1_1 = $0 << $5;
    $0 = 0;
   } else {
@@ -46,7 +46,7 @@ function asmFunc(global, env, buffer) {
   $4 = $4 | 0;
   var $5 = 0;
   $5 = $2_1 & 31;
-  if (32 >>> 0 <= ($2_1 & 63) >>> 0) {
+  if (32 <= ($2_1 & 63) >>> 0) {
    $2_1 = $1_1 >> 31;
    $0 = $1_1 >> $5;
   } else {
diff --git a/test/wasm2js/nested-selects.2asm.js.opt b/test/wasm2js/nested-selects.2asm.js.opt
index 885f79b3e..c69ab2cc9 100644
--- a/test/wasm2js/nested-selects.2asm.js.opt
+++ b/test/wasm2js/nested-selects.2asm.js.opt
@@ -22,7 +22,7 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $1($0) {
   $0 = $0 | 0;
-  return (($0 | 0) < (0 | 0) ? -1 : ($0 | 0) > (0 | 0) ? 1 : 0) | 0;
+  return (($0 | 0) < 0 ? -1 : ($0 | 0) > 0 ? 1 : 0) | 0;
  }
  
  var FUNCTION_TABLE = [];
diff --git a/test/wasm2js/ordering.2asm.js.opt b/test/wasm2js/ordering.2asm.js.opt
index 95384fdeb..1f13699e5 100644
--- a/test/wasm2js/ordering.2asm.js.opt
+++ b/test/wasm2js/ordering.2asm.js.opt
@@ -30,17 +30,17 @@ function asmFunc(global, env, buffer) {
  
  function foo($0) {
   $0 = $0 | 0;
-  return 1 | 0;
+  return 1;
  }
  
  function bar($0) {
   $0 = $0 | 0;
-  return 2 | 0;
+  return 2;
  }
  
  function baz($0) {
   $0 = $0 | 0;
-  return 3 | 0;
+  return 3;
  }
  
  FUNCTION_TABLE[1] = foo;
diff --git a/test/wasm2js/reinterpret.2asm.js.opt b/test/wasm2js/reinterpret.2asm.js.opt
index 58c2057b6..8ca17b0e7 100644
--- a/test/wasm2js/reinterpret.2asm.js.opt
+++ b/test/wasm2js/reinterpret.2asm.js.opt
@@ -59,11 +59,11 @@ function asmFunc(global, env, buffer) {
   $0 = $0 | 0;
   $1_1 = $1_1 | 0;
   var $2_1 = 0;
-  wasm2js_scratch_store_i32(0 | 0, $0 | 0);
-  wasm2js_scratch_store_i32(1 | 0, $1_1 | 0);
+  wasm2js_scratch_store_i32(0, $0 | 0);
+  wasm2js_scratch_store_i32(1, $1_1 | 0);
   wasm2js_scratch_store_f64(+wasm2js_scratch_load_f64());
-  $2_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  return (wasm2js_scratch_load_i32(0 | 0) | 0) == ($0 | 0) & ($1_1 | 0) == ($2_1 | 0);
+  $2_1 = wasm2js_scratch_load_i32(1) | 0;
+  return (wasm2js_scratch_load_i32(0) | 0) == ($0 | 0) & ($1_1 | 0) == ($2_1 | 0);
  }
  
  function legalstub$2($0, $1_1) {
diff --git a/test/wasm2js/stack-modified.2asm.js.opt b/test/wasm2js/stack-modified.2asm.js.opt
index c5190792d..7df3cec4a 100644
--- a/test/wasm2js/stack-modified.2asm.js.opt
+++ b/test/wasm2js/stack-modified.2asm.js.opt
@@ -35,7 +35,7 @@ function asmFunc(global, env, buffer) {
     $4 = i64toi32_i32$HIGH_BITS;
     $1 = $0_1;
     $0_1 = $0_1 - 1 | 0;
-    $2 = $2 - ($1 >>> 0 < 1 >>> 0) | 0;
+    $2 = $2 - ($1 >>> 0 < 1) | 0;
     continue;
    }
    break;
diff --git a/test/wasm2js/unaligned.2asm.js.opt b/test/wasm2js/unaligned.2asm.js.opt
index c765fbc46..2c0c34c75 100644
--- a/test/wasm2js/unaligned.2asm.js.opt
+++ b/test/wasm2js/unaligned.2asm.js.opt
@@ -50,57 +50,57 @@ function asmFunc(global, env, buffer) {
  var setTempRet0 = env.setTempRet0;
  var i64toi32_i32$HIGH_BITS = 0;
  function $0() {
-  return HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24);
+  return HEAPU8[0] | HEAPU8[1] << 8 | (HEAPU8[2] << 16 | HEAPU8[3] << 24);
  }
  
  function $1() {
-  i64toi32_i32$HIGH_BITS = HEAPU8[4 | 0] | HEAPU8[5 | 0] << 8 | (HEAPU8[6 | 0] << 16 | HEAPU8[7 | 0] << 24);
-  return HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24);
+  i64toi32_i32$HIGH_BITS = HEAPU8[4] | HEAPU8[5] << 8 | (HEAPU8[6] << 16 | HEAPU8[7] << 24);
+  return HEAPU8[0] | HEAPU8[1] << 8 | (HEAPU8[2] << 16 | HEAPU8[3] << 24);
  }
  
  function $2() {
-  return Math_fround((wasm2js_scratch_store_i32(0, HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24)), wasm2js_scratch_load_f32()));
+  return Math_fround((wasm2js_scratch_store_i32(0, HEAPU8[0] | HEAPU8[1] << 8 | (HEAPU8[2] << 16 | HEAPU8[3] << 24)), wasm2js_scratch_load_f32()));
  }
  
  function $3() {
   var $0_1 = 0;
-  $0_1 = HEAPU8[4 | 0] | HEAPU8[5 | 0] << 8 | (HEAPU8[6 | 0] << 16 | HEAPU8[7 | 0] << 24);
-  wasm2js_scratch_store_i32(0 | 0, HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24));
-  wasm2js_scratch_store_i32(1 | 0, $0_1 | 0);
+  $0_1 = HEAPU8[4] | HEAPU8[5] << 8 | (HEAPU8[6] << 16 | HEAPU8[7] << 24);
+  wasm2js_scratch_store_i32(0, HEAPU8[0] | HEAPU8[1] << 8 | (HEAPU8[2] << 16 | HEAPU8[3] << 24));
+  wasm2js_scratch_store_i32(1, $0_1 | 0);
   return +wasm2js_scratch_load_f64();
  }
  
  function $4() {
-  HEAP8[0 | 0] = 0;
-  HEAP8[1 | 0] = 0;
-  HEAP8[2 | 0] = 0;
-  HEAP8[3 | 0] = 0;
+  HEAP8[0] = 0;
+  HEAP8[1] = 0;
+  HEAP8[2] = 0;
+  HEAP8[3] = 0;
  }
  
  function $5() {
-  HEAP8[0 | 0] = 0;
-  HEAP8[1 | 0] = 0;
-  HEAP8[2 | 0] = 0;
-  HEAP8[3 | 0] = 0;
-  HEAP8[4 | 0] = 0;
-  HEAP8[5 | 0] = 0;
-  HEAP8[6 | 0] = 0;
-  HEAP8[7 | 0] = 0;
+  HEAP8[0] = 0;
+  HEAP8[1] = 0;
+  HEAP8[2] = 0;
+  HEAP8[3] = 0;
+  HEAP8[4] = 0;
+  HEAP8[5] = 0;
+  HEAP8[6] = 0;
+  HEAP8[7] = 0;
  }
  
  function $7() {
   var $0_1 = 0, $1_1 = 0;
   wasm2js_scratch_store_f64(0.0);
-  $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
-  $1_1 = wasm2js_scratch_load_i32(0 | 0) | 0;
-  HEAP8[0 | 0] = $1_1;
-  HEAP8[1 | 0] = $1_1 >>> 8;
-  HEAP8[2 | 0] = $1_1 >>> 16;
-  HEAP8[3 | 0] = $1_1 >>> 24;
-  HEAP8[4 | 0] = $0_1;
-  HEAP8[5 | 0] = $0_1 >>> 8;
-  HEAP8[6 | 0] = $0_1 >>> 16;
-  HEAP8[7 | 0] = $0_1 >>> 24;
+  $0_1 = wasm2js_scratch_load_i32(1) | 0;
+  $1_1 = wasm2js_scratch_load_i32(0) | 0;
+  HEAP8[0] = $1_1;
+  HEAP8[1] = $1_1 >>> 8;
+  HEAP8[2] = $1_1 >>> 16;
+  HEAP8[3] = $1_1 >>> 24;
+  HEAP8[4] = $0_1;
+  HEAP8[5] = $0_1 >>> 8;
+  HEAP8[6] = $0_1 >>> 16;
+  HEAP8[7] = $0_1 >>> 24;
  }
  
  function legalstub$1() {
diff --git a/test/wasm2js/unary-ops.2asm.js.opt b/test/wasm2js/unary-ops.2asm.js.opt
index 836400f0e..7c07c8bb9 100644
--- a/test/wasm2js/unary-ops.2asm.js.opt
+++ b/test/wasm2js/unary-ops.2asm.js.opt
@@ -49,7 +49,7 @@ function asmFunc(global, env, buffer) {
   var $4 = 0;
   $4 = Math_clz32($0) + 32 | 0;
   $0 = Math_clz32($1_1);
-  return !$3 & ($2 | 0) == ((($0 | 0) == (32 | 0) ? $4 : $0) | 0);
+  return !$3 & ($2 | 0) == ((($0 | 0) == 32 ? $4 : $0) | 0);
  }
  
  function legalstub$2($0, $1_1, $2, $3) {
@@ -81,14 +81,14 @@ function asmFunc(global, env, buffer) {
   if ($0 | $1_1) {
    $3 = $1_1 + -1 | 0;
    $2 = $0 + -1 | 0;
-   if ($2 >>> 0 < -1 >>> 0) {
+   if ($2 >>> 0 < 4294967295) {
     $3 = $3 + 1 | 0
    }
    $2 = Math_clz32($0 ^ $2) + 32 | 0;
    $0 = Math_clz32($1_1 ^ $3);
-   $0 = ($0 | 0) == (32 | 0) ? $2 : $0;
+   $0 = ($0 | 0) == 32 ? $2 : $0;
    $1_1 = 63 - $0 | 0;
-   i64toi32_i32$HIGH_BITS = 0 - (63 >>> 0 < $0 >>> 0) | 0;
+   i64toi32_i32$HIGH_BITS = 0 - (63 < $0 >>> 0) | 0;
    return $1_1;
   }
   i64toi32_i32$HIGH_BITS = 0;
@@ -117,9 +117,9 @@ function asmFunc(global, env, buffer) {
    if ($0 | $1_1) {
     $2 = $0;
     $0 = $2 - 1 & $2;
-    $1_1 = $1_1 - ($2 >>> 0 < 1 >>> 0) & $1_1;
+    $1_1 = $1_1 - ($2 >>> 0 < 1) & $1_1;
     $2 = $3 + 1 | 0;
-    if ($2 >>> 0 < 1 >>> 0) {
+    if ($2 >>> 0 < 1) {
      $4 = $4 + 1 | 0
     }
     $3 = $2;