Ascii.Equals and Ascii.EqualsIgnoreCase (#84886)

* Ascii.Equals and Ascii.EqualsIgnoreCase * add Equals(byte, byte) and Equals(char, char) * address code review feedback: remove ByteArrayHelpers type, use Ascii directly * Apply suggestions from code review Co-authored-by: Günther Foidl <gue@korporal.at> * address code review and API review feedback --------- Co-authored-by: Günther Foidl <gue@korporal.at>
dotnet · Apr 22, 2023 · 880d44c · 880d44c
1 parent c7aadc0
commit 880d44c
Show file tree

Hide file tree

Showing 14 changed files with 595 additions and 88 deletions.
diff --git a/src/libraries/Common/src/System/Net/CaseInsensitiveAscii.cs b/src/libraries/Common/src/System/Net/CaseInsensitiveAscii.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections;
+using System.Diagnostics;
+using System.Text;
 
 namespace System.Net
 {
@@ -106,22 +108,9 @@ public new bool Equals(object? firstObject, object? secondObject)
             }
             if (secondString != null)
             {
-                int index = firstString.Length;
-                if (index == secondString.Length)
-                {
-                    if (FastGetHashCode(firstString) == FastGetHashCode(secondString))
-                    {
-                        while (index > 0)
-                        {
-                            index--;
-                            if (AsciiToLower[firstString[index]] != AsciiToLower[secondString[index]])
-                            {
-                                return false;
-                            }
-                        }
-                        return true;
-                    }
-                }
+                Debug.Assert(Ascii.IsValid(firstString) || Ascii.IsValid(secondString), "Expected at least one of the inputs to be valid ASCII");
+
+                return Ascii.EqualsIgnoreCase(firstString, secondString);
             }
             return false;
         }

diff --git a/...ibraries/System.Collections.Immutable/src/System/Collections/Frozen/String/KeyAnalyzer.cs b/...ibraries/System.Collections.Immutable/src/System/Collections/Frozen/String/KeyAnalyzer.cs
@@ -137,10 +137,11 @@ private static void UseFullString(ReadOnlySpan<string> uniqueStrings, bool ignor
             results = new(allAscii, ignoreCase, 0, 0, 0, 0);
         }
 
-        // TODO https://github.com/dotnet/runtime/issues/28230:
-        // Replace this once Ascii.IsValid exists.
         internal static unsafe bool IsAllAscii(ReadOnlySpan<char> s)
         {
+#if NET8_0_OR_GREATER
+            return System.Text.Ascii.IsValid(s);
+#else
             fixed (char* src = s)
             {
                 uint* ptrUInt32 = (uint*)src;
@@ -172,6 +173,7 @@ internal static unsafe bool IsAllAscii(ReadOnlySpan<char> s)
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             static bool AllCharsInUInt32AreAscii(uint value) => (value & ~0x007F_007Fu) == 0;
+#endif
         }
 
         private static double GetUniquenessFactor(HashSet<string> set, ReadOnlySpan<string> uniqueStrings)

diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''">
     <Compile Include="System\Net\Http\ByteArrayContent.cs" />
-    <Compile Include="System\Net\Http\ByteArrayHelpers.cs" />
     <Compile Include="System\Net\Http\CancellationHelper.cs" />
     <Compile Include="System\Net\Http\ClientCertificateOption.cs" />
     <Compile Include="System\Net\Http\DelegatingHandler.cs" />

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs b/src/libraries/System.Net.Http/src/System/Net/Http/ByteArrayHelpers.cs
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderDescriptor.cs
@@ -143,7 +143,7 @@ public string GetHeaderValue(ReadOnlySpan<byte> headerValue, Encoding? valueEnco
                 {
                     for (int i = 0; i < knownValues.Length; i++)
                     {
-                        if (ByteArrayHelpers.EqualsOrdinalAscii(knownValues[i], headerValue))
+                        if (Ascii.Equals(headerValue, knownValues[i]))
                         {
                             return knownValues[i];
                         }
@@ -251,7 +251,7 @@ public string GetHeaderValue(ReadOnlySpan<byte> headerValue, Encoding? valueEnco
 
             Debug.Assert(candidate is null || candidate.Length == contentTypeValue.Length);
 
-            return candidate != null && ByteArrayHelpers.EqualsOrdinalAscii(candidate, contentTypeValue) ?
+            return candidate != null && Ascii.Equals(contentTypeValue, candidate) ?
                 candidate :
                 null;
         }

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/KnownHeaders.cs
@@ -4,6 +4,7 @@
 using System.Net.Http.HPack;
 using System.Net.Http.QPack;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace System.Net.Http.Headers
 {
@@ -427,7 +428,7 @@ public BytePtrAccessor(byte* p, int length)
             fixed (byte* p = &MemoryMarshal.GetReference(name))
             {
                 KnownHeader? candidate = GetCandidate(new BytePtrAccessor(p, name.Length));
-                if (candidate != null && ByteArrayHelpers.EqualsOrdinalAsciiIgnoreCase(candidate.Name, name))
+                if (candidate != null && Ascii.EqualsIgnoreCase(name, candidate.Name))
                 {
                     return candidate;
                 }

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnection.cs
@@ -1079,7 +1079,7 @@ private static void ParseStatusLineCore(Span<byte> line, HttpResponseMessage res
             {
                 ReadOnlySpan<byte> reasonBytes = line.Slice(MinStatusLineLength + 1);
                 string? knownReasonPhrase = HttpStatusDescription.Get(response.StatusCode);
-                if (knownReasonPhrase != null && ByteArrayHelpers.EqualsOrdinalAscii(knownReasonPhrase, reasonBytes))
+                if (knownReasonPhrase != null && Ascii.Equals(reasonBytes, knownReasonPhrase))
                 {
                     response.SetReasonPhraseWithoutValidation(knownReasonPhrase);
                 }

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionBase.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionBase.cs
@@ -31,7 +31,7 @@ public string GetResponseHeaderValueWithCaching(HeaderDescriptor descriptor, Rea
             static string GetOrAddCachedValue([NotNull] ref string? cache, HeaderDescriptor descriptor, ReadOnlySpan<byte> value, Encoding? encoding)
             {
                 string? lastValue = cache;
-                if (lastValue is null || !ByteArrayHelpers.EqualsOrdinalAscii(lastValue, value))
+                if (lastValue is null || !Ascii.Equals(value, lastValue))
                 {
                     cache = lastValue = descriptor.GetHeaderValue(value, encoding);
                 }

diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -70,8 +70,6 @@
              Link="ProductionCode\System\Net\Http\DelegatingHandler.cs" />
     <Compile Include="$(CommonPath)System\IO\DelegatingStream.cs"
              Link="ProductionCode\System\IO\DelegatingStream.cs" />
-    <Compile Include="..\..\src\System\Net\Http\ByteArrayHelpers.cs"
-             Link="ProductionCode\System\Net\Http\ByteArrayHelpers.cs" />
     <Compile Include="..\..\src\System\Net\Http\EmptyContent.cs"
              Link="ProductionCode\System\Net\Http\EmptyContent.cs" />
     <Compile Include="..\..\src\System\Net\Http\EmptyReadStream.cs"

diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -1068,6 +1068,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\SystemException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.CaseConversion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.Equality.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.Transcoding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.Trimming.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\Ascii.Utility.cs" />