When appropriate, use custom pool types rather than ObjectPool<T>

Author: DustinCampbell

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorTagHelperContextDiscoveryPhase.cs

@@ -12,7 +12,6 @@
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.AspNetCore.Razor.PooledObjects;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -173,7 +172,7 @@ internal sealed class TagHelperDirectiveVisitor : DirectiveVisitor
         /// A larger pool of <see cref="TagHelperDescriptor"/> lists to handle scenarios where tag helpers
         /// originate from a large number of assemblies.
         /// </summary>
-        private static readonly ObjectPool<List<TagHelperDescriptor>> s_pool = ListPool<TagHelperDescriptor>.Create(100);
+        private static readonly ListPool<TagHelperDescriptor> s_pool = ListPool<TagHelperDescriptor>.Create(poolSize: 100);
 
         /// <summary>
         /// A map from assembly name to list of <see cref="TagHelperDescriptor"/>. Lists are allocated from and returned to

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditHelper.TextChangeBuilder.cs

@@ -16,15 +16,14 @@
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.CodeAnalysis.Razor.DocumentMapping;
 
 internal static partial class RazorEditHelper
 {
     private sealed class TextChangeBuilder : IDisposable
     {
-        private ObjectPool<ImmutableArray<RazorTextChange>.Builder> Pool => ArrayBuilderPool<RazorTextChange>.Default;
+        private static ArrayBuilderPool<RazorTextChange> Pool => ArrayBuilderPool<RazorTextChange>.Default;
         private readonly ImmutableArray<RazorTextChange>.Builder _builder;
         private readonly IDocumentMappingService _documentMappingService;
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs

@@ -15,13 +15,12 @@
 using Microsoft.CodeAnalysis.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor.Utilities;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
 internal sealed class ProjectState
 {
-    private static readonly ObjectPool<Dictionary<string, ImmutableHashSet<string>.Builder>> s_importMapBuilderPool =
+    private static readonly DictionaryPool<string, ImmutableHashSet<string>.Builder> s_importMapBuilderPool =
         DictionaryPool<string, ImmutableHashSet<string>.Builder>.Create(FilePathNormalizingComparer.Instance);
 
     private static readonly ImmutableDictionary<string, DocumentState> s_emptyDocuments

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Serialization/MessagePack/Formatters/SerializerCachingOptions.ReferenceMap`1.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.PooledObjects;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.CodeAnalysis.Razor.Serialization.MessagePack.Formatters;
 
@@ -13,11 +12,11 @@ internal partial class SerializerCachingOptions
     public struct ReferenceMap<T> : IDisposable
         where T : notnull
     {
-        private readonly ObjectPool<Dictionary<T, int>> _dictionaryPool;
+        private readonly DictionaryPool<T, int> _dictionaryPool;
         private List<T> _values;
         private Dictionary<T, int> _valueToIdMap;
 
-        public ReferenceMap(ObjectPool<Dictionary<T, int>> dictionaryPool)
+        public ReferenceMap(DictionaryPool<T, int> dictionaryPool)
         {
             _dictionaryPool = dictionaryPool;
             _values = ListPool<T>.Default.Get();

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.Test/PooledObjects/TestArrayBuilderPool`1.cs

@@ -3,28 +3,27 @@
 
 using System.Collections.Immutable;
 using Microsoft.AspNetCore.Razor.PooledObjects;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.Utilities.Shared.Test.PooledObjects;
 
 internal static class TestArrayBuilderPool<T>
 {
-    public static ObjectPool<ImmutableArray<T>.Builder> Create(
-        IPooledObjectPolicy<ImmutableArray<T>.Builder>? policy = null, int size = 1)
-        => DefaultPool.Create(policy ?? NoReturnPolicy.Instance, size);
+    public static ArrayBuilderPool<T> Create(
+        ArrayBuilderPool<T>.PooledObjectPolicy? policy = null, int size = 1)
+        => ArrayBuilderPool<T>.Create(policy ?? NoReturnPolicy.Instance, size);
 
-    public sealed class NoReturnPolicy : IPooledObjectPolicy<ImmutableArray<T>.Builder>
+    public sealed class NoReturnPolicy : ArrayBuilderPool<T>.PooledObjectPolicy
     {
         public static readonly NoReturnPolicy Instance = new();
 
         private NoReturnPolicy()
         {
         }
 
-        public ImmutableArray<T>.Builder Create()
+        public override ImmutableArray<T>.Builder Create()
             => ImmutableArray.CreateBuilder<T>();
 
-        public bool Return(ImmutableArray<T>.Builder obj)
+        public override bool Return(ImmutableArray<T>.Builder obj)
             => false;
     }
 }

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DictionaryBuilderPool`2.cs

@@ -23,6 +23,7 @@ private DictionaryBuilderPool(PooledObjectPolicy policy, Optional<int> poolSize)
         : base(policy, poolSize)
     {
     }
+
     public static DictionaryBuilderPool<TKey, TValue> Create(
         Optional<IEqualityComparer<TKey>?> keyComparer = default,
         Optional<int> poolSize = default)

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArrayBuilder`1.cs

@@ -9,7 +9,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Razor.Utilities;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.PooledObjects;
 
@@ -34,7 +33,7 @@ internal partial struct PooledArrayBuilder<T> : IDisposable
     /// </summary>
     private const int InlineCapacity = 4;
 
-    private ObjectPool<ImmutableArray<T>.Builder>? _builderPool;
+    private ArrayBuilderPool<T>? _builderPool;
 
     /// <summary>
     ///  A builder to be used as storage after the first time that the number
@@ -59,7 +58,7 @@ internal partial struct PooledArrayBuilder<T> : IDisposable
     /// </summary>
     private int _inlineCount;
 
-    public PooledArrayBuilder(int? capacity = null, ObjectPool<ImmutableArray<T>.Builder>? builderPool = null)
+    public PooledArrayBuilder(int? capacity = null, ArrayBuilderPool<T>? builderPool = null)
     {
         _capacity = capacity is > InlineCapacity ? capacity : null;
         _builderPool = builderPool;

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledDictionaryBuilder`2.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.PooledObjects;
 
@@ -13,10 +12,10 @@ namespace Microsoft.AspNetCore.Razor.PooledObjects;
 ///  it's needed. Note: Dispose this to ensure that the pooled array builder is returned
 ///  to the pool.
 /// </summary>
-internal ref struct PooledDictionaryBuilder<TKey, TValue>(ObjectPool<ImmutableDictionary<TKey, TValue>.Builder>? pool)
+internal ref struct PooledDictionaryBuilder<TKey, TValue>(DictionaryBuilderPool<TKey, TValue>? pool)
     where TKey : notnull
 {
-    private readonly ObjectPool<ImmutableDictionary<TKey, TValue>.Builder> _pool = pool ?? DictionaryBuilderPool<TKey, TValue>.Default;
+    private readonly DictionaryBuilderPool<TKey, TValue> _pool = pool ?? DictionaryBuilderPool<TKey, TValue>.Default;
 
     private ImmutableDictionary<TKey, TValue>.Builder? _builder;
 

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledHashSet`1.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.PooledObjects;
 
@@ -15,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.PooledObjects;
 /// </summary>
 internal ref struct PooledHashSet<T>
 {
-    private readonly ObjectPool<HashSet<T>> _pool;
+    private readonly HashSetPool<T> _pool;
 #pragma warning disable IDE0052 // Used in NET only code below. Called API doesn't exist on framework.
     private readonly int? _capacity;
 #pragma warning restore IDE0052
@@ -26,7 +25,7 @@ public PooledHashSet()
     {
     }
 
-    public PooledHashSet(ObjectPool<HashSet<T>> pool)
+    public PooledHashSet(HashSetPool<T> pool)
         : this(pool, capacity: null)
     {
     }
@@ -36,7 +35,7 @@ public PooledHashSet(int capacity)
     {
     }
 
-    public PooledHashSet(ObjectPool<HashSet<T>>? pool, int? capacity)
+    public PooledHashSet(HashSetPool<T>? pool, int? capacity)
     {
         _pool = pool ?? HashSetPool<T>.Default;
         _capacity = capacity;

src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledList`1.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.ObjectPool;
 
 namespace Microsoft.AspNetCore.Razor.PooledObjects;
 
@@ -15,15 +14,15 @@ namespace Microsoft.AspNetCore.Razor.PooledObjects;
 /// </summary>
 internal ref partial struct PooledList<T>
 {
-    private readonly ObjectPool<List<T>> _pool;
+    private readonly ListPool<T> _pool;
     private List<T>? _list;
 
     public PooledList()
         : this(ListPool<T>.Default)
     {
     }
 
-    public PooledList(ObjectPool<List<T>> pool)
+    public PooledList(ListPool<T> pool)
     {
         _pool = pool;
     }