From c82b6ce8431e1379b7bd4689c2aadadbdc65c8b7 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@gmail.com>
Date: Tue, 27 Oct 2015 14:14:11 -0400
Subject: [PATCH] move reserved slot setting for DOM globals

Moving this slot setting prior to initializing standard classes and
other initialization tasks means that we can effectively use JS_GC_ZEAL.

Fixes #6057.
---
 components/script/dom/bindings/codegen/CodegenRust.py | 6 ++----
 components/script/dom/bindings/utils.rs               | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index fab487215d72..36921feafe76 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2163,12 +2163,10 @@ def CreateBindingJSObject(descriptor, parent=None):
                    "    create_dom_global(\n"
                    "        cx,\n"
                    "        &Class.base as *const js::jsapi::Class as *const JSClass,\n"
+                   "        raw as *const libc::c_void,\n"
                    "        Some(%s))\n"
                    ");\n"
-                   "assert!(!obj.ptr.is_null());\n"
-                   "\n"
-                   "JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT,\n"
-                   "                   PrivateValue(raw as *const libc::c_void));" % TRACE_HOOK_NAME)
+                   "assert!(!obj.ptr.is_null());" % TRACE_HOOK_NAME)
     else:
         create += ("let obj = {\n"
                    "    let _ac = JSAutoCompartment::new(cx, proto.ptr);\n"
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 27fdb3efa9c2..45a06674cfcb 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -9,7 +9,7 @@ use dom::bindings::codegen::PrototypeList;
 use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH;
 use dom::bindings::conversions::native_from_handleobject;
 use dom::bindings::conversions::private_from_proto_check;
-use dom::bindings::conversions::{is_dom_class, jsstring_to_str};
+use dom::bindings::conversions::{is_dom_class, jsstring_to_str, DOM_OBJECT_SLOT};
 use dom::bindings::error::throw_type_error;
 use dom::bindings::error::{Error, ErrorResult, Fallible, throw_invalid_this};
 use dom::bindings::global::GlobalRef;
@@ -625,6 +625,7 @@ pub fn has_property_on_prototype(cx: *mut JSContext, proxy: HandleObject,
 
 /// Create a DOM global object with the given class.
 pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass,
+                         private: *const libc::c_void,
                          trace: JSTraceOp)
                          -> *mut JSObject {
     unsafe {
@@ -640,6 +641,7 @@ pub fn create_dom_global(cx: *mut JSContext, class: *const JSClass,
             return ptr::null_mut();
         }
         let _ac = JSAutoCompartment::new(cx, obj.ptr);
+        JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT, PrivateValue(private));
         JS_InitStandardClasses(cx, obj.handle());
         initialize_global(obj.ptr);
         JS_FireOnNewGlobalObject(cx, obj.handle());