Auto merge of #12255 - servo:smup, r=jdm

Update SpiderMonkey to m-c bcf4ff0c3eef.

This currently breaks Servo on Android, because there are a number of interdependent changes that cannot easily land serially in a way that keeps it working throughout. We expect to fix this in the near future.

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

1 files changed, 26 insertions, 58 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 8360dfc322a..2e0dc2415dd 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1872,56 +1872,31 @@ class CGDOMJSClass(CGThing):
         elif self.descriptor.weakReferenceable:
             args["slots"] = "2"
         return """\
+static CLASS_OPS: js::jsapi::ClassOps = js::jsapi::ClassOps {
+    addProperty: None,
+    delProperty: None,
+    getProperty: None,
+    setProperty: None,
+    enumerate: %(enumerateHook)s,
+    resolve: %(resolveHook)s,
+    mayResolve: None,
+    finalize: Some(%(finalizeHook)s),
+    call: None,
+    hasInstance: None,
+    construct: None,
+    trace: Some(%(traceHook)s),
+};
+
 static Class: DOMJSClass = DOMJSClass {
     base: js::jsapi::Class {
         name: %(name)s as *const u8 as *const libc::c_char,
         flags: JSCLASS_IS_DOMJSCLASS | %(flags)s |
                (((%(slots)s) & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT)
                /* JSCLASS_HAS_RESERVED_SLOTS(%(slots)s) */,
-        addProperty: None,
-        delProperty: None,
-        getProperty: None,
-        setProperty: None,
-        enumerate: %(enumerateHook)s,
-        resolve: %(resolveHook)s,
-        mayResolve: None,
-        finalize: Some(%(finalizeHook)s),
-        call: None,
-        hasInstance: None,
-        construct: None,
-        trace: Some(%(traceHook)s),
-
-        spec: js::jsapi::ClassSpec {
-            createConstructor_: None,
-            createPrototype_: None,
-            constructorFunctions_: 0 as *const js::jsapi::JSFunctionSpec,
-            constructorProperties_: 0 as *const js::jsapi::JSPropertySpec,
-            prototypeFunctions_: 0 as *const js::jsapi::JSFunctionSpec,
-            prototypeProperties_: 0 as *const js::jsapi::JSPropertySpec,
-            finishInit_: None,
-            flags: 0,
-        },
-
-        ext: js::jsapi::ClassExtension {
-            isWrappedNative: false,
-            weakmapKeyDelegateOp: None,
-            objectMovedOp: None,
-        },
-
-        ops: js::jsapi::ObjectOps {
-            lookupProperty: None,
-            defineProperty: None,
-            hasProperty: None,
-            getProperty: None,
-            setProperty: None,
-            getOwnPropertyDescriptor: None,
-            deleteProperty: None,
-            watch: None,
-            unwatch: None,
-            getElements: None,
-            enumerate: None,
-            funToString: None,
-        },
+        cOps: &CLASS_OPS,
+        spec: ptr::null(),
+        ext: ptr::null(),
+        oOps: ptr::null(),
     },
     dom_class: %(domClass)s
 };""" % args
@@ -1947,19 +1922,8 @@ static PrototypeClass: JSClass = JSClass {
     flags:
         // JSCLASS_HAS_RESERVED_SLOTS(%(slotCount)s)
         (%(slotCount)s & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT,
-    addProperty: None,
-    delProperty: None,
-    getProperty: None,
-    setProperty: None,
-    enumerate: None,
-    resolve: None,
-    mayResolve: None,
-    finalize: None,
-    call: None,
-    hasInstance: None,
-    construct: None,
-    trace: None,
-    reserved: [0 as *mut os::raw::c_void; 23]
+    cOps: 0 as *const _,
+    reserved: [0 as *mut os::raw::c_void; 3]
 };
 """ % {'name': name, 'slotCount': slotCount}
 
@@ -1983,9 +1947,12 @@ class CGInterfaceObjectJSClass(CGThing):
             "depth": self.descriptor.prototypeDepth
         }
         return """\
+static INTERFACE_OBJECT_OPS: js::jsapi::ClassOps =
+    NonCallbackInterfaceObjectClass::ops(%(constructorBehavior)s);
+
 static InterfaceObjectClass: NonCallbackInterfaceObjectClass =
     NonCallbackInterfaceObjectClass::new(
-        %(constructorBehavior)s,
+        &INTERFACE_OBJECT_OPS,
         %(representation)s,
         PrototypeList::ID::%(id)s,
         %(depth)s);
@@ -2772,6 +2739,7 @@ let traps = ProxyTraps {
     ownPropertyKeys: Some(own_property_keys),
     delete_: Some(%(delete)s),
     enumerate: None,
+    getPrototypeIfOrdinary: Some(proxyhandler::get_prototype_if_ordinary),
     preventExtensions: Some(proxyhandler::prevent_extensions),
     isExtensible: Some(proxyhandler::is_extensible),
     has: None,