Backed out 4 changesets (bug 1572782) for build bustages at build/src/obj-firefox/dist/include/nsIXPCScriptable.h on a CLOSED TREE

Backed out changeset ec9d15c69bc8 (bug 1572782)
Backed out changeset 8239e4baa0f4 (bug 1572782)
Backed out changeset 9fd7bea2b512 (bug 1572782)
Backed out changeset 11d750555fe1 (bug 1572782)

Author: Oana Pop Rus

dom/bindings/Codegen.py

@@ -1764,7 +1764,7 @@ def finalizeHook(descriptor, hookName, freeOp, obj):
     if descriptor.wrapperCache:
         finalize += "ClearWrapper(self, self, %s);\n" % obj
     if descriptor.isGlobal():
-        finalize += "mozilla::dom::FinalizeGlobal(%s, %s);\n" % (freeOp, obj)
+        finalize += "mozilla::dom::FinalizeGlobal(CastToJSFreeOp(%s), %s);\n" % (freeOp, obj)
     finalize += fill(
         """
         if (size_t mallocBytes = BindingJSObjectMallocBytes(self)) {
@@ -1783,7 +1783,7 @@ class CGClassFinalizeHook(CGAbstractClassHook):
     A hook for finalize, used to release our native object.
     """
     def __init__(self, descriptor):
-        args = [Argument('JSFreeOp*', 'fop'), Argument('JSObject*', 'obj')]
+        args = [Argument('js::FreeOp*', 'fop'), Argument('JSObject*', 'obj')]
         CGAbstractClassHook.__init__(self, descriptor, FINALIZE_HOOK_NAME,
                                      'void', args)
 

dom/bindings/SimpleGlobalObject.cpp

@@ -41,7 +41,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SimpleGlobalObject)
   NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
 NS_INTERFACE_MAP_END
 
