Validation: Fix mixed memory64 table copy

swiftwasm · Oct 6, 2024 · d452f05 · d452f05
1 parent c554be0
commit d452f05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/Sources/WasmKit/Translator.swift b/Sources/WasmKit/Translator.swift
@@ -1983,7 +1983,7 @@ struct InstructionTranslator<Context: TranslatorContext>: InstructionVisitor {
         // https://github.com/WebAssembly/memory64/blob/main/proposals/memory64/Overview.md
         let destIsMemory64 = try module.isMemory64(tableIndex: dstTable)
         let sourceIsMemory64 = try module.isMemory64(tableIndex: srcTable)
-        let lengthIsMemory64 = destIsMemory64 || sourceIsMemory64
+        let lengthIsMemory64 = destIsMemory64 && sourceIsMemory64
         try pop3Emit(
             (
                 .address(isMemory64: lengthIsMemory64),

diff --git a/Tests/WasmKitTests/SpectestTests.swift b/Tests/WasmKitTests/SpectestTests.swift
@@ -22,16 +22,6 @@ final class SpectestTests: XCTestCase {
             path: Self.testPaths,
             include: [],
             exclude: [
-                "memory_grow.wast",
-                "memory_size.wast",
-                "proposals/memory64/align64.wast",
-                "proposals/memory64/call_indirect.wast",
-                "proposals/memory64/load64.wast",
-                "proposals/memory64/memory64.wast",
-                "proposals/memory64/table_copy_mixed.wast",
-                "proposals/memory64/table_get.wast",
-                "proposals/memory64/table_grow.wast",
-                "proposals/memory64/table_size.wast",
                 "ref_func.wast",
                 "select.wast",
                 "start.wast",