Fixed Clear

timcassell · Nov 16, 2023 · 97e82fe · 97e82fe
1 parent 16b998b
commit 97e82fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Package/Core/InternalShared/PoolInternal.cs b/Package/Core/InternalShared/PoolInternal.cs
@@ -97,12 +97,18 @@ private static class Type<T> where T : HandleablePromiseBase
                 private static void Clear()
                 {
 #if PROMISE_DEBUG || PROTO_PROMISE_DEVELOPER_MODE
-                    var instances = s_pool.MoveElementsToStack();
+#pragma warning disable IDE0018 // Inline variable declaration
+                    HandleablePromiseBase head;
+#pragma warning restore IDE0018 // Inline variable declaration
+                    var instances = s_pool.MoveElementsToStack(out head);
+                    var instance = head;
                     // The pooled stack ends with InvalidAwaitSentinel instead of null.
-                    for (var instance = instances.Pop(); instance != PromiseRefBase.InvalidAwaitSentinel.s_instance; instance = instances.Pop())
+                    while (instance != PromiseRefBase.InvalidAwaitSentinel.s_instance)
                     {
                         MarkNotInPoolPrivate(instance);
                         Discard(instance);
+                        instance = instance._next;
+                        instances.Pop();
                     }
 #else
                     s_pool.ClearUnsafe();

diff --git a/Package/Core/InternalShared/ValueCollectionsInternal.cs b/Package/Core/InternalShared/ValueCollectionsInternal.cs
@@ -309,12 +309,13 @@ internal void ClearUnsafe()
             }
 
 #if PROMISE_DEBUG || PROTO_PROMISE_DEVELOPER_MODE
-            internal ValueLinkedStack<HandleablePromiseBase> MoveElementsToStack()
+            internal ValueLinkedStack<HandleablePromiseBase> MoveElementsToStack(out HandleablePromiseBase head)
             {
                 _locker.Enter();
-                var stack = new ValueLinkedStack<HandleablePromiseBase>(_head);
+                head = _head;
                 ClearUnsafe();
                 _locker.Exit();
+                var stack = new ValueLinkedStack<HandleablePromiseBase>(head);
                 return stack;
             }
 #endif