Skip to content

Collapse the recent ILStub generation patterns into a helper #115673

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
AaronRobinsonMSFT merged 5 commits into from
May 19, 2025
Merged

Collapse the recent ILStub generation patterns into a helper #115673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
091efec
Collapse the recent ILStub generation patterns into helper
AaronRobinsonMSFT May 16, 2025
42f0a77
Feedback.
AaronRobinsonMSFT May 16, 2025
776a4a5
Convert standalone function to instance function.
AaronRobinsonMSFT May 17, 2025
d5365db
Feedback.
AaronRobinsonMSFT May 17, 2025
f622f67
Feedback
AaronRobinsonMSFT May 17, 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
32 changes: 3 additions & 29 deletions src/coreclr/vm/asyncthunks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,8 @@ bool MethodDesc::TryGenerateAsyncThunk(DynamicResolver** resolver, COR_ILMETHOD_
ilResolver->SetStubTargetMethodDesc(pAsyncOtherVariant);

// Generate all IL associated data for JIT
{
UINT maxStack;
size_t cbCode = sl.Link(&maxStack);
DWORD cbSig = sl.GetLocalSigSize();

COR_ILMETHOD_DECODER* pILHeader = ilResolver->AllocGeneratedIL(cbCode, cbSig, maxStack);
BYTE* pbBuffer = (BYTE*)pILHeader->Code;
BYTE* pbLocalSig = (BYTE*)pILHeader->LocalVarSig;
_ASSERTE(cbSig == pILHeader->cbLocalVarSig);

size_t numEH = sl.GetNumEHClauses();
if (numEH > 0)
{
sl.WriteEHClauses(ilResolver->AllocEHSect(numEH));
}

sl.GenerateCode(pbBuffer, cbCode);
sl.GetLocalSig(pbLocalSig, cbSig);

// Store the token lookup map
ilResolver->SetTokenLookupMap(sl.GetTokenLookupMap());
ilResolver->SetJitFlags(CORJIT_FLAGS(CORJIT_FLAGS::CORJIT_FLAG_IL_STUB));

*resolver = (DynamicResolver*)ilResolver;
*methodILDecoder = pILHeader;
}

ilResolver.SuppressRelease();
*methodILDecoder = ilResolver->FinalizeILStub(&sl);
*resolver = ilResolver.Extract();
return true;
}

