Bug 1528869 - Enable IonMonkey in the ARM64 shell, but keep it disabled in the browser. r=nbp
☠☠ backed out by 3bcf03d1ce90 ☠ ☠
authorSean Stangl <sean.stangl@gmail.com>
Tue, 19 Feb 2019 13:31:33 +0000
changeset 459916 240f53dcb5e6ed5a770b854be6c242c1bae4d75c
parent 459915 e4b9ec1beb2cb2368a1e481b5ae106e731327e74
child 459917 67fac975c2f81c99e40b137f9c41bba8c1cb4d85
push id78468
push usersstangl@mozilla.com
push dateTue, 19 Feb 2019 16:17:59 +0000
treeherderautoland@240f53dcb5e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1528869
milestone67.0a1
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
Bug 1528869 - Enable IonMonkey in the ARM64 shell, but keep it disabled in the browser. r=nbp Enable IonMonkey in the ARM64 shell, but keep it disabled in the browser. Differential Revision: https://phabricator.services.mozilla.com/D20243
js/public/ContextOptions.h
js/src/shell/js.cpp
--- a/js/public/ContextOptions.h
+++ b/js/public/ContextOptions.h
@@ -14,25 +14,19 @@
 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
@@ -9836,35 +9836,24 @@ 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.