[RuntimeAsync] Switch the implementation to the new shape of runtime async methods. (#2818)

* update Roslyn ref to one that uses new IL shape

* part1

* IsAsyncThunkMethod --> IsAsyncHelperMethod

* reintroduce IsAsyncThunkMethod

* fix shared generic test

* fix after rebasing

* typo

* clarified a comment

* PR feedback

Co-authored-by: Jakob Botsch Nielsen <[email protected]>

* switch to a newer Roslyn prototype

* workaround - moved `GC.Collect/WFPF` into a noinline helper.

* PR feedback

* Revert "workaround - moved `GC.Collect/WFPF` into a noinline helper."

This reverts commit ef45803.

* reenable tiering for async methods

* more  isThunk-->isHelper  renames

* fixes tiered compilation

* switch to a new ROslyn SHA

* A few fixes after updating to new Roslyn compiler

* add a testcase for PGO/OSR

* PR feedback

* file rename

* 4 iterations / 100 msec delay

---------

Co-authored-by: Jakob Botsch Nielsen <[email protected]>

Author: VSadov

buildroslynnugets.cmd

@@ -1,7 +1,7 @@
 setlocal ENABLEEXTENSIONS
 pushd %~dp0
-set ASYNC_ROSLYN_COMMIT=fa251ef06afcc9d1c79761a112b89c6341c0ccfa
-set ASYNC_SUFFIX=async-10
+set ASYNC_ROSLYN_COMMIT=10a5611cb10cd64876a2638664f0740255197e1b
+set ASYNC_SUFFIX=async-11
 set ASYNC_ROSLYN_BRANCH=demos/async2-experiment1
 
 cd ..

eng/Versions.props

@@ -43,9 +43,9 @@
       Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
       they do not break the local dev experience.
     -->
-    <MicrosoftCodeAnalysisCSharpVersion>4.13.0-async-10</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisVersion>4.13.0-async-10</MicrosoftCodeAnalysisVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.13.0-async-10</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.13.0-async-11</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisVersion>4.13.0-async-11</MicrosoftCodeAnalysisVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.13.0-async-11</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <!--
     For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

src/coreclr/inc/corcompile.h

@@ -180,7 +180,7 @@ enum EncodeMethodSigFlags
     ENCODE_METHOD_SIG_Constrained               = 0x20,
     ENCODE_METHOD_SIG_OwnerType                 = 0x40,
     ENCODE_METHOD_SIG_UpdateContext             = 0x80,
-    ENCODE_METHOD_SIG_AsyncThunk                = 0x100,
+    ENCODE_METHOD_SIG_AsyncHelper               = 0x100,
 };
 
 enum EncodeFieldSigFlags

src/coreclr/inc/corhdr.h

@@ -648,13 +648,15 @@ typedef enum CorMethodImpl
     miNoOptimization     =   0x0040,   // Method may not be optimized.
     miAggressiveOptimization = 0x0200, // Method may contain hot code and should be aggressively optimized.
 
+    miAsync              =   0x0400,   // Method requires async state machine rewrite.
+
     // These are the flags that are allowed in MethodImplAttribute's Value
     // property. This should include everything above except the code impl
     // flags (which are used for MethodImplAttribute's MethodCodeType field).
     miUserMask           =   miManagedMask | miForwardRef | miPreserveSig |
                              miInternalCall | miSynchronized |
                              miNoInlining | miAggressiveInlining |
-                             miNoOptimization | miAggressiveOptimization,
+                             miNoOptimization | miAggressiveOptimization | miAsync,
 
     miMaxMethodImplVal   =   0xffff,   // Range check value
 } CorMethodImpl;
@@ -678,6 +680,7 @@ typedef enum CorMethodImpl
 #define IsMiAggressiveInlining(x)           ((x) & miAggressiveInlining)
 #define IsMiNoOptimization(x)               ((x) & miNoOptimization)
 #define IsMiAggressiveOptimization(x)       (((x) & (miAggressiveOptimization | miNoOptimization)) == miAggressiveOptimization)
+#define IsMiAsync(x)                        ((x) & miAsync)
 
 // PinvokeMap attr bits, used by DefinePinvokeMap.
 typedef enum  CorPinvokeMap

src/coreclr/vm/class.cpp

