Fix validation rules for memory.copy/fill/init

Also, update auto-generated test to cover 64-bit memories
WebAssembly · May 2, 2024 · e84d8f3 · e84d8f3
1 parent 5cc08ad
commit e84d8f3
Show file tree

Hide file tree

Showing 8 changed files with 8,136 additions and 903 deletions.
diff --git a/interpreter/valid/valid.ml b/interpreter/valid/valid.ml
@@ -397,17 +397,17 @@ let rec check_instr (c : context) (e : instr) (s : infer_result_type) : op_type
     [value_type_of_index_type it] --> [value_type_of_index_type it]
 
   | MemoryFill ->
-    ignore (memory c (0l @@ e.at));
-    [NumType I32Type; NumType I32Type; NumType I32Type] --> []
+    let MemoryType (_, it) = memory c (0l @@ e.at) in
+    [value_type_of_index_type it; NumType I32Type; value_type_of_index_type it] --> []
 
   | MemoryCopy ->
-    ignore (memory c (0l @@ e.at));
-    [NumType I32Type; NumType I32Type; NumType I32Type] --> []
+    let MemoryType (_, it) = memory c (0l @@ e.at) in
+    [value_type_of_index_type it; value_type_of_index_type it; value_type_of_index_type it] --> []
 
   | MemoryInit x ->
-    ignore (memory c (0l @@ e.at));
+    let MemoryType (_, it) = memory c (0l @@ e.at) in
     ignore (data c x);
-    [NumType I32Type; NumType I32Type; NumType I32Type] --> []
+    [value_type_of_index_type it; value_type_of_index_type it; value_type_of_index_type it] --> []
 
   | DataDrop x ->
     ignore (data c x);

diff --git a/test/core/memory_copy.wast b/test/core/memory_copy.wast