Merge mozilla-central to mozilla-inbound. on a CLOSED TREE

UltraBlame original commit: 1d4dcfddc3f8483e60105dd19f03481f28518664

Author: marco-c

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/builtin/TestingFunctions.cpp

@@ -1653,17 +1653,16 @@ static bool NewRope(JSContext* cx, unsigned argc, Value* vp) {
     }
   }
 
-  JSString* left = args[0].toString();
-  JSString* right = args[1].toString();
+  RootedString left(cx, args[0].toString());
+  RootedString right(cx, args[1].toString());
   size_t length = JS_GetStringLength(left) + JS_GetStringLength(right);
   if (length > JSString::MAX_LENGTH) {
     JS_ReportErrorASCII(cx, "rope length exceeds maximum string length");
     return false;
   }
 
-  Rooted<JSRope*> str(cx, JSRope::new_<NoGC>(cx, left, right, length, heap));
+  Rooted<JSRope*> str(cx, JSRope::new_<CanGC>(cx, left, right, length, heap));
   if (!str) {
-    JS_ReportOutOfMemory(cx);
     return false;
   }
 

js/src/shell/js.cpp

@@ -9840,25 +9840,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
-  
-  enableIon = false;
-  enableAsmJS = false;
-#else
   enableIon = !op.getBoolOption("no-ion");
   enableAsmJS = !op.getBoolOption("no-asmjs");
-#endif
   enableNativeRegExp = !op.getBoolOption("no-native-regexp");
 
 
   enableWasm = true;
   enableWasmBaseline = true;
-#ifdef JS_CODEGEN_ARM64
-  
-  enableWasmIon = false;
-#else
   enableWasmIon = true;
-#endif
   if (const char* str = op.getStringOption("wasm-compiler")) {
     if (strcmp(str, "none") == 0) {
       enableWasm = false;