MemoryPacking: memory.init fixes for 64 bit (#5809)

Fixes emscripten-core/emscripten#17485

This allows emscripten to complie code with MEMORY64 + PTHREADS by
fixing using the proper pointer type in the MemoryPacking pass.

2 files changed, 53 insertions, 12 deletions

diff --git a/src/passes/MemoryPacking.cpp b/src/passes/MemoryPacking.cpp
index 5f72a916d..e0ce6294b 100644
--- a/src/passes/MemoryPacking.cpp
+++ b/src/passes/MemoryPacking.cpp
@@ -710,6 +710,7 @@ void MemoryPacking::createReplacements(Module* module,
 
     size_t bytesWritten = 0;
 
+    auto is64 = module->getMemory(init->memory)->is64();
     for (size_t i = firstRangeIdx; i < ranges.size() && ranges[i].start < end;
          ++i) {
       auto& range = ranges[i];
@@ -721,12 +722,12 @@ void MemoryPacking::createReplacements(Module* module,
         dest =
           builder.makeConstPtr(c->value.getInteger() + bytesWritten, ptrType);
       } else {
-        auto* get = builder.makeLocalGet(-1, Type::i32);
+        auto* get = builder.makeLocalGet(-1, ptrType);
         getVars.push_back(&get->index);
         dest = get;
         if (bytesWritten > 0) {
-          Const* addend = builder.makeConst(int32_t(bytesWritten));
-          dest = builder.makeBinary(AddInt32, dest, addend);
+          Const* addend = builder.makeConstPtr(bytesWritten, ptrType);
+          dest = builder.makeBinary(is64 ? AddInt64 : AddInt32, dest, addend);
         }
       }
 
@@ -751,16 +752,18 @@ void MemoryPacking::createReplacements(Module* module,
 
     // Non-zero length memory.inits must have intersected some range
     assert(result);
-    replacements[init] = [module, setVar, getVars, result](Function* function) {
-      if (setVar != nullptr) {
-        Index destVar = Builder(*module).addVar(function, Type::i32);
-        *setVar = destVar;
-        for (auto* getVar : getVars) {
-          *getVar = destVar;
+    replacements[init] =
+      [module, init, setVar, getVars, result](Function* function) {
+        if (setVar != nullptr) {
+          auto indexType = module->getMemory(init->memory)->indexType;
+          Index destVar = Builder(*module).addVar(function, indexType);
+          *setVar = destVar;
+          for (auto* getVar : getVars) {
+            *getVar = destVar;
+          }
         }
-      }
-      return result;
-    };
+        return result;
+      };
   }
 
   // Create replacements for data.drop instructions now that we know whether we
diff --git a/test/lit/passes/memory-packing_zero-filled-memory64.wast b/test/lit/passes/memory-packing_zero-filled-memory64.wast
new file mode 100644
index 000000000..60c4ea3f7
--- /dev/null
+++ b/test/lit/passes/memory-packing_zero-filled-memory64.wast
@@ -0,0 +1,38 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
+
+;; RUN: foreach %s %t wasm-opt --memory-packing -all --zero-filled-memory -S -o - | filecheck %s
+
+(module
+ (type (;0;) (func (param i64)))
+ ;; CHECK:      (type $i64_=>_none (func (param i64)))
+
+ ;; CHECK:      (import "env" "memory" (memory $0 i64 1 1))
+ (import "env" "memory" (memory $0 i64 1 1))
+ (data (i64.const 1024) "x")
+ (data (i64.const 1023) "\00")
+ (data $.tdata "\00\00\00\00\00\00\00\00")
+ ;; CHECK:      (global $__mem_segment_drop_state (mut i32) (i32.const 0))
+
+ ;; CHECK:      (data $0 (i64.const 1024) "x")
+
+ ;; CHECK:      (func $__wasm_init_tls (type $i64_=>_none) (param $0 i64)
+ ;; CHECK-NEXT:  (local $1 i64)
+ ;; CHECK-NEXT:  (local.set $1
+ ;; CHECK-NEXT:   (local.get $0)
+ ;; CHECK-NEXT:  )
+ ;; CHECK-NEXT:  (if
+ ;; CHECK-NEXT:   (global.get $__mem_segment_drop_state)
+ ;; CHECK-NEXT:   (unreachable)
+ ;; CHECK-NEXT:  )
+ ;; CHECK-NEXT:  (memory.fill
+ ;; CHECK-NEXT:   (local.get $1)
+ ;; CHECK-NEXT:   (i32.const 0)
+ ;; CHECK-NEXT:   (i64.const 8)
+ ;; CHECK-NEXT:  )
+ ;; CHECK-NEXT: )
+ (func $__wasm_init_tls (type 0) (param i64)
+     (memory.init $.tdata
+       (local.get 0)
+       (i32.const 0)
+       (i32.const 8)))
+)