From e38fea40fcd47877e75dc8f5d9a67bc6a7bbc655 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sun, 15 Nov 2026 20:36:20 +0100 Subject: [PATCH] Skip clearing reference-free ConcurrentBag slots --- .../Collections/Concurrent/ConcurrentBag.cs | 5 ++++- .../tests/ConcurrentBagTests.cs | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentBag.cs b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentBag.cs index ecc1d4751a6476..fe99987b68c94c 100644 --- a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentBag.cs +++ b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentBag.cs @@ -843,7 +843,10 @@ internal void LocalClear() { _headIndex = _tailIndex = StartIndex; _addTakeCount = _stealCount = 0; - Array.Clear(_array); + if (RuntimeHelpers.IsReferenceOrContainsReferences()) + { + Array.Clear(_array); + } } } } diff --git a/src/libraries/System.Collections.Concurrent/tests/ConcurrentBagTests.cs b/src/libraries/System.Collections.Concurrent/tests/ConcurrentBagTests.cs index fbdb6fbd929c3f..839946d5ebd14c 100644 --- a/src/libraries/System.Collections.Concurrent/tests/ConcurrentBagTests.cs +++ b/src/libraries/System.Collections.Concurrent/tests/ConcurrentBagTests.cs @@ -299,6 +299,28 @@ select Task.Factory.StartNew(() => } } + [Fact] + public static void Clear_AfterRemoval_DoesNotExposeOldItems() + { + var bag = new ConcurrentBag(new[] { 1, 2, 3 }); + Assert.True(bag.TryTake(out _)); + + bag.Clear(); + Assert.Empty(bag); + Assert.False(bag.TryPeek(out _)); + Assert.False(bag.TryTake(out _)); + + bag.Add(4); + bag.Add(5); + Assert.Equal(new[] { 4, 5 }, bag.OrderBy(item => item)); + var remaining = new HashSet { 4, 5 }; + while (bag.TryTake(out int item)) + { + Assert.True(remaining.Remove(item)); + } + Assert.Empty(remaining); + } + [Fact] public static void Clear_DuringEnumeration_DoesntAffectEnumeration() {