Merge pull request #73739 from sharwell/align-impl

Align sort implementation with reference from dotnet/runtime
dotnet · May 28, 2024 · 93d3cf9 · 93d3cf9
2 parents 2d11197 + 9732adb
commit 93d3cf9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/Dependencies/Collections/SegmentedArray.cs b/src/Dependencies/Collections/SegmentedArray.cs
@@ -394,22 +394,6 @@ public static void Sort<T>(SegmentedArray<T> array, int index, int length, IComp
             }
         }
 
-        public static void Sort<T>(SegmentedArray<T> array, int index, int length, Comparison<T> comparison)
-        {
-            if (index < 0)
-                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
-            if (length < 0)
-                ThrowHelper.ThrowLengthArgumentOutOfRange_ArgumentOutOfRange_NeedNonNegNum();
-            if (array.Length - index < length)
-                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
-
-            if (length > 1)
-            {
-                var segment = new SegmentedArraySegment<T>(array, index, length);
-                SegmentedArraySortHelper<T>.Sort(segment, comparison);
-            }
-        }
-
         public static void Sort<T>(SegmentedArray<T> array, Comparison<T> comparison)
         {
             if (comparison is null)

diff --git a/src/Dependencies/Collections/SegmentedList`1.cs b/src/Dependencies/Collections/SegmentedList`1.cs
@@ -1198,7 +1198,8 @@ public void Sort(Comparison<T> comparison)
 
             if (_size > 1)
             {
-                SegmentedArray.Sort(_items, 0, _size, comparison);
+                var segment = new SegmentedArraySegment<T>(_items, 0, _size);
+                SegmentedArraySortHelper<T>.Sort(segment, comparison);
             }
             _version++;
         }