[Runtime Async] Add support for shared generics

README.md

@@ -12,7 +12,7 @@ Current support in the prototypes looks like the following:
 
 | **Feature/characteristic**               |  **JIT based state machines**  |  **Unwinder based state machines**  |
 |------------------------------------------|:------------------------------:|:-----------------------------------:|
-| **Generics**                             |               ❌               |                  ❌                 |
+| **Generics**                             |               ✅               |                  ❌                 |
 | **Byrefs live across suspension points** |               ❌               |                  ✅                 |
 | **Exception handling**                   |               ✅               |                  ❌                 |
 | **Returns via return buffers**           |               ✅               |                  ❌                 |

src/coreclr/vm/callhelpers.cpp

@@ -341,7 +341,7 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT *
 
 #ifndef FEATURE_INTERPRETER
         _ASSERTE(isCallConv(m_methodSig.GetCallingConvention(), IMAGE_CEE_CS_CALLCONV_DEFAULT));
-        _ASSERTE(!(m_methodSig.GetCallingConventionInfo() & CORINFO_CALLCONV_PARAMTYPE));
+        _ASSERTE(!m_methodSig.HasGenericContextArg());
 #endif
 
 #ifdef DEBUGGING_SUPPORTED

src/coreclr/vm/gcenv.ee.common.cpp

