[memory64] Keep type of memory.size and memory.grow on copy (#4531)

When copying a MemorySize or MemoryGrow instruction (e.g. for inlining),
transfer the memory type also to the copy. Otherwise it will always be
i32, even if memory64 should be used.

This fixes issue #4530.

Author: backes

src/wasm-delegations-fields.def

@@ -461,11 +461,13 @@ switch (DELEGATE_ID) {
   }
   case Expression::Id::MemorySizeId: {
     DELEGATE_START(MemorySize);
+    DELEGATE_FIELD_TYPE(MemorySize, ptrType);
     DELEGATE_END(MemorySize);
     break;
   }
   case Expression::Id::MemoryGrowId: {
     DELEGATE_START(MemoryGrow);
+    DELEGATE_FIELD_TYPE(MemoryGrow, ptrType);
     DELEGATE_FIELD_CHILD(MemoryGrow, delta);
     DELEGATE_END(MemoryGrow);
     break;

test/lit/passes/inlining_memory64.wat

@@ -0,0 +1,44 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
+
+;; RUN: foreach %s %t wasm-opt --inlining --enable-memory64 -S -o - | filecheck %s
+
+(module
+  ;; CHECK:      (type $none_=>_i64 (func (result i64)))
+
+  ;; CHECK:      (memory $0 i64 256 256)
+  (memory $0 i64 256 256)
+
+  ;; CHECK:      (func $call-size (result i64)
+  ;; CHECK-NEXT:  (block $__inlined_func$size (result i64)
+  ;; CHECK-NEXT:   (memory.size)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $call-size (result i64)
+    (call $size)
+  )
+
+  (func $size (result i64)
+    ;; Upon inlining this code is copied, and as the memory is 64-bit the copied
+    ;; instruction must remain 64-bit (and not have the default 32-bit size). If
+    ;; we get that wrong then validation would fail here.
+    (memory.size)
+  )
+
+  ;; CHECK:      (func $call-grow (result i64)
+  ;; CHECK-NEXT:  (block $__inlined_func$grow (result i64)
+  ;; CHECK-NEXT:   (memory.grow
+  ;; CHECK-NEXT:    (i64.const 1)
+  ;; CHECK-NEXT:   )
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $call-grow (result i64)
+    ;; As above, but for grow instead of size.
+    (call $grow)
+  )
+
+  (func $grow (result i64)
+    (memory.grow
+      (i64.const 1)
+    )
+  )
+)