Auto merge of #23163 - jdm:smup66, r=asajeffrey

Upgrade to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163)
<!-- Reviewable:end -->

1 files changed, 6 insertions, 7 deletions

diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 727915592e5..621a95c6ef9 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -20,8 +20,8 @@ use js::glue::{RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT, RUST_JSID_IS_ST
 use js::jsapi::HandleId as RawHandleId;
 use js::jsapi::HandleObject as RawHandleObject;
 use js::jsapi::MutableHandleObject as RawMutableHandleObject;
-use js::jsapi::{CallArgs, DOMCallbacks, GetGlobalForObjectCrossCompartment};
-use js::jsapi::{Heap, JSAutoCompartment, JSContext};
+use js::jsapi::{CallArgs, DOMCallbacks, GetNonCCWObjectGlobal};
+use js::jsapi::{Heap, JSAutoRealm, JSContext};
 use js::jsapi::{JSJitInfo, JSObject, JSTracer, JSWrapObjectCallbacks};
 use js::jsapi::{JS_EnumerateStandardClasses, JS_GetLatin1StringCharsAndLength};
 use js::jsapi::{JS_IsExceptionPending, JS_IsGlobalObject};
@@ -408,7 +408,7 @@ unsafe extern "C" fn pre_wrap(
     _object_passed_to_wrap: RawHandleObject,
     rval: RawMutableHandleObject,
 ) {
-    let _ac = JSAutoCompartment::new(cx, obj.get());
+    let _ac = JSAutoRealm::new(cx, obj.get());
     let obj = ToWindowProxyIfWindow(obj.get());
     assert!(!obj.is_null());
     rval.set(obj)
@@ -455,12 +455,11 @@ unsafe fn generic_call(
         return false;
     }
 
-    let obj = if thisobj.get().is_object() {
+    rooted!(in(cx) let obj = if thisobj.get().is_object() {
         thisobj.get().to_object()
     } else {
-        GetGlobalForObjectCrossCompartment(JS_CALLEE(cx, vp).to_object_or_null())
-    };
-    rooted!(in(cx) let obj = obj);
+        GetNonCCWObjectGlobal(JS_CALLEE(cx, vp).to_object_or_null())
+    });
     let depth = (*info).depth;
     let proto_check =
         |class: &'static DOMClass| class.interface_chain[depth as usize] as u16 == proto_id;