Merge branch 'caleb/fix/this' into philippe/pyTypeFactory-cleanup

Author: philippedistributive

include/JobQueue.hh

@@ -24,7 +24,7 @@
 class JobQueue : public JS::JobQueue {
 
 public:
-explicit JobQueue(JSContext *cx) : finalizationRegistryCallbacks(cx) {}
+explicit JobQueue(JSContext *cx);
 ~JobQueue() = default;
 
 /**
@@ -97,7 +97,7 @@ bool runFinalizationRegistryCallbacks(JSContext *cx);
 private:
 
 using FunctionVector = JS::GCVector<JSFunction *, 0, js::SystemAllocPolicy>;
-JS::PersistentRooted<FunctionVector> finalizationRegistryCallbacks;
+JS::PersistentRooted<FunctionVector> *finalizationRegistryCallbacks;
 
 /**
  * @brief Capture this JobQueue's current job queue as a SavedJobQueue and return it,

src/JobQueue.cc

@@ -20,6 +20,10 @@
 
 #include <stdexcept>
 
+JobQueue::JobQueue(JSContext *cx) {
+  finalizationRegistryCallbacks = new JS::PersistentRooted<FunctionVector>(cx);
+}
+
 JSObject *JobQueue::getIncumbentGlobal(JSContext *cx) {
   return JS::CurrentGlobalOrNull(cx);
 }
@@ -113,13 +117,13 @@ bool sendJobToMainLoop(PyObject *pyFunc) {
 }  
 
 void JobQueue::queueFinalizationRegistryCallback(JSFunction *callback) {
-  mozilla::Unused << finalizationRegistryCallbacks.append(callback);
+  mozilla::Unused << finalizationRegistryCallbacks->append(callback);
 }
 
 bool JobQueue::runFinalizationRegistryCallbacks(JSContext *cx) {
   bool ranCallbacks = false;
   JS::Rooted<FunctionVector> callbacks(cx);
-  std::swap(callbacks.get(), finalizationRegistryCallbacks.get());
+  std::swap(callbacks.get(), finalizationRegistryCallbacks->get());
   for (JSFunction *f: callbacks) {
     JS::ExposeObjectToActiveJS(JS_GetFunctionObject(f));
 

src/modules/pythonmonkey/pythonmonkey.cc

@@ -254,8 +254,8 @@ PyTypeObject JSObjectItemsProxyType = {
 
 static void cleanup() {
   delete autoRealm;
-  if (GLOBAL_CX) JS_DestroyContext(GLOBAL_CX);
   delete global;
+  if (GLOBAL_CX) JS_DestroyContext(GLOBAL_CX);
   delete JOB_QUEUE;
   JS_ShutDown();
 }