Skip to content

SPMI: Tolerate missing getContinuationType calls #123536

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
jakobbotsch merged 3 commits into from
Jan 23, 2026
+31 −8
Merged

SPMI: Tolerate missing getContinuationType calls #123536

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d59367
SPMI: Tolerate missing getContinuationType calls
jakobbotsch Jan 23, 2026
6baebf8
Simplify
jakobbotsch Jan 23, 2026
407a2cc
Nit
jakobbotsch Jan 23, 2026
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
39 changes: 31 additions & 8 deletions src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4153,6 +4153,7 @@ CORINFO_MODULE_HANDLE MethodContext::repEmbedModuleHandle(CORINFO_MODULE_HANDLE
return (CORINFO_MODULE_HANDLE)value.B;
}

const DWORDLONG CONTINUATION_TYPE_PSEUDO_CLASS_HANDLE = (DWORDLONG)0x12345678beef0000;
void MethodContext::recEmbedClassHandle(CORINFO_CLASS_HANDLE handle, void** ppIndirection, CORINFO_CLASS_HANDLE result)
{
if (EmbedClassHandle == nullptr)
Expand All @@ -4176,12 +4177,25 @@ void MethodContext::dmpEmbedClassHandle(DWORDLONG key, DLDL value)
CORINFO_CLASS_HANDLE MethodContext::repEmbedClassHandle(CORINFO_CLASS_HANDLE handle, void** ppIndirection)
{
DWORDLONG key = CastHandle(handle);
if (key == CONTINUATION_TYPE_PSEUDO_CLASS_HANDLE)
{
if ((EmbedClassHandle->GetCount() > 0) && (EmbedClassHandle->GetItem(0).A != 0))
{
// Some other embedded handle required an indirection, so do the same for the pseudo handle
// (avoids spurious improvements in R2R scenarios)
*ppIndirection = (void*)CONTINUATION_TYPE_PSEUDO_CLASS_HANDLE;
return nullptr;
}

*ppIndirection = nullptr;
return handle;
}

DLDL value = LookupByKeyOrMiss(EmbedClassHandle, key, ": key %016" PRIX64 "", key);

DEBUG_REP(dmpEmbedClassHandle(key, value));

if (ppIndirection != nullptr)
*ppIndirection = (void*)value.A;
*ppIndirection = (void*)value.A;
return (CORINFO_CLASS_HANDLE)value.B;
}

Expand Down Expand Up @@ -6958,17 +6972,26 @@ CORINFO_CLASS_HANDLE MethodContext::repGetContinuationType(size_t dataSize,
{
AssertMapExistsNoMessage(GetContinuationType);

int objRefsBuffer = GetContinuationType->Contains((unsigned char*)objRefs, (unsigned)objRefsSize);
if (objRefsBuffer == -1)
LogException(EXCEPTIONCODE_MC, "SuperPMI assertion failed (missing obj refs buffer)", "");

Agnostic_GetContinuationTypeIn key;
ZeroMemory(&key, sizeof(key));
key.dataSize = (DWORDLONG)dataSize;
key.objRefs = objRefsBuffer;
key.objRefs = (DWORD)GetContinuationType->Contains((unsigned char*)objRefs, (unsigned)objRefsSize);
key.objRefsSize = (DWORD)objRefsSize;

DWORDLONG value = LookupByKeyOrMiss(GetContinuationType, key, ": dataSize %016" PRIX64 ", objRefs %u", key.dataSize, key.objRefs);
DWORDLONG value;
int index = GetContinuationType->GetIndex(key);
if (index == -1)
{
// This handle is more or less opaque, we can tolerate a miss here and
// just fake up handle. Otherwise SPMI will be useless for
// any async change that results in changes in live state.
value = CONTINUATION_TYPE_PSEUDO_CLASS_HANDLE;
}
else
{
value = GetContinuationType->GetItem(index);
}

DEBUG_REP(dmpGetContinuationType(key, value));

return (CORINFO_CLASS_HANDLE)value;
Expand Down