Skip to content

Lookup R2R unwind info via R2R data structures #120758

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 2 commits into from
Oct 16, 2025
Merged

Lookup R2R unwind info via R2R data structures #120758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5072ee8
Lookup R2R unwind info via R2R data structures
jkoritzinsky Oct 15, 2025
34654fe
Update conditions and comments
jkoritzinsky Oct 15, 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
36 changes: 12 additions & 24 deletions src/coreclr/vm/codeman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3407,7 +3407,7 @@ TypeHandle InterpreterJitManager::ResolveEHClause(EE_ILEXCEPTION_CLAUSE* pEHClau
_ASSERTE(!declaringType.IsNull());

SigTypeContext typeContext(pMD, declaringType);

Module* pModule = pMD->GetModule();

thResolved = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(pModule, pEHClause->ClassToken, &typeContext,
Expand Down Expand Up @@ -5953,38 +5953,26 @@ static void GetFuncletStartOffsetsHelper(PCODE pCodeStart, SIZE_T size, SIZE_T o
// pRtf: The target function table entry to be located
// pNativeLayout: A pointer to the loaded native layout for the module containing pRtf
//
static void EnumRuntimeFunctionEntriesToFindEntry(PTR_RUNTIME_FUNCTION pRtf, PTR_PEImageLayout pNativeLayout)
static void EnumRuntimeFunctionEntriesToFindEntry(PTR_RUNTIME_FUNCTION pRtf, PTR_RUNTIME_FUNCTION pFirstFunctionEntry, UINT32 numFunctionEntries)
{
pRtf.EnumMem();

if (pNativeLayout == NULL)
if (pFirstFunctionEntry == NULL || numFunctionEntries == 0)
{
return;
}

IMAGE_DATA_DIRECTORY * pProgramExceptionsDirectory = pNativeLayout->GetDirectoryEntry(IMAGE_DIRECTORY_ENTRY_EXCEPTION);
if (!pProgramExceptionsDirectory ||
(pProgramExceptionsDirectory->Size == 0) ||
(pProgramExceptionsDirectory->Size % sizeof(T_RUNTIME_FUNCTION) != 0))
if (pRtf < pFirstFunctionEntry ||
((dac_cast<TADDR>(pRtf) - dac_cast<TADDR>(pFirstFunctionEntry)) % sizeof(T_RUNTIME_FUNCTION) != 0))
{
// Program exceptions directory malformatted
// Runtime function table is malformed.
return;
}

PTR_BYTE moduleBase(pNativeLayout->GetBase());
PTR_RUNTIME_FUNCTION firstFunctionEntry(moduleBase + pProgramExceptionsDirectory->VirtualAddress);

if (pRtf < firstFunctionEntry ||
((dac_cast<TADDR>(pRtf) - dac_cast<TADDR>(firstFunctionEntry)) % sizeof(T_RUNTIME_FUNCTION) != 0))
{
// Program exceptions directory malformatted
return;
}

UINT_PTR indexToLocate = pRtf - firstFunctionEntry;
UINT_PTR indexToLocate = pRtf - pFirstFunctionEntry;

UINT_PTR low = 0; // index in the function entry table of low end of search range
UINT_PTR high = (pProgramExceptionsDirectory->Size) / sizeof(T_RUNTIME_FUNCTION) - 1; // index of high end of search range
UINT_PTR high = numFunctionEntries - 1; // index of high end of search range
UINT_PTR mid = (low + high) / 2; // index of entry to be compared

if (indexToLocate > high)
Expand All @@ -5994,7 +5982,7 @@ static void EnumRuntimeFunctionEntriesToFindEntry(PTR_RUNTIME_FUNCTION pRtf, PTR

while (indexToLocate != mid)
{
PTR_RUNTIME_FUNCTION functionEntry = firstFunctionEntry + mid;
PTR_RUNTIME_FUNCTION functionEntry = pFirstFunctionEntry + mid;
functionEntry.EnumMem();
if (indexToLocate > mid)
{
Expand Down Expand Up @@ -6220,7 +6208,7 @@ ReadyToRunJitManager::ReadyToRunJitManager()

#endif // #ifndef DACCESS_COMPILE

ReadyToRunInfo * ReadyToRunJitManager::JitTokenToReadyToRunInfo(const METHODTOKEN& MethodToken)
PTR_ReadyToRunInfo ReadyToRunJitManager::JitTokenToReadyToRunInfo(const METHODTOKEN& MethodToken)
{
CONTRACTL {
NOTHROW;
Expand Down Expand Up @@ -6873,8 +6861,8 @@ void ReadyToRunJitManager::EnumMemoryRegionsForMethodUnwindInfo(CLRDataEnumMemor
}

// Enumerate the function entry and other entries needed to locate it in the program exceptions directory
ReadyToRunInfo * pReadyToRunInfo = JitTokenToReadyToRunInfo(pCodeInfo->GetMethodToken());
EnumRuntimeFunctionEntriesToFindEntry(pRtf, pReadyToRunInfo->GetImage());
PTR_ReadyToRunInfo pReadyToRunInfo = JitTokenToReadyToRunInfo(pCodeInfo->GetMethodToken());
EnumRuntimeFunctionEntriesToFindEntry(pRtf, pReadyToRunInfo->m_pRuntimeFunctions, pReadyToRunInfo->m_nRuntimeFunctions);

SIZE_T size;
PTR_VOID pUnwindData = GetUnwindDataBlob(pCodeInfo->GetModuleBase(), pRtf, &size);
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/codeman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2675,7 +2675,7 @@ class ReadyToRunJitManager final : public IJitManager

virtual PCODE GetCodeAddressForRelOffset(const METHODTOKEN& MethodToken, DWORD relOffset);

static ReadyToRunInfo * JitTokenToReadyToRunInfo(const METHODTOKEN& MethodToken);
static PTR_ReadyToRunInfo JitTokenToReadyToRunInfo(const METHODTOKEN& MethodToken);
static UINT32 JitTokenToGCInfoVersion(const METHODTOKEN& MethodToken);

static PTR_RUNTIME_FUNCTION JitTokenToRuntimeFunction(const METHODTOKEN& MethodToken);
Expand Down
Loading