diff --git a/src/System.Memory/src/System/SpanHelpers.T.cs b/src/System.Memory/src/System/SpanHelpers.T.cs index 1c0717e3677b..00572573429e 100644 --- a/src/System.Memory/src/System/SpanHelpers.T.cs +++ b/src/System.Memory/src/System/SpanHelpers.T.cs @@ -63,10 +63,7 @@ public static int LastIndexOfAny(ref T searchSpace, int searchSpaceLength, re for (int i = 0; i < valueLength; i++) { var tempIndex = LastIndexOf(ref searchSpace, Unsafe.Add(ref value, i), searchSpaceLength); - if (tempIndex != -1) - { - index = (index == -1 || index < tempIndex) ? tempIndex : index; - } + if (tempIndex > index) index = tempIndex; } return index; } diff --git a/src/System.Memory/src/System/SpanHelpers.byte.cs b/src/System.Memory/src/System/SpanHelpers.byte.cs index 89d6139aeaa3..c0f07296e7f9 100644 --- a/src/System.Memory/src/System/SpanHelpers.byte.cs +++ b/src/System.Memory/src/System/SpanHelpers.byte.cs @@ -64,10 +64,7 @@ public static int IndexOfAny(ref byte searchSpace, int searchSpaceLength, ref by for (int i = 0; i < valueLength; i++) { var tempIndex = IndexOf(ref searchSpace, Unsafe.Add(ref value, i), searchSpaceLength); - if (tempIndex != -1) - { - index = (index == -1 || index > tempIndex) ? tempIndex : index; - } + if ((uint)tempIndex < (uint)index) index = tempIndex; } return index; } @@ -84,10 +81,7 @@ public static int LastIndexOfAny(ref byte searchSpace, int searchSpaceLength, re for (int i = 0; i < valueLength; i++) { var tempIndex = LastIndexOf(ref searchSpace, Unsafe.Add(ref value, i), searchSpaceLength); - if (tempIndex != -1) - { - index = (index == -1 || index < tempIndex) ? tempIndex : index; - } + if (tempIndex > index) index = tempIndex; } return index; }