Align ArrayPool to shared code pattern

Move the ArrayPool code to the shared location. Also use wraps to make
code identical to CoreFX. (Fixing an exception message issue.)

Commit migrated from https://github.com/dotnet/coreclr/commit/6a7f5ead07e244e89df5602a4d5d477aa1f14b4b

diff --git a/src/coreclr/src/mscorlib/corefx/SR.cs b/src/coreclr/src/mscorlib/corefx/SR.cs
index e49561b..e69d6b2 100644 (file)
--- a/src/coreclr/src/mscorlib/corefx/SR.cs
+++ b/src/coreclr/src/mscorlib/corefx/SR.cs
@@ -495,6 +495,11 @@ namespace System
             get { return Environment.GetResourceString("InvalidOperation_NativeOverlappedReused"); }
         }
 
+        public static string ArgumentException_BufferNotFromPool
+        {
+            get { return Environment.GetResourceString("ArgumentException_BufferNotFromPool"); }
+        }
+
         public static string Format(string formatString, params object[] args)
         {
             return string.Format(CultureInfo.CurrentCulture, formatString, args);

diff --git a/src/coreclr/src/mscorlib/src/System/Buffers/ArrayPool.cs b/src/coreclr/src/mscorlib/corefx/System/Buffers/ArrayPool.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Buffers/ArrayPool.cs
rename to src/coreclr/src/mscorlib/corefx/System/Buffers/ArrayPool.cs

diff --git a/src/coreclr/src/mscorlib/src/System/Buffers/ArrayPoolEventSource.cs b/src/coreclr/src/mscorlib/corefx/System/Buffers/ArrayPoolEventSource.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Buffers/ArrayPoolEventSource.cs
rename to src/coreclr/src/mscorlib/corefx/System/Buffers/ArrayPoolEventSource.cs

diff --git a/src/coreclr/src/mscorlib/src/System/Buffers/DefaultArrayPool.cs b/src/coreclr/src/mscorlib/corefx/System/Buffers/DefaultArrayPool.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Buffers/DefaultArrayPool.cs
rename to src/coreclr/src/mscorlib/corefx/System/Buffers/DefaultArrayPool.cs

diff --git a/src/coreclr/src/mscorlib/src/System/Buffers/DefaultArrayPoolBucket.cs b/src/coreclr/src/mscorlib/corefx/System/Buffers/DefaultArrayPoolBucket.cs
similarity index 97%
rename from src/coreclr/src/mscorlib/src/System/Buffers/DefaultArrayPoolBucket.cs
rename to src/coreclr/src/mscorlib/corefx/System/Buffers/DefaultArrayPoolBucket.cs
index a3670b1..e0a1abb 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Buffers/DefaultArrayPoolBucket.cs
+++ b/src/coreclr/src/mscorlib/corefx/System/Buffers/DefaultArrayPoolBucket.cs
@@ -88,7 +88,7 @@ namespace System.Buffers
                 // Check to see if the buffer is the correct size for this bucket
                 if (array.Length != _bufferLength)
                 {
-                    throw new ArgumentException(Environment.GetResourceString("ArgumentException_BufferNotFromPool", nameof(array)));
+                    throw new ArgumentException(SR.ArgumentException_BufferNotFromPool, nameof(array));
                 }
 
                 // While holding the spin lock, if there's room available in the bucket,

diff --git a/src/coreclr/src/mscorlib/src/System/Buffers/Utilities.cs b/src/coreclr/src/mscorlib/corefx/System/Buffers/Utilities.cs
similarity index 91%
rename from src/coreclr/src/mscorlib/src/System/Buffers/Utilities.cs
rename to src/coreclr/src/mscorlib/corefx/System/Buffers/Utilities.cs
index 372a26c..63ae1a9 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Buffers/Utilities.cs
+++ b/src/coreclr/src/mscorlib/corefx/System/Buffers/Utilities.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace System.Buffers
@@ -11,7 +12,7 @@ namespace System.Buffers
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static int SelectBucketIndex(int bufferSize)
         {
-            BCLDebug.Assert(bufferSize > 0);
+            Debug.Assert(bufferSize > 0);
 
             uint bitsRemaining = ((uint)bufferSize - 1) >> 4;
 
@@ -29,7 +30,7 @@ namespace System.Buffers
         internal static int GetMaxSizeForBucket(int binIndex)
         {
             int maxSize = 16 << binIndex;
-            BCLDebug.Assert(maxSize >= 0);
+            Debug.Assert(maxSize >= 0);
             return maxSize;
         }
     }

diff --git a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
index 6df32ba..3d171c5 100644 (file)
--- a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
+++ b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
@@ -1158,12 +1158,12 @@
   <ItemGroup>
     <NumericsSources Include="$(BclSourcesRoot)\System\Numerics\Hashing\HashHelpers.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BuffersSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Buffers\ArrayPool.cs" />
-    <BuffersSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Buffers\ArrayPoolEventSource.cs" />
-    <BuffersSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Buffers\DefaultArrayPool.cs" />
-    <BuffersSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Buffers\DefaultArrayPoolBucket.cs" />
-    <BuffersSources Condition="'$(FeatureCoreClr)'=='true'" Include="$(BclSourcesRoot)\System\Buffers\Utilities.cs" />
+  <ItemGroup Condition="'$(FeatureCoreClr)'=='true'">
+    <BuffersSources Include="$(CoreFxSourcesRoot)\System\Buffers\ArrayPool.cs" />
+    <BuffersSources Include="$(CoreFxSourcesRoot)\System\Buffers\ArrayPoolEventSource.cs" />
+    <BuffersSources Include="$(CoreFxSourcesRoot)\System\Buffers\DefaultArrayPool.cs" />
+    <BuffersSources Include="$(CoreFxSourcesRoot)\System\Buffers\DefaultArrayPoolBucket.cs" />
+    <BuffersSources Include="$(CoreFxSourcesRoot)\System\Buffers\Utilities.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureCoreFxWindowsInterop)' == 'true'">
     <WindowsInteropSources Include="$(CoreFxSourcesRoot)\System\HResults.cs" />