@@ -741,7 +741,7 @@ HRESULT EEClass::AddMethodDesc(
                                                             classification,
                                                             TRUE, // fNonVtableSlot
                                                             TRUE, // fNativeCodeSlot
-                                                            FALSE, /* IsAsyncThunkMethod */
+                                                            FALSE, /* HasAsyncMethodData */
                                                             pMT,
                                                             &dummyAmTracker);
 
@@ -791,7 +791,7 @@ HRESULT EEClass::AddMethodDesc(
                                 pImport,
                                 NULL,
                                 Signature(),
-                                AsyncMethodType::NotAsync
+                                AsyncMethodKind::NotAsync
                                 COMMA_INDEBUG(debug_szMethodName)
                                 COMMA_INDEBUG(pMT->GetDebugClassName())
                                 COMMA_INDEBUG(NULL)

src/coreclr/vm/clrtocomcall.cpp

@@ -230,7 +230,7 @@ I4ARRAYREF SetUpWrapperInfo(MethodDesc *pMD)
 
         GCX_PREEMP();
 
-        if (pMD->IsAsyncThunkMethod())
+        if (pMD->IsAsyncHelperMethod())
         {
             ThrowHR(COR_E_NOTSUPPORTED);
         }
@@ -509,7 +509,7 @@ UINT32 CLRToCOMLateBoundWorker(
     LPCUTF8 strMemberName;
     ULONG uSemantic;
 
-    if (pItfMD->IsAsyncThunkMethod())
+    if (pItfMD->IsAsyncHelperMethod())
     {
         ThrowHR(COR_E_NOTSUPPORTED);
     }

src/coreclr/vm/clsload.cpp

@@ -2802,7 +2802,7 @@ TypeHandle ClassLoader::PublishType(const TypeKey *pTypeKey, TypeHandle typeHnd)
         {
             MethodDesc * pMD = it.GetMethodDesc();
             CONSISTENCY_CHECK(pMD != NULL && pMD->GetMethodTable() == pMT);
-            if (!pMD->IsUnboxingStub() && !pMD->IsAsyncThunkMethod())
+            if (!pMD->IsUnboxingStub() && !pMD->IsAsyncHelperMethod())
             {
                 pModule->EnsuredStoreMethodDef(pMD->GetMemberDef(), pMD);
             }

src/coreclr/vm/codeman.cpp

@@ -3892,6 +3892,7 @@ BOOL EEJitManager::JitCodeToMethodInfo(
 
     if (ppMethodDesc)
     {
+
         *ppMethodDesc = pCHdr->GetMethodDesc();
     }
     return TRUE;

src/coreclr/vm/commodule.cpp

@@ -302,7 +302,7 @@ extern "C" INT32 QCALLTYPE ModuleBuilder_GetMemberRefOfMethodInfo(QCall::ModuleH
         COMPlusThrow(kNotSupportedException);
     }
 
-    if ((pMeth->GetMethodTable()->GetModule() == pModule) && !pMeth->IsAsyncThunkMethod())
+    if ((pMeth->GetMethodTable()->GetModule() == pModule) && !pMeth->IsAsyncHelperMethod())
     {
         // If the passed in method is defined in the same module, just return the MethodDef token
         memberRefE = pMeth->GetMemberDef();

src/coreclr/vm/commtmemberinfomap.cpp

@@ -688,7 +688,7 @@ void ComMTMemberInfoMap::GetMethodPropsForMeth(
     // Generally don't munge function into a getter.
     rProps[ix].bFunction2Getter = FALSE;
 
-    if (pMeth->IsAsyncThunkMethod())
+    if (pMeth->IsAsyncHelperMethod())
         ThrowHR(COR_E_NOTSUPPORTED);
 
     // See if there is property information for this member.
@@ -1607,7 +1607,7 @@ void ComMTMemberInfoMap::PopulateMemberHashtable()
 
             // We are dealing with a method.
             MethodDesc *pMD = pProps->pMeth;
-            if (pMD->IsAsyncThunkMethod())
+            if (pMD->IsAsyncHelperMethod())
             {
                 ThrowHR(COR_E_NOTSUPPORTED); // Probably this isn't right, and instead should be a skip, but a throw makes it easier to find if this is wrong
             }