Skip to content

Revert "Avoid clearing thread local handles for already unloaded loader" #102729

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
jkotas merged 1 commit into from
May 27, 2024
Merged

Revert "Avoid clearing thread local handles for already unloaded loader" #102729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/coreclr/vm/loaderallocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,11 +964,13 @@ void LoaderAllocator::SetHandleValue(LOADERHANDLE handle, OBJECTREF value)
{
NOTHROW;
GC_NOTRIGGER;
MODE_COOPERATIVE;
MODE_ANY;
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: 6 additions & 15 deletions src/coreclr/vm/threadstatics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,13 @@ 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;

// 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)
if (entry->m_hGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != 0)
{
if (entry->m_hGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != 0)
{
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
}
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
}
}
delete pThreadLocalModule->m_pDynamicClassTable[k].m_pDynamicEntry;
Expand Down