Backed out changeset 56c29b147a21 (bug 1874785) for causing multiple build bustages. CLOSED TREE

Author: IulianMoraru

js/src/builtin/TestingFunctions.cpp

@@ -5263,12 +5263,6 @@ class CustomSerializableObject : public NativeObject {
         self.infallibleInit();
         self.set(js_new<ActivityLog>());
         MOZ_RELEASE_ASSERT(self.get());
-        TlsContext.get()->runtime()->atExit(
-            [](void* vpData) {
-              auto* log = static_cast<ActivityLog*>(vpData);
-              js_delete(log);
-            },
-            self.get());
       }
       return self.get();
     }

js/src/vm/Runtime.cpp

@@ -210,11 +210,6 @@ void JSRuntime::destroyRuntime() {
   MOZ_ASSERT(childRuntimeCount == 0);
   MOZ_ASSERT(initialized_);
 
-  for (auto [f, data] : cleanupClosures.ref()) {
-    f(data);
-  }
-  cleanupClosures.ref().clear();
-
 #ifdef JS_HAS_INTL_API
   sharedIntlData.ref().destroyInstance();
 #endif

js/src/vm/Runtime.h

@@ -665,20 +665,9 @@ struct JSRuntime {
   /* Code coverage output. */
   js::UnprotectedData<js::coverage::LCovRuntime> lcovOutput_;
 
-  /* Functions to call, together with data, when the runtime is being torn down.
-   */
-  js::MainThreadData<std::vector<std::pair<void (*)(void*), void*>>>
-      cleanupClosures;
-
  public:
   js::coverage::LCovRuntime& lcovOutput() { return lcovOutput_.ref(); }
 
-  /* Register a cleanup function to be called during runtime shutdown. Do not
-   * depend on the ordering of cleanup calls. */
-  void atExit(void (*function)(void*), void* data) {
-    cleanupClosures.ref().push_back({function, data});
-  }
-
  private:
   js::UnprotectedData<js::jit::JitRuntime*> jitRuntime_;