Look up Queryable operator MethodInfos without MakeGenericMethod (#79717

) For NativeAOT compatibility, better speed. Closes #79199
dotnet · Dec 16, 2022 · 76e2be8 · 76e2be8
1 parent 64ce464
commit 76e2be8
Show file tree

Hide file tree

Showing 50 changed files with 526 additions and 1,867 deletions.
diff --git a/src/libraries/Common/tests/System/Linq/SkipTakeData.cs b/src/libraries/Common/tests/System/Linq/SkipTakeData.cs
@@ -30,7 +30,7 @@ public static IEnumerable<object[]> QueryableData()
             return EnumerableData().Select(array =>
             {
                 var enumerable = (IEnumerable<int>)array[0];
-                return new object[] { enumerable.AsQueryable(), array[1] };
+                return new[] { enumerable.AsQueryable(), array[1] };
             });
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj
@@ -4,7 +4,6 @@
     <EnableAotAnalyzer>true</EnableAotAnalyzer>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="System\Linq\CachedReflection.cs" />
     <Compile Include="System\Linq\EnumerableExecutor.cs" />
     <Compile Include="System\Linq\EnumerableQuery.cs" />
     <Compile Include="System\Linq\EnumerableRewriter.cs" />

diff --git a/src/libraries/System.Linq.Queryable/src/System/Linq/CachedReflection.cs b/src/libraries/System.Linq.Queryable/src/System/Linq/CachedReflection.cs
diff --git a/src/libraries/System.Linq.Queryable/src/System/Linq/Queryable.cs b/src/libraries/System.Linq.Queryable/src/System/Linq/Queryable.cs
diff --git a/src/libraries/System.Linq.Queryable/tests/AggregateTests.cs b/src/libraries/System.Linq.Queryable/tests/AggregateTests.cs
@@ -64,21 +64,21 @@ public void NullResultSelector()
         [Fact]
         public void Aggregate1()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Aggregate((n1, n2) => n1 + n2);
+            var val = new[] { 0, 2, 1 }.AsQueryable().Aggregate((n1, n2) => n1 + n2);
             Assert.Equal((int)3, val);
         }
 
         [Fact]
         public void Aggregate2()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Aggregate("", (n1, n2) => n1 + n2.ToString());
+            var val = new[] { 0, 2, 1 }.AsQueryable().Aggregate("", (n1, n2) => n1 + n2.ToString());
             Assert.Equal("021", val);
         }
 
         [Fact]
         public void Aggregate3()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Aggregate(0L, (n1, n2) => n1 + n2, n => n.ToString());
+            var val = new[] { 0, 2, 1 }.AsQueryable().Aggregate(0L, (n1, n2) => n1 + n2, n => n.ToString());
             Assert.Equal("3", val);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/AllTests.cs b/src/libraries/System.Linq.Queryable/tests/AllTests.cs
@@ -32,7 +32,7 @@ public void NullPredicateUsed()
         [Fact]
         public void All()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().All(n => n > 1);
+            var val = new[] { 0, 2, 1 }.AsQueryable().All(n => n > 1);
             Assert.False(val);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/AnyTests.cs b/src/libraries/System.Linq.Queryable/tests/AnyTests.cs
@@ -55,14 +55,14 @@ public void NullPredicateUsed()
         [Fact]
         public void Any1()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Any();
+            var val = new[] { 0, 2, 1 }.AsQueryable().Any();
             Assert.True(val);
         }
 
         [Fact]
         public void Any2()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Any(n => n > 1);
+            var val = new[] { 0, 2, 1 }.AsQueryable().Any(n => n > 1);
             Assert.True(val);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/AverageTests.cs b/src/libraries/System.Linq.Queryable/tests/AverageTests.cs