Expand Down Expand Up @@ -564,7 +538,7 @@ void MethodDesc::EmitAsyncMethodThunk(MethodDesc* pAsyncOtherVariant, MetaSig& m
getIsCompletedToken = GetTokenForGenericTypeMethodCallWithAsyncReturnType(pCode, mdIsCompleted);
getResultToken = GetTokenForGenericTypeMethodCallWithAsyncReturnType(pCode, mdGetResult);
}
else
else
{
getAwaiterToken = pCode->GetToken(mdGetAwaiter);
getIsCompletedToken = pCode->GetToken(mdIsCompleted);
Expand Down
23 changes: 2 additions & 21 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6483,27 +6483,8 @@ bool GenerateCopyConstructorHelper(MethodDesc* ftn, DynamicResolver** ppResolver
pCode->EmitRET();

// Generate all IL associated data for JIT
{
UINT maxStack;
size_t cbCode = sl.Link(&maxStack);
DWORD cbSig = sl.GetLocalSigSize();

COR_ILMETHOD_DECODER* pILHeader = ilResolver->AllocGeneratedIL(cbCode, cbSig, maxStack);
BYTE* pbBuffer = (BYTE*)pILHeader->Code;
BYTE* pbLocalSig = (BYTE*)pILHeader->LocalVarSig;
_ASSERTE(cbSig == pILHeader->cbLocalVarSig);
sl.GenerateCode(pbBuffer, cbCode);
sl.GetLocalSig(pbLocalSig, cbSig);

// Store the token lookup map
ilResolver->SetTokenLookupMap(sl.GetTokenLookupMap());
ilResolver->SetJitFlags(CORJIT_FLAGS(CORJIT_FLAGS::CORJIT_FLAG_IL_STUB));

*ppResolver = (DynamicResolver*)ilResolver;
*ppHeader = pILHeader;
}

ilResolver.SuppressRelease();
*ppHeader = ilResolver->FinalizeILStub(&sl);
*ppResolver = ilResolver.Extract();
return true;
}

Expand Down
26 changes: 1 addition & 25 deletions src/coreclr/vm/ilstubcache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,33 +97,9 @@ MethodDesc* ILStubCache::CreateAndLinkNewILStubMethodDesc(LoaderAllocator* pAllo

pResolver->SetStubMethodDesc(pStubMD);


{
UINT maxStack;
size_t cbCode = pStubLinker->Link(&maxStack);
DWORD cbSig = pStubLinker->GetLocalSigSize();

COR_ILMETHOD_DECODER * pILHeader = pResolver->AllocGeneratedIL(cbCode, cbSig, maxStack);
BYTE * pbBuffer = (BYTE *)pILHeader->Code;
BYTE * pbLocalSig = (BYTE *)pILHeader->LocalVarSig;
_ASSERTE(cbSig == pILHeader->cbLocalVarSig);

size_t numEH = pStubLinker->GetNumEHClauses();
if (numEH > 0)
{
pStubLinker->WriteEHClauses(pResolver->AllocEHSect(numEH));
}

pStubLinker->GenerateCode(pbBuffer, cbCode);
pStubLinker->GetLocalSig(pbLocalSig, cbSig);

pResolver->SetJitFlags(CORJIT_FLAGS(CORJIT_FLAGS::CORJIT_FLAG_IL_STUB));
}

pResolver->SetTokenLookupMap(pStubLinker->GetTokenLookupMap());
pResolver->FinalizeILStub(pStubLinker);

RETURN pStubMD;

}


Expand Down
182 changes: 91 additions & 91 deletions src/coreclr/vm/ilstubresolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,74 +282,101 @@ void ILStubResolver::GetEHInfo(unsigned EHnumber, CORINFO_EH_CLAUSE* clause)
clause->FilterOffset = ehInfo->GetFilterOffset();
}

void ILStubResolver::SetStubMethodDesc(MethodDesc* pStubMD)
//---------------------------------------------------------------------------------------
//
ILStubResolver::ILStubResolver() :
m_pCompileTimeState(dac_cast<PTR_CompileTimeState>(ILNotYetGenerated)),
m_pStubMD(dac_cast<PTR_MethodDesc>(nullptr)),
m_pStubTargetMD(dac_cast<PTR_MethodDesc>(nullptr)),
m_jitFlags(),
m_loaderHeap(dac_cast<PTR_LoaderHeap>(nullptr))
{
LIMITED_METHOD_CONTRACT;
m_pStubMD = PTR_MethodDesc(pStubMD);
}

void ILStubResolver::SetStubTargetMethodDesc(MethodDesc* pStubTargetMD)
bool ILStubResolver::IsCompiled()
{
LIMITED_METHOD_CONTRACT;
m_pStubTargetMD = PTR_MethodDesc(pStubTargetMD);
return (dac_cast<TADDR>(m_pCompileTimeState) == ILGeneratedAndFreed);
}


//---------------------------------------------------------------------------------------
//
void
ILStubResolver::SetStubTargetMethodSig(
PCCOR_SIGNATURE pStubTargetMethodSig,
DWORD cbStubTargetSigLength)
bool ILStubResolver::IsILGenerated()
{
CONTRACTL
{
STANDARD_VM_CHECK;
PRECONDITION(CheckPointer(m_pCompileTimeState));
}
CONTRACTL_END;
LIMITED_METHOD_CONTRACT;
return (dac_cast<TADDR>(m_pCompileTimeState) != ILNotYetGenerated);
}

NewArrayHolder<BYTE> pNewSig = new BYTE[cbStubTargetSigLength];
MethodDesc* ILStubResolver::GetStubMethodDesc()
{
LIMITED_METHOD_CONTRACT;
return m_pStubMD;
}

memcpyNoGCRefs((void *)pNewSig, pStubTargetMethodSig, cbStubTargetSigLength);
MethodDesc* ILStubResolver::GetStubTargetMethodDesc()
{
LIMITED_METHOD_CONTRACT;
return m_pStubTargetMD;
}