@@ -448,7 +448,7 @@ StackWalkAction GcStackCrawlCallBack(CrawlFrame* pCF, VOID* pData)
                     if (paramContextType == GENERIC_PARAM_CONTEXT_METHODDESC)
                     {
                         MethodDesc *pMDReal = dac_cast<PTR_MethodDesc>(pCF->GetParamTypeArg());
-                        _ASSERTE((pMDReal != NULL) || !pCF->IsFrameless());
+                        _ASSERTE((pMDReal != NULL) || !pCF->IsFrameless() || pMD->IsAsync2Method());
                         if (pMDReal != NULL)
                         {
                             GcReportLoaderAllocator(gcctx->f, gcctx->sc, pMDReal->GetLoaderAllocator());
@@ -457,7 +457,7 @@ StackWalkAction GcStackCrawlCallBack(CrawlFrame* pCF, VOID* pData)
                     else if (paramContextType == GENERIC_PARAM_CONTEXT_METHODTABLE)
                     {
                         MethodTable *pMTReal = dac_cast<PTR_MethodTable>(pCF->GetParamTypeArg());
-                        _ASSERTE((pMTReal != NULL) || !pCF->IsFrameless());
+                        _ASSERTE((pMTReal != NULL) || !pCF->IsFrameless() || pMD->IsAsync2Method());
                         if (pMTReal != NULL)
                         {
                             GcReportLoaderAllocator(gcctx->f, gcctx->sc, pMTReal->GetLoaderAllocator());

src/coreclr/vm/interpreter.cpp

@@ -970,7 +970,7 @@ CorJitResult Interpreter::GenerateInterpreterStub(CEEInfo* comp,
         totalArgs++;
     }
 
-    if (sig.GetCallingConventionInfo() & CORINFO_CALLCONV_PARAMTYPE)
+    if (sig.HasGenericContextArg())
     {
         _ASSERTE(info->args.callConv & CORINFO_CALLCONV_PARAMTYPE);
         hasGenericsContextArg = true;

src/coreclr/vm/jitinterface.cpp

@@ -14374,7 +14374,7 @@ static Signature BuildResumptionStubCalliSignature(MetaSig& msig, LoaderAllocato
         numArgs++;
     }
 
-    if ((msig.GetCallingConvention() & CORINFO_CALLCONV_PARAMTYPE) != 0)
+    if (msig.HasGenericContextArg())
     {
         numArgs++;
     }
@@ -14412,7 +14412,7 @@ static Signature BuildResumptionStubCalliSignature(MetaSig& msig, LoaderAllocato
         sigBuilder.AppendElementType(ELEMENT_TYPE_OBJECT);
     }
 #ifndef TARGET_X86
-    if ((msig.GetCallingConvention() & CORINFO_CALLCONV_PARAMTYPE) != 0)
+    if (msig.HasGenericContextArg())
     {
         sigBuilder.AppendElementType(ELEMENT_TYPE_I);
     }
@@ -14429,7 +14429,7 @@ static Signature BuildResumptionStubCalliSignature(MetaSig& msig, LoaderAllocato
     }
 
 #ifdef TARGET_X86
-    if ((msig.GetCallingConvention() & CORINFO_CALLCONV_PARAMTYPE) != 0)
+    if (msig.HasGenericContextArg())
     {
         sigBuilder.AppendElementType(ELEMENT_TYPE_I);
     }
@@ -14449,7 +14449,6 @@ CORINFO_METHOD_HANDLE CEEJitInfo::getAsyncResumptionStub()
     } CONTRACTL_END;
 
     MethodDesc* md = m_pMethodBeingCompiled;
-    _ASSERTE(!md->IsSharedByGenericInstantiations());
 
     LoaderAllocator* loaderAlloc = md->GetLoaderAllocator();
 
@@ -14473,10 +14472,9 @@ CORINFO_METHOD_HANDLE CEEJitInfo::getAsyncResumptionStub()
     }
 
 #ifndef TARGET_X86
-    if ((msig.GetCallingConvention() & CORINFO_CALLCONV_PARAMTYPE) != 0)
+    if (msig.HasGenericContextArg())
     {
-        _ASSERTE(!"Generic context currently unhandled");
-        // Will need JIT to store this in an agreed upon place.
+        pCode->EmitLDC(0);
         numArgs++;
     }
 
@@ -14498,9 +14496,15 @@ CORINFO_METHOD_HANDLE CEEJitInfo::getAsyncResumptionStub()
     }
 
 #ifdef TARGET_X86
+    if (msig.HasGenericContextArg())
+    {
+        pCode->EmitLDC(0);
+        numArgs++;
+    }
+
     // Continuation
     pCode->EmitLDARG(0);
-    nmArgs++;
+    numArgs++;
 #endif
 
     // Resumption stubs are uniquely coupled to the code version (since the

src/coreclr/vm/method.hpp

@@ -1457,7 +1457,7 @@ class MethodDesc
     PTR_PCODE GetAddrOfNativeCodeSlot();
     PTR_AsyncMethodData GetAddrOfAsyncMethodData();
 #ifndef DACCESS_COMPILE
-    const AsyncMethodData& GetAsyncMethodData() { _ASSERTE(IsAsyncThunkMethod()); return *GetAddrOfAsyncMethodData(); }
+    const AsyncMethodData& GetAsyncMethodData() { _ASSERTE(HasAsyncMethodData()); return *GetAddrOfAsyncMethodData(); }
 #endif
 
     BOOL MayHaveNativeCode();
@@ -1615,8 +1615,7 @@ class MethodDesc
 
     MethodDesc* GetAsyncOtherVariant()
     {
-        // TODO This should be FindOrCreateAssociatedMethodDesc with some set of params
-        return GetMethodTable()->GetParallelMethodDesc(this, AsyncVariantLookup::AsyncOtherVariant);
+        return FindOrCreateAssociatedMethodDesc(this, GetMethodTable(), FALSE, GetMethodInstantiation(), TRUE, FALSE, TRUE, AsyncVariantLookup::AsyncOtherVariant);
     }
 
     // True if a MD is an funny BoxedEntryPointStub (not from the method table) or
@@ -1995,6 +1994,8 @@ class MethodDesc
     bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
     void EmitJitStateMachineBasedRuntimeAsyncThunk(MethodDesc* pAsyncOtherVariant, MetaSig& thunkMsig, ILStubLinker* pSL);
     void EmitAsync2MethodThunk(MethodDesc* pAsyncOtherVariant, MetaSig& msig, ILStubLinker* pSL);
+    SigPointer GetAsync2ThunkResultTypeSig();
+    int GetTokenForGenericMethodCallWithAsyncReturnType(ILCodeStream* pCode, MethodDesc* md);
 public:
     static void CreateDerivedTargetSigWithExtraParams(MetaSig& msig, SigBuilder* stubSigBuilder);
     bool TryGenerateTransientILImplementation(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);