Bug 1652624 - Part 2: Avoid direct getPrivate usage on debugger child…

…ren. r=arai

Calling `getPrivate` directly spreads implementation details of the Debugger
wrapper types across multiple files in a way that is ugly and complicates the
implementation. We can easily avoid that by making the existing referent
functions public.

Differential Revision: https://phabricator.services.mozilla.com/D83443

js/src/debugger/Debugger.cpp

@@ -1479,7 +1479,7 @@ bool Debugger::unwrapDebuggeeObject(JSContext* cx, MutableHandleObject obj) {
     return false;
   }
 
-  obj.set(static_cast<JSObject*>(ndobj->getPrivate()));
+  obj.set(ndobj->referent());
   return true;
 }
 
@@ -6009,12 +6009,12 @@ bool Debugger::CallData::adoptDebuggeeValue() {
   RootedValue v(cx, args[0]);
   if (v.isObject()) {
     RootedObject obj(cx, &v.toObject());
-    NativeObject* ndobj = ToNativeDebuggerObject(cx, &obj);
+    DebuggerObject* ndobj = ToNativeDebuggerObject(cx, &obj);
     if (!ndobj) {
       return false;
     }
 
-    obj.set(static_cast<JSObject*>(ndobj->getPrivate()));
+    obj.set(ndobj->referent());
     v = ObjectValue(*obj);
 
     if (!dbg->wrapDebuggeeValue(cx, &v)) {
@@ -6712,10 +6712,9 @@ bool Debugger::isDebuggerCrossCompartmentEdge(JSObject* obj,
   } else if (obj->is<DebuggerSource>()) {
     referent = obj->as<DebuggerSource>().getReferentRawObject();
   } else if (obj->is<DebuggerObject>()) {
-    referent = static_cast<gc::Cell*>(obj->as<DebuggerObject>().getPrivate());
+    referent = obj->as<DebuggerObject>().referent();
   } else if (obj->is<DebuggerEnvironment>()) {
-    referent =
-        static_cast<gc::Cell*>(obj->as<DebuggerEnvironment>().getPrivate());
+    referent = obj->as<DebuggerEnvironment>().referent();
   }
 
   return referent == target;

js/src/debugger/Environment.h

@@ -74,18 +74,18 @@ class DebuggerEnvironment : public NativeObject {
   bool isInstance() const;
   Debugger* owner() const;
 
- private:
-  static const JSClassOps classOps_;
-
-  static const JSPropertySpec properties_[];
-  static const JSFunctionSpec methods_[];
-
   Env* referent() const {
     Env* env = static_cast<Env*>(getPrivate());
     MOZ_ASSERT(env);
     return env;
   }
 
+ private:
+  static const JSClassOps classOps_;
+
+  static const JSPropertySpec properties_[];
+  static const JSFunctionSpec methods_[];
+
   bool requireDebuggee(JSContext* cx) const;
 
   static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);

js/src/debugger/Object.h

@@ -177,6 +177,12 @@ class DebuggerObject : public NativeObject {
   bool isInstance() const;
   Debugger* owner() const;
 
+  JSObject* referent() const {
+    JSObject* obj = (JSObject*)getPrivate();
+    MOZ_ASSERT(obj);
+    return obj;
+  }
+
  private:
   enum { OWNER_SLOT };
 
@@ -188,12 +194,6 @@ class DebuggerObject : public NativeObject {
   static const JSPropertySpec promiseProperties_[];
   static const JSFunctionSpec methods_[];
 
-  JSObject* referent() const {
-    JSObject* obj = (JSObject*)getPrivate();
-    MOZ_ASSERT(obj);
-    return obj;
-  }
-
   PromiseObject* promise() const;
 
   static MOZ_MUST_USE bool requireGlobal(JSContext* cx,