Optimize Enumerable.Min/Max<T> with Comparer<T>.Default intrinsic (#48273)

diff --git a/src/libraries/System.Linq/src/System/Linq/Max.cs b/src/libraries/System.Linq/src/System/Linq/Max.cs
index 9dc4c92..0e9c4c0 100644 (file)
--- a/src/libraries/System.Linq/src/System/Linq/Max.cs
+++ b/src/libraries/System.Linq/src/System/Linq/Max.cs
@@ -448,11 +448,10 @@ namespace System.Linq
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
             }
 
-            Comparer<TSource> comparer = Comparer<TSource>.Default;
             TSource? value = default;
-            if (value == null)
+            using (IEnumerator<TSource> e = source.GetEnumerator())
             {
-                using (IEnumerator<TSource> e = source.GetEnumerator())
+                if (value == null)
                 {
                     do
                     {
@@ -465,6 +464,7 @@ namespace System.Linq
                     }
                     while (value == null);
 
+                    Comparer<TSource> comparer = Comparer<TSource>.Default;
                     while (e.MoveNext())
                     {
                         TSource x = e.Current;
@@ -474,10 +474,7 @@ namespace System.Linq
                         }
                     }
                 }
-            }
-            else
-            {
-                using (IEnumerator<TSource> e = source.GetEnumerator())
+                else
                 {
                     if (!e.MoveNext())
                     {
@@ -488,7 +485,7 @@ namespace System.Linq
                     while (e.MoveNext())
                     {
                         TSource x = e.Current;
-                        if (comparer.Compare(x, value) > 0)
+                        if (Comparer<TSource>.Default.Compare(x, value) > 0)
                         {
                             value = x;
                         }

diff --git a/src/libraries/System.Linq/src/System/Linq/Min.cs b/src/libraries/System.Linq/src/System/Linq/Min.cs
index 9958c84..f8c7f3b 100644 (file)
--- a/src/libraries/System.Linq/src/System/Linq/Min.cs
+++ b/src/libraries/System.Linq/src/System/Linq/Min.cs
@@ -406,11 +406,10 @@ namespace System.Linq
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
             }
 
-            Comparer<TSource> comparer = Comparer<TSource>.Default;
             TSource? value = default;
-            if (value == null)
+            using (IEnumerator<TSource> e = source.GetEnumerator())
             {
-                using (IEnumerator<TSource> e = source.GetEnumerator())
+                if (value == null)
                 {
                     do
                     {
@@ -423,6 +422,7 @@ namespace System.Linq
                     }
                     while (value == null);
 
+                    Comparer<TSource> comparer = Comparer<TSource>.Default;
                     while (e.MoveNext())
                     {
                         TSource x = e.Current;
@@ -432,10 +432,7 @@ namespace System.Linq
                         }
                     }
                 }
-            }
-            else
-            {
-                using (IEnumerator<TSource> e = source.GetEnumerator())
+                else
                 {
                     if (!e.MoveNext())
                     {
@@ -446,7 +443,7 @@ namespace System.Linq
                     while (e.MoveNext())
                     {
                         TSource x = e.Current;
-                        if (comparer.Compare(x, value) < 0)
+                        if (Comparer<TSource>.Default.Compare(x, value) < 0)
                         {
                             value = x;
                         }