m_pCompileTimeState->m_StubTargetMethodSig = SigPointer(pNewSig, cbStubTargetSigLength);
pNewSig.SuppressRelease();
COR_ILMETHOD_DECODER* ILStubResolver::GetILHeader()
{
LIMITED_METHOD_CONTRACT;
_ASSERTE(m_pCompileTimeState != NULL);
return &m_pCompileTimeState->m_ILHeader;
}

//---------------------------------------------------------------------------------------
//
MethodDesc *
ILStubResolver::GetStubTargetMethodDesc()
#ifndef DACCESS_COMPILE
void ILStubResolver::SetLoaderHeap(PTR_LoaderHeap pLoaderHeap)
{
LIMITED_METHOD_CONTRACT;
return m_pStubTargetMD;
m_loaderHeap = pLoaderHeap;
}

MethodDesc* ILStubResolver::GetStubMethodDesc()
void ILStubResolver::SetTokenLookupMap(TokenLookupMap* pMap)
{
STANDARD_VM_CONTRACT;
_ASSERTE(m_pCompileTimeState != NULL);

// run copy ctor
new (&m_pCompileTimeState->m_tokenLookupMap) TokenLookupMap(pMap);
}

void ILStubResolver::SetJitFlags(CORJIT_FLAGS jitFlags)
{
LIMITED_METHOD_CONTRACT;
return m_pStubMD;
m_jitFlags = jitFlags;
}

ILStubResolver::ILStubResolver() :
m_pCompileTimeState(dac_cast<PTR_CompileTimeState>(ILNotYetGenerated)),
m_pStubMD(dac_cast<PTR_MethodDesc>(nullptr)),
m_pStubTargetMD(dac_cast<PTR_MethodDesc>(nullptr)),
m_jitFlags(),
m_loaderHeap(dac_cast<PTR_LoaderHeap>(nullptr))
void ILStubResolver::SetStubMethodDesc(MethodDesc* pStubMD)
{
LIMITED_METHOD_CONTRACT;
m_pStubMD = PTR_MethodDesc(pStubMD);
}

void ILStubResolver::SetStubTargetMethodDesc(MethodDesc* pStubTargetMD)
{
LIMITED_METHOD_CONTRACT;
m_pStubTargetMD = PTR_MethodDesc(pStubTargetMD);
}

void ILStubResolver::SetLoaderHeap(PTR_LoaderHeap pLoaderHeap)
void ILStubResolver::SetStubTargetMethodSig(
PCCOR_SIGNATURE pStubTargetMethodSig,
DWORD cbStubTargetSigLength)
{
m_loaderHeap = pLoaderHeap;
STANDARD_VM_CONTRACT;
_ASSERTE(m_pCompileTimeState != NULL);

NewArrayHolder<BYTE> pNewSig = new BYTE[cbStubTargetSigLength];

memcpyNoGCRefs((void *)pNewSig, pStubTargetMethodSig, cbStubTargetSigLength);

m_pCompileTimeState->m_StubTargetMethodSig = SigPointer(pNewSig, cbStubTargetSigLength);
pNewSig.SuppressRelease();
}