-static void SimpleGlobal_finalize(JSFreeOp* fop, JSObject* obj) {
+static void SimpleGlobal_finalize(js::FreeOp* fop, JSObject* obj) {
   SimpleGlobalObject* globalObject =
       static_cast<SimpleGlobalObject*>(JS_GetPrivate(obj));
   if (globalObject) {

js/public/Class.h

@@ -25,11 +25,13 @@
  */
 
 struct JSAtomState;
+struct JSFreeOp;
 struct JSFunctionSpec;
 
 namespace js {
 
 struct Class;
+class FreeOp;
 class Shape;
 
 // This is equal to JSFunction::class_.  Use it in places where you don't want
@@ -573,7 +575,7 @@ typedef bool (*GetElementsOp)(JSContext* cx, JS::HandleObject obj,
                               uint32_t begin, uint32_t end,
                               ElementAdder* adder);
 
-typedef void (*FinalizeOp)(JSFreeOp* fop, JSObject* obj);
+typedef void (*FinalizeOp)(FreeOp* fop, JSObject* obj);
 
 // The special treatment of |finalize| and |trace| is necessary because if we
 // assign either of those hooks to a local variable and then call it -- as is
@@ -867,7 +869,7 @@ static const uint32_t JSCLASS_CACHED_PROTO_MASK =
 namespace js {
 
 struct MOZ_STATIC_CLASS Class {
-  JS_CLASS_MEMBERS(js::ClassOps, JSFreeOp);
+  JS_CLASS_MEMBERS(js::ClassOps, FreeOp);
   const ClassSpec* spec;
   const ClassExtension* ext;
   const ObjectOps* oOps;

js/public/GCAPI.h

@@ -19,6 +19,8 @@
 #include "js/UniquePtr.h"
 #include "js/Utility.h"
 
+struct JSFreeOp;
+
 #ifdef JS_BROKEN_GCC_ATTRIBUTE_WARNING
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wattributes"

js/public/MemoryFunctions.h

@@ -16,10 +16,22 @@
 #include "jstypes.h"  // JS_PUBLIC_API
 
 struct JSContext;
-class JSFreeOp;
 class JSObject;
 struct JSRuntime;
 
+struct JSFreeOp {
+ protected:
+  JSRuntime* runtime_;
+
+  explicit JSFreeOp(JSRuntime* rt) : runtime_(rt) {}
+
+ public:
+  JSRuntime* runtime() const {
+    MOZ_ASSERT(runtime_);
+    return runtime_;
+  }
+};
+
 extern JS_PUBLIC_API void* JS_malloc(JSContext* cx, size_t nbytes);
 
 extern JS_PUBLIC_API void* JS_realloc(JSContext* cx, void* p, size_t oldBytes,

js/public/TypeDecls.h

@@ -27,11 +27,11 @@ typedef uint8_t jsbytecode;
 class JSAtom;
 struct JSContext;
 class JSFunction;
-class JSFreeOp;
 class JSObject;
 struct JSRuntime;
 class JSScript;
 class JSString;
+struct JSFreeOp;
 
 namespace js {
 class TempAllocPolicy;

js/public/Utility.h

@@ -488,9 +488,9 @@ static inline void js_free(void* p) {
  * - Ordinarily, use js_free/js_delete.
  *
  * - For deallocations during GC finalization, use one of the following
- *   operations on the JSFreeOp provided to the finalizer:
+ *   operations on the FreeOp provided to the finalizer:
  *
- *     JSFreeOp::{free_,delete_}
+ *     FreeOp::{free_,delete_}
  */
 
 /*

js/src/builtin/MapObject.cpp

@@ -251,7 +251,7 @@ MapIteratorObject* MapIteratorObject::create(JSContext* cx, HandleObject obj,
   return iterobj;
 }
 
-void MapIteratorObject::finalize(JSFreeOp* fop, JSObject* obj) {
+void MapIteratorObject::finalize(FreeOp* fop, JSObject* obj) {
   MOZ_ASSERT(fop->onMainThread());
   MOZ_ASSERT(!IsInsideNursery(obj));
 
@@ -620,15 +620,15 @@ MapObject* MapObject::create(JSContext* cx,
   return mapObj;
 }
 
-void MapObject::finalize(JSFreeOp* fop, JSObject* obj) {
+void MapObject::finalize(FreeOp* fop, JSObject* obj) {
   MOZ_ASSERT(fop->onMainThread());
   if (ValueMap* map = obj->as<MapObject>().getData()) {
     fop->delete_(obj, map, MemoryUse::MapObjectTable);
   }
 }
 
 /* static */
-void MapObject::sweepAfterMinorGC(JSFreeOp* fop, MapObject* mapobj) {
+void MapObject::sweepAfterMinorGC(FreeOp* fop, MapObject* mapobj) {
   bool wasInsideNursery = IsInsideNursery(mapobj);
   if (wasInsideNursery && !IsForwarded(mapobj)) {
     finalize(fop, mapobj);
@@ -1023,7 +1023,7 @@ SetIteratorObject* SetIteratorObject::create(JSContext* cx, HandleObject obj,
   return iterobj;
 }
 
-void SetIteratorObject::finalize(JSFreeOp* fop, JSObject* obj) {
+void SetIteratorObject::finalize(FreeOp* fop, JSObject* obj) {
   MOZ_ASSERT(fop->onMainThread());
   MOZ_ASSERT(!IsInsideNursery(obj));
 
@@ -1244,7 +1244,7 @@ void SetObject::trace(JSTracer* trc, JSObject* obj) {
   }
 }
 
-void SetObject::finalize(JSFreeOp* fop, JSObject* obj) {
+void SetObject::finalize(FreeOp* fop, JSObject* obj) {
   MOZ_ASSERT(fop->onMainThread());
   SetObject* setobj = static_cast<SetObject*>(obj);
   if (ValueSet* set = setobj->getData()) {
@@ -1253,7 +1253,7 @@ void SetObject::finalize(JSFreeOp* fop, JSObject* obj) {
 }
 
 /* static */
-void SetObject::sweepAfterMinorGC(JSFreeOp* fop, SetObject* setobj) {
+void SetObject::sweepAfterMinorGC(FreeOp* fop, SetObject* setobj) {
   bool wasInsideNursery = IsInsideNursery(setobj);
   if (wasInsideNursery && !IsForwarded(setobj)) {
     finalize(fop, setobj);

js/src/builtin/MapObject.h

@@ -139,7 +139,7 @@ class MapObject : public NativeObject {
       OrderedHashMap<Value, Value, UnbarrieredHashPolicy, ZoneAllocPolicy>;
   friend class OrderedHashTableRef<MapObject>;
 
-  static void sweepAfterMinorGC(JSFreeOp* fop, MapObject* mapobj);
+  static void sweepAfterMinorGC(FreeOp* fop, MapObject* mapobj);
 
  private:
   static const ClassSpec classSpec_;
@@ -152,7 +152,7 @@ class MapObject : public NativeObject {
   static ValueMap& extract(HandleObject o);
   static ValueMap& extract(const CallArgs& args);
   static void trace(JSTracer* trc, JSObject* obj);
-  static void finalize(JSFreeOp* fop, JSObject* obj);
+  static void finalize(FreeOp* fop, JSObject* obj);
   static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);
 
   static bool is(HandleValue v);
@@ -198,7 +198,7 @@ class MapIteratorObject : public NativeObject {
   static MapIteratorObject* create(JSContext* cx, HandleObject mapobj,
                                    ValueMap* data,
                                    MapObject::IteratorKind kind);
-  static void finalize(JSFreeOp* fop, JSObject* obj);
+  static void finalize(FreeOp* fop, JSObject* obj);
   static size_t objectMoved(JSObject* obj, JSObject* old);
 
   static MOZ_MUST_USE bool next(Handle<MapIteratorObject*> mapIterator,
@@ -253,7 +253,7 @@ class SetObject : public NativeObject {
       OrderedHashSet<Value, UnbarrieredHashPolicy, ZoneAllocPolicy>;
   friend class OrderedHashTableRef<SetObject>;
 
-  static void sweepAfterMinorGC(JSFreeOp* fop, SetObject* setobj);
+  static void sweepAfterMinorGC(FreeOp* fop, SetObject* setobj);
 
  private:
   static const ClassSpec classSpec_;
@@ -267,7 +267,7 @@ class SetObject : public NativeObject {
   static ValueSet& extract(HandleObject o);
   static ValueSet& extract(const CallArgs& args);
   static void trace(JSTracer* trc, JSObject* obj);
-  static void finalize(JSFreeOp* fop, JSObject* obj);
+  static void finalize(FreeOp* fop, JSObject* obj);
   static bool construct(JSContext* cx, unsigned argc, Value* vp);
 
   static bool is(HandleValue v);
@@ -311,7 +311,7 @@ class SetIteratorObject : public NativeObject {
   static SetIteratorObject* create(JSContext* cx, HandleObject setobj,
                                    ValueSet* data,
                                    SetObject::IteratorKind kind);
-  static void finalize(JSFreeOp* fop, JSObject* obj);
+  static void finalize(FreeOp* fop, JSObject* obj);
   static size_t objectMoved(JSObject* obj, JSObject* old);
 
   static MOZ_MUST_USE bool next(Handle<SetIteratorObject*> setIterator,

js/src/builtin/ModuleObject.cpp

@@ -679,8 +679,9 @@ void ModuleNamespaceObject::ProxyHandler::trace(JSTracer* trc,
   }
 }
 
-void ModuleNamespaceObject::ProxyHandler::finalize(JSFreeOp* fop,
+void ModuleNamespaceObject::ProxyHandler::finalize(JSFreeOp* fopArg,
                                                    JSObject* proxy) const {
+  FreeOp* fop = FreeOp::get(fopArg);
   auto& self = proxy->as<ModuleNamespaceObject>();
 
   if (self.hasBindings()) {
@@ -771,7 +772,7 @@ ModuleObject* ModuleObject::create(JSContext* cx) {
 }
 
 /* static */
-void ModuleObject::finalize(JSFreeOp* fop, JSObject* obj) {
+void ModuleObject::finalize(js::FreeOp* fop, JSObject* obj) {
   MOZ_ASSERT(fop->maybeOnHelperThread());
   ModuleObject* self = &obj->as<ModuleObject>();
   if (self->hasImportBindings()) {