Use uint.TrailingZeroCount

dotnet · Jun 20, 2023 · 887ccac · 887ccac
1 parent 3989e4d
commit 887ccac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs
@@ -462,7 +462,7 @@ ref Unsafe.Add(ref valueRef, 1), valueTailLength))
                         // Do a full IgnoreCase equality comparison. SpanHelpers.IndexOf skips comparing the two characters in some cases,
                         // but we don't actually know that the two characters are equal, since we compared with | 0x20. So we just compare
                         // the full string always.
-                        nint charPos = (nint)((uint)BitOperations.TrailingZeroCount(mask) / sizeof(ushort));
+                        nint charPos = (nint)(uint.TrailingZeroCount(mask) / sizeof(ushort));
                         if (EqualsIgnoreCase(ref Unsafe.Add(ref searchSpace, offset + charPos), ref valueRef, value.Length))
                         {
                             // Match! Return the index.
@@ -528,7 +528,7 @@ ref Unsafe.Add(ref valueRef, 1), valueTailLength))
                         // Do a full IgnoreCase equality comparison. SpanHelpers.IndexOf skips comparing the two characters in some cases,
                         // but we don't actually know that the two characters are equal, since we compared with | 0x20. So we just compare
                         // the full string always.
-                        nint charPos = (nint)((uint)BitOperations.TrailingZeroCount(mask) / sizeof(ushort));
+                        nint charPos = (nint)(uint.TrailingZeroCount(mask) / sizeof(ushort));
                         if (EqualsIgnoreCase(ref Unsafe.Add(ref searchSpace, offset + charPos), ref valueRef, value.Length))
                         {
                             // Match! Return the index.

diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs
@@ -114,7 +114,7 @@ public static int IndexOf(ref char searchSpace, int searchSpaceLength, ref char
                     uint mask = cmpAnd.ExtractMostSignificantBits();
                     do
                     {
-                        nint charPos = (nint)((uint)BitOperations.TrailingZeroCount(mask) / sizeof(ushort));
+                        nint charPos = (nint)(uint.TrailingZeroCount(mask) / sizeof(ushort));
                         if (valueLength == 2 || // we already matched two chars
                             SequenceEqual(
                                 ref Unsafe.As<char, byte>(ref Unsafe.Add(ref searchSpace, offset + charPos)),
@@ -176,7 +176,7 @@ public static int IndexOf(ref char searchSpace, int searchSpaceLength, ref char
                     uint mask = cmpAnd.ExtractMostSignificantBits();
                     do
                     {
-                        nint charPos = (nint)((uint)BitOperations.TrailingZeroCount(mask) / sizeof(ushort));
+                        nint charPos = (nint)(uint.TrailingZeroCount(mask) / sizeof(ushort));
                         if (valueLength == 2 || // we already matched two chars
                             SequenceEqual(
                                 ref Unsafe.As<char, byte>(ref Unsafe.Add(ref searchSpace, offset + charPos)),