3 files changed, 122 insertions, 10 deletions
diff --git a/test/passes/O3_low-memory-unused_metrics.txt b/test/passes/O3_low-memory-unused_metrics.txt
index c1218c4fd..22d72d241 100644
--- a/test/passes/O3_low-memory-unused_metrics.txt
+++ b/test/passes/O3_low-memory-unused_metrics.txt
@@ -6,14 +6,14 @@ total
  [imports]      : 10      
  [memory-data]  : 0       
  [table-data]   : 0       
- [total]        : 1965    
+ [total]        : 1964    
  [vars]         : 9       
- binary         : 241     
+ binary         : 240     
  block          : 68      
  break          : 90      
  call           : 22      
  call_indirect  : 1       
- const          : 176     
+ const          : 175     
  drop           : 8       
  if             : 27      
  load           : 313     
@@ -23,7 +23,7 @@ total
  return         : 3       
  select         : 11      
  store          : 160     
- unary          : 28      
+ unary          : 29      
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
@@ -2387,7 +2387,7 @@ total
         )
        )
        (br_if $label$57
-        (i32.ne
+        (i32.eqz
          (i32.or
           (i32.eqz
            (local.get $1)
@@ -2397,7 +2397,6 @@ total
            (i32.const 666)
           )
          )
-         (i32.const 1)
         )
        )
        (br_if $label$56
diff --git a/test/passes/optimize-instructions_all-features.txt b/test/passes/optimize-instructions_all-features.txt
index 90556f016..8c21b8494 100644
--- a/test/passes/optimize-instructions_all-features.txt
+++ b/test/passes/optimize-instructions_all-features.txt
@@ -4,8 +4,8 @@
  (type $none_=>_i32 (func (result i32)))
  (type $none_=>_none (func))
  (type $i32_i64_=>_none (func (param i32 i64)))
- (type $i32_=>_none (func (param i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_=>_none (func (param i32)))
  (type $none_=>_i64 (func (result i64)))
  (type $i64_=>_i64 (func (param i64) (result i64)))
  (type $i32_i64_f32_=>_none (func (param i32 i64 f32)))
@@ -3410,7 +3410,7 @@
    )
   )
  )
- (func $optimize-boolean (param $x i32)
+ (func $optimize-boolean (param $x i32) (param $y i64)
   (drop
    (select
     (i32.const 1)
@@ -3418,6 +3418,54 @@
     (local.get $x)
    )
   )
+  (drop
+   (i32.and
+    (local.get $x)
+    (i32.const 1)
+   )
+  )
+  (drop
+   (i32.eqz
+    (i32.and
+     (local.get $x)
+     (i32.const 1)
+    )
+   )
+  )
+  (drop
+   (i32.wrap_i64
+    (i64.and
+     (local.get $y)
+     (i64.const 1)
+    )
+   )
+  )
+  (drop
+   (i64.eqz
+    (i64.and
+     (local.get $y)
+     (i64.const 1)
+    )
+   )
+  )
+  (drop
+   (i32.and
+    (local.get $x)
+    (i32.const 1)
+   )
+  )
+  (drop
+   (i32.const 1)
+  )
+  (drop
+   (i64.and
+    (local.get $y)
+    (i64.const 1)
+   )
+  )
+  (drop
+   (i64.const 1)
+  )
  )
  (func $getFallthrough
   (local $x0 i32)
diff --git a/test/passes/optimize-instructions_all-features.wast b/test/passes/optimize-instructions_all-features.wast
index 7dc8cffbf..1b03782e9 100644
--- a/test/passes/optimize-instructions_all-features.wast
+++ b/test/passes/optimize-instructions_all-features.wast
@@ -3960,17 +3960,82 @@
       )
     )
   )
-  (func $optimize-boolean (param $x i32)
+  (func $optimize-boolean (param $x i32) (param $y i64)
+    ;; bool(-x) -> bool(x)
     (drop
       (select
         (i32.const 1)
         (i32.const 2)
-        (i32.sub        ;; bool(-x) -> bool(x)
+        (i32.sub
           (i32.const 0)
           (local.get $x)
         )
       )
     )
+    ;; i32(bool(expr)) == 1 -> bool(expr)
+    (drop (i32.eq
+      (i32.and
+        (local.get $x)
+        (i32.const 1)
+      )
+      (i32.const 1)
+    ))
+    ;; i32(bool(expr)) != 1 -> !bool(expr)
+    (drop (i32.ne
+      (i32.and
+        (local.get $x)
+        (i32.const 1)
+      )
+      (i32.const 1)
+    ))
+    ;; i64(bool(expr)) == 1 -> i64(bool(expr))
+    (drop (i64.eq
+      (i64.and
+        (local.get $y)
+        (i64.const 1)
+      )
+      (i64.const 1)
+    ))
+    ;; i64(bool(expr)) != 1 -> !i64(bool(expr))
+    (drop (i64.ne
+      (i64.and
+        (local.get $y)
+        (i64.const 1)
+      )
+      (i64.const 1)
+    ))
+    ;; i32(bool(expr)) & 1 -> bool(expr)
+    (drop (i32.and
+      (i32.and
+        (local.get $x)
+        (i32.const 1)
+      )
+      (i32.const 1)
+    ))
+    ;; i32(bool(expr)) | 1 -> 1
+    (drop (i32.or
+      (i32.and
+        (local.get $x)
+        (i32.const 1)
+      )
+      (i32.const 1)
+    ))
+    ;; i64(bool(expr)) & 1 -> i64(bool(expr))
+    (drop (i64.and
+      (i64.and
+        (local.get $y)
+        (i64.const 1)
+      )
+      (i64.const 1)
+    ))
+    ;; i64(bool(expr)) | 1 -> 1
+    (drop (i64.or
+      (i64.and
+        (local.get $y)
+        (i64.const 1)
+      )
+      (i64.const 1)
+    ))
   )
   (func $getFallthrough ;; unit tests for Properties::getFallthrough
     (local $x0 i32)