4 files changed, 37 insertions, 8 deletions
diff --git a/test/passes/optimize-instructions_all-features.txt b/test/passes/optimize-instructions_all-features.txt
index e865fd9f8..2aaba9071 100644
--- a/test/passes/optimize-instructions_all-features.txt
+++ b/test/passes/optimize-instructions_all-features.txt
@@ -3734,13 +3734,10 @@
    (local.get $dst)
    (local.get $sz)
   )
-  (block
-   (drop
-    (local.get $dst)
-   )
-   (drop
-    (local.get $src)
-   )
+  (memory.copy
+   (local.get $dst)
+   (local.get $src)
+   (i32.const 0)
   )
   (i32.store8
    (local.get $dst)
diff --git a/test/passes/optimize-instructions_all-features.wast b/test/passes/optimize-instructions_all-features.wast
index 9a560fc91..e336ac2f9 100644
--- a/test/passes/optimize-instructions_all-features.wast
+++ b/test/passes/optimize-instructions_all-features.wast
@@ -4240,7 +4240,7 @@
       (local.get $sz)
     )
 
-    (memory.copy  ;; nop
+    (memory.copy  ;; skip
       (local.get $dst)
       (local.get $src)
       (i32.const 0)
diff --git a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt b/test/passes/optimize-instructions_optimize-level=2_all-features_ignore-implicit-traps.txt
index c5e21b86b..ee14c6e61 100644
--- a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt
+++ b/test/passes/optimize-instructions_optimize-level=2_all-features_ignore-implicit-traps.txt
@@ -1,5 +1,6 @@
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (type $none_=>_f64 (func (result f64)))
  (memory $0 0)
  (func $conditionals (param $0 i32) (param $1 i32) (result i32)
@@ -359,4 +360,22 @@
   )
   (f64.const -nan:0xfffffffffffff)
  )
+ (func $optimize-bulk-memory-copy (param $dst i32) (param $src i32) (param $sz i32)
+  (block
+   (drop
+    (local.get $dst)
+   )
+   (drop
+    (local.get $dst)
+   )
+  )
+  (block
+   (drop
+    (local.get $dst)
+   )
+   (drop
+    (local.get $src)
+   )
+  )
+ )
 )
diff --git a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.wast b/test/passes/optimize-instructions_optimize-level=2_all-features_ignore-implicit-traps.wast
index 802ca1875..b97597582 100644
--- a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.wast
+++ b/test/passes/optimize-instructions_optimize-level=2_all-features_ignore-implicit-traps.wast
@@ -361,5 +361,18 @@
   )
   (f64.const -nan:0xfffffffffffff)
  )
+ (func $optimize-bulk-memory-copy (param $dst i32) (param $src i32) (param $sz i32)
+  (memory.copy  ;; nop
+    (local.get $dst)
+    (local.get $dst)
+    (local.get $sz)
+  )
+
+  (memory.copy  ;; nop
+    (local.get $dst)
+    (local.get $src)
+    (i32.const 0)
+  )
+ )
 )