Backed out changeset b2fb7cd41c79 (bug 1528869) for failing at /waiterlist-order-of-operations-is-fifo.js on a CLOSED TREE.
authorGurzau Raul <rgurzau@mozilla.com>
Wed, 06 Mar 2019 09:44:58 +0200
changeset 520434 c24728a48d075bfb8f8047af6dd6d6ade9c7c58a
parent 520433 d31f88692394c2212c2eca1321930b5c71a8d67f
child 520435 acbeb5adfef5580412f74d1fe9cfbc689ee8d44e
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1528869
milestone67.0a1
backs outb2fb7cd41c796eabae8e4310aa34ea23ef858714
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset b2fb7cd41c79 (bug 1528869) for failing at /waiterlist-order-of-operations-is-fifo.js on a CLOSED TREE.
js/public/ContextOptions.h
js/src/shell/js.cpp
--- a/js/public/ContextOptions.h
+++ b/js/public/ContextOptions.h
@@ -14,19 +14,25 @@
 struct JSContext;
 
 namespace JS {
 
 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),
 #ifdef ENABLE_WASM_CRANELIFT
         wasmCranelift_(false),
 #endif
 #ifdef ENABLE_WASM_REFTYPES
         wasmGc_(false),
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -9834,24 +9834,35 @@ static MOZ_MUST_USE bool ProcessArgs(JSC
     }
   }
 
   return true;
 }
 
 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;
     } else if (strcmp(str, "baseline") == 0) {
       // Baseline is enabled by default.
       enableWasmIon = false;
     } else if (strcmp(str, "ion") == 0) {
       // Ion is enabled by default.