Skip to content

Commit

Permalink
Ensure LoaderAllocator can't be collected while we clean handles on …
Browse files Browse the repository at this point in the history
…collectible LoaderAllocators (#99998)
  • Loading branch information
alexey-zakharov committed May 25, 2024
1 parent ce1477b commit 35e4aad
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
4 changes: 1 addition & 3 deletions src/coreclr/vm/loaderallocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -964,13 +964,11 @@ void LoaderAllocator::SetHandleValue(LOADERHANDLE handle, OBJECTREF value)
{
NOTHROW;
GC_NOTRIGGER;
MODE_ANY;
MODE_COOPERATIVE;
PRECONDITION(handle != NULL);
}
CONTRACTL_END;

GCX_COOP();

GCPROTECT_BEGIN(value);

// If the slot value does have the low bit set, then it is a simple pointer to the value
Expand Down
21 changes: 15 additions & 6 deletions src/coreclr/vm/threadstatics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,22 @@ void ThreadLocalBlock::FreeTLM(SIZE_T i, BOOL isThreadShuttingdown)
ThreadLocalModule::CollectibleDynamicEntry *entry = (ThreadLocalModule::CollectibleDynamicEntry*)pThreadLocalModule->m_pDynamicClassTable[k].m_pDynamicEntry;
PTR_LoaderAllocator pLoaderAllocator = entry->m_pLoaderAllocator;

if (entry->m_hGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != 0)
// LoaderAllocator may be collected when the thread is shutting down.
// We enter coop mode to ensure that we get a valid value of the exposed object and
// can safely clean up handles if it is not yet collected.
GCX_COOP();

LOADERALLOCATORREF loaderAllocator = pLoaderAllocator->GetExposedObject();
if (loaderAllocator != NULL)
{
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
if (entry->m_hGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
}
}
}
delete pThreadLocalModule->m_pDynamicClassTable[k].m_pDynamicEntry;
Expand Down

0 comments on commit 35e4aad

Please sign in to comment.