Remove workarounds for MethodImplOptions.Async

agocke · agocke · commit 5ed0cee381d1 · 2025-05-13T18:38:39.000-07:00
diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <!-- Override the compiler version with a private build that supports async2 -->
-    <MicrosoftNetCompilersToolsetVersion>5.0.0-1.25258.11</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>5.0.0-1.25259.6</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/tests/async/awaitingnotasync.cs b/src/tests/async/awaitingnotasync.cs
@@ -34,7 +34,6 @@ private static async ValueTask<T> GetValueTask<T>(T arg)
 
     private static T sIdentity<T>(T arg) => arg;
 
-    [MethodImpl(MethodImplOptions.Async)]
     private static async Task AsyncEntryPoint()
     {
         // static field
diff --git a/src/tests/async/cse-array-index-byref.cs b/src/tests/async/cse-array-index-byref.cs
@@ -22,7 +22,7 @@ private static async Task AsyncTestEntryPoint(int[] arr, int index)
         await HoistedByref(arr, index);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<int> HoistedByref(int[] arr, int index)
     {
         for (int i = 0; i < 20000; i++)
diff --git a/src/tests/async/fibonacci-with-yields.cs b/src/tests/async/fibonacci-with-yields.cs
@@ -23,7 +23,6 @@ public static void Test()
         System.Console.WriteLine("allocated: " + allocated);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task AsyncEntry()
     {
         for (int i = 0; i < iterations; i++)
@@ -36,7 +35,6 @@ public static async Task AsyncEntry()
         }
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     static async Task<int> Fib(int i)
     {
         if (i <= 1)
diff --git a/src/tests/async/fibonacci-with-yields_struct_return.cs b/src/tests/async/fibonacci-with-yields_struct_return.cs
@@ -35,7 +35,6 @@ public struct MyInt
         public MyInt(int i) => this.i = i;
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task AsyncEntry()
     {
         for (int i = 0; i < iterations; i++)
@@ -48,7 +47,6 @@ public static async Task AsyncEntry()
         }
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     static async Task<MyInt> Fib(MyInt n)
     {
         int i = n.i;
diff --git a/src/tests/async/fibonacci-without-yields-config-await.cs b/src/tests/async/fibonacci-without-yields-config-await.cs
@@ -26,7 +26,6 @@ public static void Test()
         System.Console.WriteLine("allocated: " + allocated);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task AsyncEntry()
     {
         for (int i = 0; i < iterations; i++)
@@ -39,7 +38,6 @@ public static async Task AsyncEntry()
         }
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     static async Task<int> Fib(int i)
     {
         if (i <= 1)
diff --git a/src/tests/async/fibonacci-without-yields.cs b/src/tests/async/fibonacci-without-yields.cs
@@ -23,7 +23,6 @@ public static void Test()
         System.Console.WriteLine("allocated: " + allocated);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task AsyncEntry()
     {
         for (int i = 0; i < iterations; i++)
@@ -36,7 +35,6 @@ public static async Task AsyncEntry()
         }
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     static async Task<int> Fib(int i)
     {
         if (i <= 1)
diff --git a/src/tests/async/object.cs b/src/tests/async/object.cs
@@ -20,7 +20,7 @@ private static async Task<object> AsyncTestEntryPoint(int arg)
         return await ObjMethod(arg);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<object> ObjMethod(int arg)
     {
         await Task.Yield();
diff --git a/src/tests/async/objects-captured.cs b/src/tests/async/objects-captured.cs
@@ -9,7 +9,6 @@
 
 public class Async2ObjectsWithYields
 {
-    [MethodImpl(MethodImplOptions.Async)]
     internal static async Task<int> A(object n)
     {
         // use string equality so that JIT would not think of hoisting "(int)n"
diff --git a/src/tests/async/override.cs b/src/tests/async/override.cs
@@ -10,7 +10,6 @@ public class Async2Override
 {
     class Base
     {
-        [MethodImpl(MethodImplOptions.Async)]
         public virtual async Task<int> M1()
         {
             await Task.Yield();
@@ -30,7 +29,6 @@ public override async Task<int> M1()
 
     class Derived2 : Derived1
     {
-        [MethodImpl(MethodImplOptions.Async)]
         public override async Task<int> M1()
         {
             await Task.Yield();
@@ -51,7 +49,6 @@ public virtual async Task<int> M1()
 
     class Derived11 : Base1
     {
-        [MethodImpl(MethodImplOptions.Async)]
         public override async Task<int> M1()
         {
             await Task.Yield();
diff --git a/src/tests/async/pgo.cs b/src/tests/async/pgo.cs
@@ -17,7 +17,6 @@ public static void EntryPoint()
         AsyncEntryPoint().Wait();
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     internal static async Task<int> AsyncEntryPoint()
     {
         int[] arr = Enumerable.Range(0, 100_000).ToArray();
@@ -37,7 +36,6 @@ internal static async Task<int> AsyncEntryPoint()
     private class AggregateSum : I<int>
     {
 #pragma warning disable CS1998
-        [MethodImpl(MethodImplOptions.Async)]
         public async Task<int> Aggregate(int a, int b) => a + b;
     }
 
@@ -46,7 +44,7 @@ public interface I<T>
         public Task<T> Aggregate(T seed, T val);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public static async Task<T> AggregateDelegateAsync<T>(T[] arr, I<T> aggregate, T seed)
     {
         foreach (T val in arr)
diff --git a/src/tests/async/pinvoke.cs b/src/tests/async/pinvoke.cs
@@ -14,7 +14,6 @@ public static void TestEntryPoint()
         AsyncEntryPoint().Wait();
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     private static async Task AsyncEntryPoint()
     {
         unsafe
diff --git a/src/tests/async/returns.cs b/src/tests/async/returns.cs
@@ -14,7 +14,7 @@ public static void TestEntryPoint()
         Returns(new C()).Wait();
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task Returns(C c)
     {
         for (int i = 0; i < 20000; i++)
@@ -57,28 +57,28 @@ private static void AssertEqual<T>(T expected, T actual)
         Assert.Equal(expected, actual);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<S<long>> ReturnsStruct()
     {
         await Task.Yield();
         return new S<long> { A = 42, B = 4242, C = 424242, D = 42424242 };
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<S<string>> ReturnsStructGC()
     {
         await Task.Yield();
         return new S<string> { A = "A", B = "B", C = "C", D = "D" };
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<S<byte>> ReturnsBytes()
     {
         await Task.Yield();
         return new S<byte> { A = 4, B = 40, C = 42, D = 45 };
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task<string> ReturnsString()
     {
         await Task.Yield();
diff --git a/src/tests/async/shared-generic.cs b/src/tests/async/shared-generic.cs
@@ -66,7 +66,6 @@ private static async Task Async1EntryPoint<T>(Type t, T value)
         Assert.Equal(value, await GenericClass<T>.StaticReturnMethodTypeAsync1<T>(value));
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     private static async Task Async2EntryPoint<T>(Type t, T value)
     {
         await new GenericClass<T>().InstanceMethod(t);
@@ -85,7 +84,7 @@ private static async Task Async2EntryPoint<T>(Type t, T value)
 public class GenericClass<T>
 {
     // 'this' is context
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task InstanceMethod(Type t)
     {
         Assert.Equal(typeof(T), t);
@@ -94,7 +93,7 @@ public async Task InstanceMethod(Type t)
     }
 
     // Class context
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public static async Task StaticMethod(Type t)
     {
         Assert.Equal(typeof(T), t);
@@ -103,7 +102,7 @@ public static async Task StaticMethod(Type t)
     }
 
     // Method context
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public static async Task StaticMethod<TM>(Type t, Type tm)
     {
         Assert.Equal(typeof(T), t);
@@ -135,14 +134,12 @@ public static async Task StaticMethodAsync1<TM>(Type t, Type tm)
         Assert.Equal(typeof(TM), tm);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task<T> StaticReturnClassType(T value)
     {
         await Task.Yield();
         return value;
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task<TM> StaticReturnMethodType<TM>(TM value)
     {
         await Task.Yield();
diff --git a/src/tests/async/simple-eh.cs b/src/tests/async/simple-eh.cs
@@ -25,7 +25,6 @@ public static async Task AsyncEntry()
         Assert.Equal(42, result);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     public static async Task<int> Handler()
     {
         try
@@ -38,7 +37,7 @@ public static async Task<int> Handler()
         }
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     public static async Task<int> Throw(int value)
     {
         await Task.Yield();
diff --git a/src/tests/async/simple-eh.csproj b/src/tests/async/simple-eh.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Optimize>True</Optimize>
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/async/small.cs b/src/tests/async/small.cs
@@ -14,7 +14,7 @@ public static void TestEntryPoint()
         SmallType(123).Wait();
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.Async)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
     private static async Task SmallType(byte arg)
     {
         await Task.Yield();
diff --git a/src/tests/async/struct.cs b/src/tests/async/struct.cs
@@ -25,7 +25,6 @@ private static async Task Async()
         AssertEqual(100, s.Value);
     }
 
-    [MethodImpl(MethodImplOptions.Async)]
     private static async Task Async2()
     {
         S s = new S(100);

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ private static async ValueTask<T> GetValueTask<T>(T arg)`
`34`	`34`
`35`	`35`	`private static T sIdentity<T>(T arg) => arg;`
`36`	`36`
`37`		`- [MethodImpl(MethodImplOptions.Async)]`
`38`	`37`	`private static async Task AsyncEntryPoint()`
`39`	`38`	`{`
`40`	`39`	`// static field`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ private static async Task AsyncTestEntryPoint(int[] arr, int index)`
`22`	`22`	`await HoistedByref(arr, index);`
`23`	`23`	`}`
`24`	`24`
`25`		`- [MethodImpl(MethodImplOptions.NoInlining \| MethodImplOptions.Async)]`
	`25`	`+ [MethodImpl(MethodImplOptions.NoInlining)]`
`26`	`26`	`private static async Task<int> HoistedByref(int[] arr, int index)`
`27`	`27`	`{`
`28`	`28`	`for (int i = 0; i < 20000; i++)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public static void Test()`
`23`	`23`	`System.Console.WriteLine("allocated: " + allocated);`
`24`	`24`	`}`
`25`	`25`
`26`		`- [MethodImpl(MethodImplOptions.Async)]`
`27`	`26`	`public static async Task AsyncEntry()`
`28`	`27`	`{`
`29`	`28`	`for (int i = 0; i < iterations; i++)`
`@@ -36,7 +35,6 @@ public static async Task AsyncEntry()`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
`39`		`- [MethodImpl(MethodImplOptions.Async)]`
`40`	`38`	`static async Task<int> Fib(int i)`
`41`	`39`	`{`
`42`	`40`	`if (i <= 1)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public struct MyInt`
`35`	`35`	`public MyInt(int i) => this.i = i;`
`36`	`36`	`}`
`37`	`37`
`38`		`- [MethodImpl(MethodImplOptions.Async)]`
`39`	`38`	`public static async Task AsyncEntry()`
`40`	`39`	`{`
`41`	`40`	`for (int i = 0; i < iterations; i++)`
`@@ -48,7 +47,6 @@ public static async Task AsyncEntry()`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`
`51`		`- [MethodImpl(MethodImplOptions.Async)]`
`52`	`50`	`static async Task<MyInt> Fib(MyInt n)`
`53`	`51`	`{`
`54`	`52`	`int i = n.i;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ public static void Test()`
`26`	`26`	`System.Console.WriteLine("allocated: " + allocated);`
`27`	`27`	`}`
`28`	`28`
`29`		`- [MethodImpl(MethodImplOptions.Async)]`
`30`	`29`	`public static async Task AsyncEntry()`
`31`	`30`	`{`
`32`	`31`	`for (int i = 0; i < iterations; i++)`
`@@ -39,7 +38,6 @@ public static async Task AsyncEntry()`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`		`- [MethodImpl(MethodImplOptions.Async)]`
`43`	`41`	`static async Task<int> Fib(int i)`
`44`	`42`	`{`
`45`	`43`	`if (i <= 1)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ private static async Task<object> AsyncTestEntryPoint(int arg)`
`20`	`20`	`return await ObjMethod(arg);`
`21`	`21`	`}`
`22`	`22`
`23`		`- [MethodImpl(MethodImplOptions.NoInlining \| MethodImplOptions.Async)]`
	`23`	`+ [MethodImpl(MethodImplOptions.NoInlining)]`
`24`	`24`	`private static async Task<object> ObjMethod(int arg)`
`25`	`25`	`{`
`26`	`26`	`await Task.Yield();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`public class Async2ObjectsWithYields`
`11`	`11`	`{`
`12`		`- [MethodImpl(MethodImplOptions.Async)]`
`13`	`12`	`internal static async Task<int> A(object n)`
`14`	`13`	`{`
`15`	`14`	`// use string equality so that JIT would not think of hoisting "(int)n"`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public class Async2Override`
`10`	`10`	`{`
`11`	`11`	`class Base`
`12`	`12`	`{`
`13`		`- [MethodImpl(MethodImplOptions.Async)]`
`14`	`13`	`public virtual async Task<int> M1()`
`15`	`14`	`{`
`16`	`15`	`await Task.Yield();`
`@@ -30,7 +29,6 @@ public override async Task<int> M1()`
`30`	`29`
`31`	`30`	`class Derived2 : Derived1`
`32`	`31`	`{`
`33`		`- [MethodImpl(MethodImplOptions.Async)]`
`34`	`32`	`public override async Task<int> M1()`
`35`	`33`	`{`
`36`	`34`	`await Task.Yield();`
`@@ -51,7 +49,6 @@ public virtual async Task<int> M1()`
`51`	`49`
`52`	`50`	`class Derived11 : Base1`
`53`	`51`	`{`
`54`		`- [MethodImpl(MethodImplOptions.Async)]`
`55`	`52`	`public override async Task<int> M1()`
`56`	`53`	`{`
`57`	`54`	`await Task.Yield();`