static COR_ILMETHOD_DECODER CreateILHeader(size_t cbCode, UINT maxStack, BYTE* pNewILCodeBuffer, BYTE* pNewLocalSig, DWORD cbLocalSig)
{
LIMITED_METHOD_CONTRACT;
COR_ILMETHOD_DECODER ilHeader{};
ilHeader.CodeSize = (DWORD)cbCode;
ilHeader.MaxStack = maxStack;
Expand All @@ -359,17 +386,13 @@ static COR_ILMETHOD_DECODER CreateILHeader(size_t cbCode, UINT maxStack, BYTE* p
return ilHeader;
}

//---------------------------------------------------------------------------------------
//
COR_ILMETHOD_DECODER *
ILStubResolver::AllocGeneratedIL(
COR_ILMETHOD_DECODER* ILStubResolver::AllocGeneratedIL(
size_t cbCode,
DWORD cbLocalSig,
UINT maxStack)
{
STANDARD_VM_CONTRACT;

#if !defined(DACCESS_COMPILE)
_ASSERTE(0 != cbCode);

// Perform a single allocation for all needed memory
Expand Down Expand Up @@ -410,27 +433,37 @@ ILStubResolver::AllocGeneratedIL(
newMemory.SuppressRelease();
return pILHeader;

#else // DACCESS_COMPILE
DacNotImpl();
return NULL;

#endif // DACCESS_COMPILE
} // ILStubResolver::AllocGeneratedIL

//---------------------------------------------------------------------------------------
//
COR_ILMETHOD_DECODER* ILStubResolver::GetILHeader()
COR_ILMETHOD_DECODER* ILStubResolver::FinalizeILStub(ILStubLinker* sl)
{
CONTRACTL
STANDARD_VM_CONTRACT;
_ASSERTE(!IsILGenerated());
_ASSERTE(sl != NULL);

UINT maxStack;
size_t cbCode = sl->Link(&maxStack);
DWORD cbSig = sl->GetLocalSigSize();

COR_ILMETHOD_DECODER* pILHeader = AllocGeneratedIL(cbCode, cbSig, maxStack);
BYTE* pbBuffer = (BYTE*)pILHeader->Code;
BYTE* pbLocalSig = (BYTE*)pILHeader->LocalVarSig;
_ASSERTE(cbSig == pILHeader->cbLocalVarSig);

size_t numEH = sl->GetNumEHClauses();
if (numEH > 0)
{
MODE_ANY;
THROWS;
GC_NOTRIGGER;
PRECONDITION(CheckPointer(m_pCompileTimeState));
sl->WriteEHClauses(AllocEHSect(numEH));
}
CONTRACTL_END;

return &m_pCompileTimeState->m_ILHeader;
sl->GenerateCode(pbBuffer, cbCode);
sl->GetLocalSig(pbLocalSig, cbSig);

// Store the token lookup map
SetTokenLookupMap(sl->GetTokenLookupMap());
SetJitFlags(CORJIT_FLAGS(CORJIT_FLAGS::CORJIT_FLAG_IL_STUB));

return pILHeader;
}

COR_ILMETHOD_SECT_EH* ILStubResolver::AllocEHSect(size_t nClauses)
Expand All @@ -448,6 +481,7 @@ COR_ILMETHOD_SECT_EH* ILStubResolver::AllocEHSect(size_t nClauses)
m_pCompileTimeState->m_ILHeader.EH = m_pCompileTimeState->m_pEHSect;
return m_pCompileTimeState->m_pEHSect;
}
#endif // !DACCESS_COMPILE

bool ILStubResolver::UseLoaderHeap()
{
Expand Down Expand Up @@ -506,40 +540,6 @@ ILStubResolver::ClearCompileTimeState(CompileTimeStatePtrSpecialValues newState)
InterlockedExchangeT(&m_pCompileTimeState, dac_cast<PTR_CompileTimeState>((TADDR)newState));
} // ILStubResolver::ClearCompileTimeState

//---------------------------------------------------------------------------------------
//
void
ILStubResolver::SetTokenLookupMap(
TokenLookupMap * pMap)
{
CONTRACTL
{
STANDARD_VM_CHECK;
PRECONDITION(CheckPointer(m_pCompileTimeState));
}
CONTRACTL_END;

// run copy ctor
new (&m_pCompileTimeState->m_tokenLookupMap) TokenLookupMap(pMap);
}

bool ILStubResolver::IsCompiled()
{
LIMITED_METHOD_CONTRACT;
return (dac_cast<TADDR>(m_pCompileTimeState) == ILGeneratedAndFreed);
}

bool ILStubResolver::IsILGenerated()
{
return (dac_cast<TADDR>(m_pCompileTimeState) != ILNotYetGenerated);
}

void ILStubResolver::SetJitFlags(CORJIT_FLAGS jitFlags)
{
LIMITED_METHOD_CONTRACT;
m_jitFlags = jitFlags;
}

// static
void ILStubResolver::StubGenFailed(ILStubResolver* pResolver)
{
Expand All @@ -558,4 +558,4 @@ void ILStubResolver::StubGenFailed(ILStubResolver* pResolver)
}

pResolver->ClearCompileTimeState(ILNotYetGenerated);
}
}
Loading
Loading