Try to remove "-" and "'" from HighCharTable (#66200)

dotnet · Mar 6, 2022 · 9f51335 · 9f51335
1 parent c6ca9dc
commit 9f51335
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs
@@ -91,7 +91,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!target.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             fixed (char* ap = &MemoryMarshal.GetReference(source))
             fixed (char* bp = &MemoryMarshal.GetReference(target))
@@ -195,7 +195,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!target.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             fixed (char* ap = &MemoryMarshal.GetReference(source))
             fixed (char* bp = &MemoryMarshal.GetReference(target))
@@ -314,7 +314,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!prefix.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             int length = Math.Min(source.Length, prefix.Length);
 
@@ -389,7 +389,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!prefix.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             int length = Math.Min(source.Length, prefix.Length);
 
@@ -479,7 +479,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!suffix.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             int length = Math.Min(source.Length, suffix.Length);
 
@@ -554,7 +554,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
             Debug.Assert(!GlobalizationMode.Invariant);
 
             Debug.Assert(!suffix.IsEmpty);
-            Debug.Assert(_isAsciiEqualityOrdinal);
+            Debug.Assert(_isAsciiEqualityOrdinal && CanUseAsciiOrdinalForOptions(options));
 
             int length = Math.Min(source.Length, suffix.Length);
 
@@ -877,13 +877,13 @@ internal static IntPtr GetCachedSortHandle(string sortName)
             false, /*0x24,  $*/
             false, /*0x25,  %*/
             false, /*0x26,  &*/
-            true,  /*0x27, '*/
+            false,  /*0x27, '*/
             false, /*0x28, (*/
             false, /*0x29, )*/
             false, /*0x2A **/
             false, /*0x2B, +*/
             false, /*0x2C, ,*/
-            true,  /*0x2D, -*/
+            false,  /*0x2D, -*/
             false, /*0x2E, .*/
             false, /*0x2F, /*/
             false, /*0x30, 0*/