Bug 1528869 - Enable IonMonkey in the ARM64 shell, but keep it disabl…

…ed 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

--HG--
extra : moz-landing-system : lando

js/public/ContextOptions.h

@@ -19,15 +19,9 @@ 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),

js/src/shell/js.cpp

@@ -9839,25 +9839,14 @@ 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;