Bug 1528869 - Enable IonMonkey in the ARM64 shell, but keep it disabled in the browser. r=nbp
☠☠ backed out by c24728a48d07 ☠ ☠
authorSean Stangl <sean.stangl@gmail.com>
Wed, 06 Mar 2019 04:40:51 +0000
changeset 462542 b2fb7cd41c796eabae8e4310aa34ea23ef858714
parent 462541 295288a5868385e81cc0e96f2acc7ead3039ff7a
child 462543 c36dc28ad5d0fd3fb3819471f6b05a8fa6646688
push id79710
push usersstangl@mozilla.com
push dateWed, 06 Mar 2019 06:51:56 +0000
treeherderautoland@b2fb7cd41c79 [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
@@ -9834,35 +9834,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.