Commit 84328498 authored by Lars T Hansen's avatar Lars T Hansen
Browse files

Bug 1742383 - Enable memory64 in Nightly. r=yury 

Push it out of the nest.

Differential Revision: https://phabricator.services.mozilla.com/D131791
parent ee4775f3

js/public/WasmFeatures.h

+9 −9
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 
               /* flag predicate     */ WasmSimdFlag(cx),                     \

               /* shell flag         */ "relaxed-simd",                       \

               /* preference name    */ "relaxed_simd")                       \

  EXPERIMENTAL(/* capitalized name   */ Memory64,                             \

  DEFAULT(/* capitalized name   */ Memory64,                                  \

          /* lower case name    */ memory64,                                  \

          /* compile predicate  */ WASM_MEMORY64_ENABLED,                     \

          /* compiler predicate */ BaselineAvailable(cx) ||                   \

js/src/jit-test/etc/wasm/generate-spectests/config.toml

+1 −1
Original line number Diff line number Diff line
@@ -79,5 +79,5 @@ excluded_tests = [ 
name = "memory64"

url = "https://github.com/mozilla-spidermonkey/memory64"

branch = "test-cases"

directive = "; --wasm-memory64; skip-if: !wasmMemory64Enabled()"

directive = "; skip-if: !wasmMemory64Enabled()"

excluded_tests = []

js/src/jit-test/tests/wasm/bce-x64-ion-codegen.js

+1 −1
Original line number Diff line number Diff line 
// |jit-test| --wasm-memory64; --wasm-compiler=optimizing; --disable-wasm-huge-memory; --spectre-mitigations=off; skip-if: !hasDisassembler() || wasmCompileMode() != "ion" || !getBuildConfiguration().x64 || getBuildConfiguration().simulator || getJitCompilerOptions()["ion.check-range-analysis"]; include:codegen-x64-test.js

// |jit-test| --wasm-compiler=optimizing; --disable-wasm-huge-memory; --spectre-mitigations=off; skip-if: !hasDisassembler() || wasmCompileMode() != "ion" || !getBuildConfiguration().x64 || getBuildConfiguration().simulator || getJitCompilerOptions()["ion.check-range-analysis"]; include:codegen-x64-test.js



// Spectre mitigation is disabled above to make the generated code simpler to

// match; ion.check-range-analysis makes a hash of the code and makes testing

js/src/jit-test/tests/wasm/memory-cloning.js

+1 −1
Original line number Diff line number Diff line 
// |jit-test| --wasm-memory64; skip-if: !wasmThreadsEnabled()

// |jit-test| skip-if: !wasmThreadsEnabled()



// Basic structured cloning tests (specific to SpiderMonkey shell)

js/src/jit-test/tests/wasm/memory64/directives.txt

+1 −1
Original line number Diff line number Diff line 
|jit-test| --wasm-memory64; test-also=--wasm-compiler=optimizing; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js; skip-if: !wasmMemory64Enabled()
 
|jit-test| test-also=--wasm-compiler=optimizing; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js; skip-if: !wasmMemory64Enabled()