nodejs
diff --git a/Collapse file
‎src/cleanup_queue-inl.h‎
Copy file name to clipboardExpand all lines: src/cleanup_queue-inl.h
+3-1Lines changed: 3 additions & 1 deletion b/Collapse file
‎src/cleanup_queue-inl.h‎
Copy file name to clipboardExpand all lines: src/cleanup_queue-inl.h
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/Collapse file
‎src/cleanup_queue.cc‎
Copy file name to clipboardExpand all lines: src/cleanup_queue.cc
+8-1Lines changed: 8 additions & 1 deletion b/Collapse file
‎src/cleanup_queue.cc‎
Copy file name to clipboardExpand all lines: src/cleanup_queue.cc
+8-1Lines changed: 8 additions & 1 deletion
diff --git a/Collapse file
‎src/cleanup_queue.h‎
Copy file name to clipboardExpand all lines: src/cleanup_queue.h
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎src/cleanup_queue.h‎
Copy file name to clipboardExpand all lines: src/cleanup_queue.h
+2Lines changed: 2 additions & 0 deletions
@@ -39,7 +39,9 @@ void CleanupQueue::Remove(Callback cb, void* arg) {
 
 template <typename T>
 void CleanupQueue::ForEachBaseObject(T&& iterator) const {
-  for (const auto& hook : cleanup_hooks_) {
+  std::vector<CleanupHookCallback> callbacks = GetOrdered();
+
+  for (const auto& hook : callbacks) {
     BaseObject* obj = GetBaseObject(hook);
     if (obj != nullptr) iterator(obj);
   }
 
@@ -5,7 +5,8 @@
 
 namespace node {
 
-void CleanupQueue::Drain() {
+std::vector<CleanupQueue::CleanupHookCallback> CleanupQueue::GetOrdered()
+    const {
   // Copy into a vector, since we can't sort an unordered_set in-place.
   std::vector<CleanupHookCallback> callbacks(cleanup_hooks_.begin(),
                                              cleanup_hooks_.end());
@@ -20,6 +21,12 @@ void CleanupQueue::Drain() {
               return a.insertion_order_counter_ > b.insertion_order_counter_;
             });
 
+  return callbacks;
+}
+
+void CleanupQueue::Drain() {
+  std::vector<CleanupHookCallback> callbacks = GetOrdered();
+
   for (const CleanupHookCallback& cb : callbacks) {
     if (cleanup_hooks_.count(cb) == 0) {
       // This hook was removed from the `cleanup_hooks_` set during another
 
@@ -6,6 +6,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <unordered_set>
+#include <vector>
 
 #include "memory_tracker.h"
 
@@ -66,6 +67,7 @@ class CleanupQueue : public MemoryRetainer {
     uint64_t insertion_order_counter_;
   };
 
+  std::vector<CleanupHookCallback> GetOrdered() const;
   inline BaseObject* GetBaseObject(const CleanupHookCallback& callback) const;
 
   // Use an unordered_set, so that we have efficient insertion and removal.