@@ -432,140 +432,140 @@ public void MultipleFloatFromSelector()
         [Fact]
         public void Average1()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average2()
         {
-            var val = (new int?[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new int?[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average3()
         {
-            var val = (new long[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new long[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average4()
         {
-            var val = (new long?[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new long?[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average5()
         {
-            var val = (new float[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new float[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((float)1, val);
         }
 
         [Fact]
         public void Average6()
         {
-            var val = (new float?[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new float?[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((float)1, val);
         }
 
         [Fact]
         public void Average7()
         {
-            var val = (new double[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new double[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average8()
         {
-            var val = (new double?[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new double?[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average9()
         {
-            var val = (new decimal[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new decimal[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((decimal)1, val);
         }
 
         [Fact]
         public void Average10()
         {
-            var val = (new decimal?[] { 0, 2, 1 }).AsQueryable().Average();
+            var val = new decimal?[] { 0, 2, 1 }.AsQueryable().Average();
             Assert.Equal((decimal)1, val);
         }
 
         [Fact]
         public void Average11()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average12()
         {
-            var val = (new int?[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new int?[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average13()
         {
-            var val = (new long[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new long[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average14()
         {
-            var val = (new long?[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new long?[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average15()
         {
-            var val = (new float[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new float[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((float)1, val);
         }
 
         [Fact]
         public void Average16()
         {
-            var val = (new float?[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new float?[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((float)1, val);
         }
 
         [Fact]
         public void Average17()
         {
-            var val = (new double[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new double[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average18()
         {
-            var val = (new double?[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new double?[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((double)1, val);
         }
 
         [Fact]
         public void Average19()
         {
-            var val = (new decimal[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new decimal[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((decimal)1, val);
         }
 
         [Fact]
         public void Average20()
         {
-            var val = (new decimal?[] { 0, 2, 1 }).AsQueryable().Average(n => n);
+            var val = new decimal?[] { 0, 2, 1 }.AsQueryable().Average(n => n);
             Assert.Equal((decimal)1, val);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/CastTests.cs b/src/libraries/System.Linq.Queryable/tests/CastTests.cs
@@ -92,7 +92,7 @@ public void ThrowOnUncastableItem()
         [Fact]
         public void ThrowCastingIntToDouble()
         {
-            int[] source = new int[] { -4, 1, 2, 9 };
+            int[] source = { -4, 1, 2, 9 };
 
             IQueryable<double> cast = source.AsQueryable().Cast<double>();
             Assert.Throws<InvalidCastException>(() => cast.ToList());
@@ -159,7 +159,7 @@ public void NullableIntFromNullsAndInts()
         [Fact]
         public void ThrowCastingIntToLong()
         {
-            int[] source = new int[] { -4, 1, 2, 3, 9 };
+            int[] source = { -4, 1, 2, 3, 9 };
 
             IQueryable<long> cast = source.AsQueryable().Cast<long>();
             Assert.Throws<InvalidCastException>(() => cast.ToList());
@@ -168,7 +168,7 @@ public void ThrowCastingIntToLong()
         [Fact]
         public void ThrowCastingIntToNullableLong()
         {
-            int[] source = new int[] { -4, 1, 2, 3, 9 };
+            int[] source = { -4, 1, 2, 3, 9 };
 
             IQueryable<long?> cast = source.AsQueryable().Cast<long?>();
             Assert.Throws<InvalidCastException>(() => cast.ToList());
@@ -177,7 +177,7 @@ public void ThrowCastingIntToNullableLong()
         [Fact]
         public void ThrowCastingNullableIntToLong()
         {
-            int?[] source = new int?[] { -4, 1, 2, 3, 9 };
+            int?[] source = { -4, 1, 2, 3, 9 };
 
             IQueryable<long> cast = source.AsQueryable().Cast<long>();
             Assert.Throws<InvalidCastException>(() => cast.ToList());
@@ -186,7 +186,7 @@ public void ThrowCastingNullableIntToLong()
         [Fact]
         public void ThrowCastingNullableIntToNullableLong()
         {
-            int?[] source = new int?[] { -4, 1, 2, 3, 9, null };
+            int?[] source = { -4, 1, 2, 3, 9, null };
 
             IQueryable<long?> cast = source.AsQueryable().Cast<long?>();
             Assert.Throws<InvalidCastException>(() => cast.ToList());
@@ -195,7 +195,7 @@ public void ThrowCastingNullableIntToNullableLong()
         [Fact]
         public void CastingNullToNonnullableIsNullReferenceException()
         {
-            int?[] source = new int?[] { -4, 1, null, 3 };
+            int?[] source = { -4, 1, null, 3 };
             IQueryable<int> cast = source.AsQueryable().Cast<int>();
             Assert.Throws<NullReferenceException>(() => cast.ToList());
         }
@@ -209,7 +209,7 @@ public void NullSource()
         [Fact]
         public void Cast()
         {
-            var count = (new object[] { 0, 1, 2 }).AsQueryable().Cast<int>().Count();
+            var count = new object[] { 0, 1, 2 }.AsQueryable().Cast<int>().Count();
             Assert.Equal(3, count);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/ConcatTests.cs b/src/libraries/System.Linq.Queryable/tests/ConcatTests.cs
@@ -40,7 +40,7 @@ public void SecondNull()
         [Fact]
         public void Concat()
         {
-            var count = (new int[] { 0, 1, 2 }).AsQueryable().Concat((new int[] { 10, 11, 12 }).AsQueryable()).Count();
+            var count = new[] { 0, 1, 2 }.AsQueryable().Concat(new[] { 10, 11, 12 }.AsQueryable()).Count();
             Assert.Equal(6, count);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/ContainsTests.cs b/src/libraries/System.Linq.Queryable/tests/ContainsTests.cs
@@ -62,14 +62,14 @@ public void NullSource()
         [Fact]
         public void Contains1()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Contains(1);
+            var val = new[] { 0, 2, 1 }.AsQueryable().Contains(1);
             Assert.True(val);
         }
 
         [Fact]
         public void Contains2()
         {
-            var val = (new int[] { 0, 2, 1 }).AsQueryable().Contains(1, EqualityComparer<int>.Default);
+            var val = new[] { 0, 2, 1 }.AsQueryable().Contains(1, EqualityComparer<int>.Default);
             Assert.True(val);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/CountTests.cs b/src/libraries/System.Linq.Queryable/tests/CountTests.cs
@@ -56,14 +56,14 @@ public void NullPredicateUsed()
         [Fact]
         public void Count1()
         {
-            var count = (new int[] { 0 }).AsQueryable().Count();
+            var count = new[] { 0 }.AsQueryable().Count();
             Assert.Equal(1, count);
         }
 
         [Fact]
         public void Count2()
         {
-            var count = (new int[] { 0, 1, 2 }).AsQueryable().Count(n => n > 0);
+            var count = new[] { 0, 1, 2 }.AsQueryable().Count(n => n > 0);
             Assert.Equal(2, count);
         }
     }

diff --git a/src/libraries/System.Linq.Queryable/tests/DefaultIfEmptyTests.cs b/src/libraries/System.Linq.Queryable/tests/DefaultIfEmptyTests.cs
@@ -65,14 +65,14 @@ public void NullSource()
         [Fact]
         public void DefaultIfEmpty1()
         {
-            var count = (new int[] { }).AsQueryable().DefaultIfEmpty().Count();
+            var count = new int[] { }.AsQueryable().DefaultIfEmpty().Count();
             Assert.Equal(1, count);
         }
 
         [Fact]
         public void DefaultIfEmpty2()
         {
-            var count = (new int[] { }).AsQueryable().DefaultIfEmpty(3).Count();
+            var count = new int[] { }.AsQueryable().DefaultIfEmpty(3).Count();
             Assert.Equal(1, count);
         }
 

diff --git a/src/libraries/System.Linq.Queryable/tests/DistinctTests.cs b/src/libraries/System.Linq.Queryable/tests/DistinctTests.cs
@@ -68,14 +68,14 @@ public void NullSourceCustomComparer()
         [Fact]
         public void Distinct1()
         {
-            var count = (new int[] { 0, 1, 2, 2, 0 }).AsQueryable().Distinct().Count();
+            var count = new[] { 0, 1, 2, 2, 0 }.AsQueryable().Distinct().Count();
             Assert.Equal(3, count);
         }
 
         [Fact]
         public void Distinct2()
         {
-            var count = (new int[] { 0, 1, 2, 2, 0 }).AsQueryable().Distinct(EqualityComparer<int>.Default).Count();
+            var count = new[] { 0, 1, 2, 2, 0 }.AsQueryable().Distinct(EqualityComparer<int>.Default).Count();
             Assert.Equal(3, count);
         }
 

diff --git a/src/libraries/System.Linq.Queryable/tests/EnumerableQueryTests.cs b/src/libraries/System.Linq.Queryable/tests/EnumerableQueryTests.cs
@@ -39,7 +39,7 @@ public void InappropriateExpressionType()
         public void WrapsEnumerableInExpression()
         {
             int[] source = { 1, 2, 3 };
-            IQueryable<int> query = (source).AsQueryable();
+            IQueryable<int> query = source.AsQueryable();
             var exp = (ConstantExpression)query.Expression;
             Assert.Equal(source, (IEnumerable<int>)exp.Value);
         }

diff --git a/src/libraries/System.Linq.Queryable/tests/ExceptTests.cs b/src/libraries/System.Linq.Queryable/tests/ExceptTests.cs
@@ -76,14 +76,14 @@ public void SecondNullNoComparer()
         [Fact]
         public void Except1()
         {
-            var count = (new int[] { 0, 1, 2 }).AsQueryable().Except((new int[] { 1, 2, 3 }).AsQueryable()).Count();
+            var count = new[] { 0, 1, 2 }.AsQueryable().Except(new[] { 1, 2, 3 }.AsQueryable()).Count();
             Assert.Equal(1, count);
         }
 
         [Fact]
         public void Except2()
         {
-            var count = (new int[] { 0, 1, 2 }).AsQueryable().Except((new int[] { 1, 2, 3 }).AsQueryable(), EqualityComparer<int>.Default).Count();
+            var count = new[] { 0, 1, 2 }.AsQueryable().Except(new[] { 1, 2, 3 }.AsQueryable(), EqualityComparer<int>.Default).Count();
             Assert.Equal(1, count);
         }