From 9e2ed30feb48a88dac6d33949cd03a0d00ec0aef Mon Sep 17 00:00:00 2001 From: Lars T Hansen Date: Fri, 14 Aug 2020 12:30:43 +0000 Subject: [PATCH] Bug 1657374 - flip flags for wasm simd. r=rhunt This should be enough to enable wasm simd on x86/x64 in all channels, but leave it preffed-off on non-nightly. Differential Revision: https://phabricator.services.mozilla.com/D86822 --- js/moz.configure | 6 +++--- modules/libpref/init/all.js | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/moz.configure b/js/moz.configure index b367a14a3112..a4024d613983 100644 --- a/js/moz.configure +++ b/js/moz.configure @@ -628,12 +628,12 @@ set_define('ENABLE_SHARED_MEMORY', enable_shared_memory) # Support for WebAssembly SIMD # ===================================================== -@depends('--enable-jit', '--enable-simulator', target, milestone) -def default_wasm_simd(jit_enabled, simulator, target, milestone): +@depends('--enable-jit', '--enable-simulator', target) +def default_wasm_simd(jit_enabled, simulator, target): if not jit_enabled or simulator: return - if milestone.is_nightly and target.cpu in ('x86_64', 'x86'): + if target.cpu in ('x86_64', 'x86'): return True js_option('--enable-wasm-simd', diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index fbd521604a2f..b28c41a052f0 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1106,7 +1106,11 @@ pref("javascript.options.wasm_baselinejit", true); pref("javascript.options.wasm_multi_value", true); #endif #ifdef ENABLE_WASM_SIMD - pref("javascript.options.wasm_simd", true); + #ifdef NIGHTLY_BUILD + pref("javascript.options.wasm_simd", true); + #else + pref("javascript.options.wasm_simd", false); + #endif #endif pref("javascript.options.native_regexp", true); pref("javascript.options.parallel_parsing", true);