Skip to content

Resolve dllimport.cpp runtimeasync todos #122466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 9 commits into from
Dec 27, 2025
Merged

Resolve dllimport.cpp runtimeasync todos #122466

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3112d49
Resolve dllimport.cpp runtimeasync todos.
jkoritzinsky Dec 11, 2025
ab72707
Rewrite to block loading a p/invoke method or jitting a UCO method wi…
jkoritzinsky Dec 15, 2025
75d06b5
Update error checks and add some tests
jkoritzinsky Dec 17, 2025
309f18b
Update src/coreclr/dlls/mscorrc/resource.h
jkotas Dec 17, 2025
d42f2f8
Update expected exception types (saw one locally, saw the other on CI)
jkoritzinsky Dec 17, 2025
ff66ca3
Merge branch 'runtime-async-dllimport' of https://github.com/jkoritzi…
jkoritzinsky Dec 17, 2025
d51b84a
Update ILC/R2R to understand the rules around pinvokes and UCO.
jkoritzinsky Dec 23, 2025
8d8fcdb
Fix build and block async delegate methods in ILC.
jkoritzinsky Dec 26, 2025
0d9dcb1
Remove trailing whitespace
jkoritzinsky Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ StubSigDesc::StubSigDesc(MethodDesc *pMD)
GC_NOTRIGGER;
SUPPORTS_DAC;
PRECONDITION(pMD != NULL);
PRECONDITION(!pMD->IsAsyncMethod());
Comment thread
jkoritzinsky marked this conversation as resolved.
}
CONTRACTL_END;

Expand All @@ -108,9 +109,6 @@ StubSigDesc::StubSigDesc(MethodDesc *pMD)
m_sig = pMD->GetSignature();
m_pModule = pMD->GetModule(); // Used for token resolution.

// TODO: (async) revisit and examine if this needs to be supported somehow
_ASSERTE(!pMD->IsAsyncMethod());

m_tkMethodDef = pMD->GetMemberDef();
SigTypeContext::InitTypeContext(pMD, &m_typeContext);
m_pMetadataModule = pMD->GetModule();
Expand Down Expand Up @@ -1131,7 +1129,6 @@ class ILStubState : public StubState
DWORD dwToken = 0;
if (pTargetMD)
{
// TODO: (async) revisit and examine if this needs to be supported somehow
_ASSERTE(!pTargetMD->IsAsyncVariantMethod());
dwToken = pTargetMD->GetMemberDef();
}
Expand Down Expand Up @@ -2779,7 +2776,10 @@ void PInvokeStaticSigInfo::DllImportInit(
IMDInternalImport *pInternalImport = pMD->GetMDImport();
CorPinvokeMap mappingFlags = pmMaxValue;
mdModuleRef modref = mdModuleRefNil;
// TODO: (async) revisit and examine if this needs to be supported somehow

// P/Invoke methods should never be marked as async.
// We don't support generating a P/Invoke stub for an async method.
// Instead, we should generate an async variant stub that calls the task-returning interop stub.
if (pMD->IsAsyncMethod())
ThrowHR(COR_E_NOTSUPPORTED);

Expand Down Expand Up @@ -3053,16 +3053,15 @@ namespace
STANDARD_VM_CHECK;
PRECONDITION(pMD != NULL);
PRECONDITION(pMD->IsPInvoke());
PRECONDITION(!pMD->IsAsyncMethod());
PRECONDITION(callConv != NULL);
}
CONTRACTL_END;

CorInfoCallConvExtension callConvLocal;
IMDInternalImport* pInternalImport = pMD->GetMDImport();
CorPinvokeMap mappingFlags = pmMaxValue;
// TODO: (async) revisit and examine if this needs to be supported somehow
if (pMD->IsAsyncMethod())
ThrowHR(COR_E_NOTSUPPORTED);

Comment thread
jkoritzinsky marked this conversation as resolved.

HRESULT hr = pInternalImport->GetPinvokeMap(pMD->GetMemberDef(), (DWORD*)&mappingFlags, NULL /*pszImportName*/, NULL /*pmrImportDLL*/);
if (FAILED(hr))
Expand Down Expand Up @@ -3324,9 +3323,9 @@ BOOL PInvoke::MarshalingRequired(
mdMethodDef methodToken = mdMethodDefNil;
if (pMD != NULL)
{
// TODO: (async) revisit and examine if this needs to be supported somehow
// Mark this as requiring marshalling so we go down the IL stub path that will throw the correct exception.
if (pMD->IsAsyncMethod())
ThrowHR(COR_E_NOTSUPPORTED);
return TRUE;

methodToken = pMD->GetMemberDef();
}
Expand Down Expand Up @@ -6082,7 +6081,9 @@ static void GetILStubForCalli(VASigCookie* pVASigCookie, MethodDesc* pMD)
{
PInvokeStaticSigInfo sigInfo(pMD);

// TODO: (async) revisit and examine if this needs to be supported somehow
// unmanaged vararg signatures should never be marked as async.
// We don't support generating a interop IL stub for an async method.
Comment thread
jkoritzinsky marked this conversation as resolved.
Outdated
// Instead, we should generate an async variant stub that calls the task-returning interop stub.
if (pMD->IsAsyncMethod())
ThrowHR(COR_E_NOTSUPPORTED);

Expand Down
Loading