Optimize select with const arms (#2869)

  x ? 1 : 0   =>   !!x

and so forth.

2 files changed, 21 insertions, 53 deletions

diff --git a/test/wasm2js/i64-lowering.2asm.js.opt b/test/wasm2js/i64-lowering.2asm.js.opt
index e5d955dfd..f4d940863 100644
--- a/test/wasm2js/i64-lowering.2asm.js.opt
+++ b/test/wasm2js/i64-lowering.2asm.js.opt
@@ -20,76 +20,44 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- function $3($0, $1, $2, $3_1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $2 = $2 | 0;
-  $3_1 = $3_1 | 0;
-  return (($1 | 0) > ($3_1 | 0) ? 1 : ($1 | 0) >= ($3_1 | 0) ? ($0 >>> 0 < $2 >>> 0 ? 0 : 1) : 0) | 0;
+ function legalstub$1($0, $1, $2, $3) {
+  return ($0 | 0) == ($2 | 0) & ($1 | 0) == ($3 | 0);
  }
  
- function $4($0, $1, $2, $3_1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $2 = $2 | 0;
-  $3_1 = $3_1 | 0;
-  return (($1 | 0) > ($3_1 | 0) ? 1 : ($1 | 0) >= ($3_1 | 0) ? ($0 >>> 0 <= $2 >>> 0 ? 0 : 1) : 0) | 0;
+ function legalstub$2($0, $1, $2, $3) {
+  return ($0 | 0) != ($2 | 0) | ($1 | 0) != ($3 | 0);
  }
  
- function $5($0, $1, $2, $3_1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $2 = $2 | 0;
-  $3_1 = $3_1 | 0;
-  return (($1 | 0) < ($3_1 | 0) ? 1 : ($1 | 0) <= ($3_1 | 0) ? ($0 >>> 0 > $2 >>> 0 ? 0 : 1) : 0) | 0;
+ function legalstub$3($0, $1, $2, $3) {
+  return ($1 | 0) > ($3 | 0) ? 1 : ($1 | 0) >= ($3 | 0) ? $0 >>> 0 >= $2 >>> 0 : 0;
  }
  
- function $6($0, $1, $2, $3_1) {
-  $0 = $0 | 0;
-  $1 = $1 | 0;
-  $2 = $2 | 0;
-  $3_1 = $3_1 | 0;
-  return (($1 | 0) < ($3_1 | 0) ? 1 : ($1 | 0) <= ($3_1 | 0) ? ($0 >>> 0 >= $2 >>> 0 ? 0 : 1) : 0) | 0;
+ function legalstub$4($0, $1, $2, $3) {
+  return ($1 | 0) > ($3 | 0) ? 1 : ($1 | 0) >= ($3 | 0) ? $0 >>> 0 > $2 >>> 0 : 0;
  }
  
- function legalstub$1($0, $1, $2, $3_1) {
-  return ($0 | 0) == ($2 | 0) & ($1 | 0) == ($3_1 | 0);
+ function legalstub$5($0, $1, $2, $3) {
+  return ($1 | 0) < ($3 | 0) ? 1 : ($1 | 0) <= ($3 | 0) ? $0 >>> 0 <= $2 >>> 0 : 0;
  }
  
- function legalstub$2($0, $1, $2, $3_1) {
-  return ($0 | 0) != ($2 | 0) | ($1 | 0) != ($3_1 | 0);
+ function legalstub$6($0, $1, $2, $3) {
+  return ($1 | 0) < ($3 | 0) ? 1 : ($1 | 0) <= ($3 | 0) ? $0 >>> 0 < $2 >>> 0 : 0;
  }
  
- function legalstub$3($0, $1, $2, $3_1) {
-  return $3($0, $1, $2, $3_1);
+ function legalstub$7($0, $1, $2, $3) {
+  return ($1 | 0) == ($3 | 0) & $0 >>> 0 >= $2 >>> 0 | $1 >>> 0 > $3 >>> 0;
  }
  
- function legalstub$4($0, $1, $2, $3_1) {
-  return $4($0, $1, $2, $3_1);
+ function legalstub$8($0, $1, $2, $3) {
+  return ($1 | 0) == ($3 | 0) & $0 >>> 0 > $2 >>> 0 | $1 >>> 0 > $3 >>> 0;
  }
  
- function legalstub$5($0, $1, $2, $3_1) {
-  return $5($0, $1, $2, $3_1);
+ function legalstub$9($0, $1, $2, $3) {
+  return ($1 | 0) == ($3 | 0) & $0 >>> 0 <= $2 >>> 0 | $1 >>> 0 < $3 >>> 0;
  }
  
- function legalstub$6($0, $1, $2, $3_1) {
-  return $6($0, $1, $2, $3_1);
- }
- 
- function legalstub$7($0, $1, $2, $3_1) {
-  return ($1 | 0) == ($3_1 | 0) & $0 >>> 0 >= $2 >>> 0 | $1 >>> 0 > $3_1 >>> 0;
- }
- 
- function legalstub$8($0, $1, $2, $3_1) {
-  return ($1 | 0) == ($3_1 | 0) & $0 >>> 0 > $2 >>> 0 | $1 >>> 0 > $3_1 >>> 0;
- }
- 
- function legalstub$9($0, $1, $2, $3_1) {
-  return ($1 | 0) == ($3_1 | 0) & $0 >>> 0 <= $2 >>> 0 | $1 >>> 0 < $3_1 >>> 0;
- }
- 
- function legalstub$10($0, $1, $2, $3_1) {
-  return ($1 | 0) == ($3_1 | 0) & $0 >>> 0 < $2 >>> 0 | $1 >>> 0 < $3_1 >>> 0;
+ function legalstub$10($0, $1, $2, $3) {
+  return ($1 | 0) == ($3 | 0) & $0 >>> 0 < $2 >>> 0 | $1 >>> 0 < $3 >>> 0;
  }
  
  var FUNCTION_TABLE = [];
diff --git a/test/wasm2js/nested-selects.2asm.js.opt b/test/wasm2js/nested-selects.2asm.js.opt
index 16d5529cd..9bb06d563 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 ? -1 : ($0 | 0) > 0 ? 1 : 0) | 0;
+  return (($0 | 0) < 0 ? -1 : ($0 | 0) > 0) | 0;
  }
  
  var FUNCTION_TABLE = [];