Backed out changeset b2fb7cd41c79 (bug 1528869) for failing at /waiterlist-order-of-operations-is-fifo.js on a CLOSED TREE.

This commit is contained in:
Gurzau Raul 2019-03-06 09:44:58 +02:00
parent d7094fba48
commit c0b13b1cae
2 changed files with 17 additions and 0 deletions

View File

@ -19,9 +19,15 @@ class JS_PUBLIC_API ContextOptions {
public:
ContextOptions()
: baseline_(true),
#ifdef JS_CODEGEN_ARM64
ion_(false),
asmJS_(false),
wasm_(false),
#else
ion_(true),
asmJS_(true),
wasm_(true),
#endif
wasmVerbose_(false),
wasmBaseline_(true),
wasmIon_(true),

View File

@ -9839,14 +9839,25 @@ static MOZ_MUST_USE bool ProcessArgs(JSContext* cx, OptionParser* op) {
static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
enableBaseline = !op.getBoolOption("no-baseline");
#ifdef JS_CODEGEN_ARM64
// TODO: Enable Ion by default.
enableIon = false;
enableAsmJS = false;
#else
enableIon = !op.getBoolOption("no-ion");
enableAsmJS = !op.getBoolOption("no-asmjs");
#endif
enableNativeRegExp = !op.getBoolOption("no-native-regexp");
// Default values for wasm.
enableWasm = true;
enableWasmBaseline = true;
#ifdef JS_CODEGEN_ARM64
// TODO: Enable WasmIon by default.
enableWasmIon = false;
#else
enableWasmIon = true;
#endif
if (const char* str = op.getStringOption("wasm-compiler")) {
if (strcmp(str, "none") == 0) {
enableWasm = false;