Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 12 deletions

diff --git a/js/src/jit-test/tests/wasm/spec/memory64/directives.txt b/js/src/jit-test/tests/wasm/spec/memory64/directives.txt
index bbc47fb788..740ef217b9 100644
--- a/js/src/jit-test/tests/wasm/spec/memory64/directives.txt
+++ b/js/src/jit-test/tests/wasm/spec/memory64/directives.txt
@@ -1 +1 @@
-|jit-test| test-also=--wasm-compiler=optimizing; test-also=--wasm-compiler=baseline; test-also=--wasm-test-serialization; test-also=--test-wasm-await-tier2; test-also=--disable-wasm-huge-memory; skip-variant-if: --disable-wasm-huge-memory, !wasmHugeMemorySupported(); local-include:harness/harness.js; skip-if: !wasmMemory64Enabled()
\ No newline at end of file
+|jit-test| test-also=--wasm-compiler=optimizing; test-also=--wasm-compiler=baseline; test-also=--setpref=wasm_test_serialization=true; test-also=--test-wasm-await-tier2; test-also=--disable-wasm-huge-memory; skip-variant-if: --disable-wasm-huge-memory, !wasmHugeMemorySupported(); local-include:harness/harness.js; --setpref=wasm_memory64=true; skip-if: !wasmMemory64Enabled()
\ No newline at end of file
diff --git a/js/src/jit-test/tests/wasm/spec/memory64/memory64.wast.js b/js/src/jit-test/tests/wasm/spec/memory64/memory64.wast.js
index 341742ab86..0af2f021bb 100644
--- a/js/src/jit-test/tests/wasm/spec/memory64/memory64.wast.js
+++ b/js/src/jit-test/tests/wasm/spec/memory64/memory64.wast.js
@@ -27,17 +27,19 @@ let $2 = instantiate(`(module (memory i64 1 256))`);
 // ./test/core/memory64.wast:6
 let $3 = instantiate(`(module (memory i64 0 65536))`);
 
-// ./test/core/memory64.wast:8
-assert_invalid(
-  () => instantiate(`(module (memory i64 0) (memory i64 0))`),
-  `multiple memories`,
-);
-
-// ./test/core/memory64.wast:9
-assert_invalid(
-  () => instantiate(`(module (memory (import "spectest" "memory") i64 0) (memory i64 0))`),
-  `multiple memories`,
-);
+if (!wasmMultiMemoryEnabled()) {
+  // ./test/core/memory64.wast:8
+  assert_invalid(
+    () => instantiate(`(module (memory i64 0) (memory i64 0))`),
+    `multiple memories`,
+  );
+
+  // ./test/core/memory64.wast:9
+  assert_invalid(
+    () => instantiate(`(module (memory (import "spectest" "memory") i64 0) (memory i64 0))`),
+    `multiple memories`,
+  );
+}
 
 // ./test/core/memory64.wast:11
 let $4 = instantiate(`(module (memory i64 (data)) (func (export "memsize") (result i64) (memory.size)))`);