Skip to content

[wasm][coreclr] Improve method portable entrypoints lifecycle #124868

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

Open
radekdoulik wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[wasm][coreclr] Improve method portable entrypoints lifecycle #124868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02065c6
[wasm][coreclr] Fix method portable entrypoints lifecycle
radekdoulik Feb 25, 2026
d908053
Disable access checks again
radekdoulik Feb 25, 2026
a3c7ac1
Apply suggestions from code review
radekdoulik Feb 25, 2026
8a7c025
Merge branch 'main' into clr-wasm-reset-portable-entrypoint
radekdoulik Feb 27, 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
3 changes: 3 additions & 0 deletions src/coreclr/vm/codeversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,6 +1984,9 @@ HRESULT CodeVersionManager::PublishNativeCodeVersion(MethodDesc* pMethod, Native
// When we hit the Precode that should fixup any issues with an unset interpreter code pointer. This is notably most important in ReJIT scenarios
pMethod->ClearInterpreterCodePointer();
#endif
#ifdef FEATURE_PORTABLE_ENTRYPOINTS
pMethod->ResetPortableEntryPoint();
#endif // FEATURE_PORTABLE_ENTRYPOINTS
#ifdef FEATURE_TIERED_COMPILATION
bool wasSet = CallCountingManager::SetCodeEntryPoint(nativeCodeVersion, pCode, false, nullptr);
_ASSERTE(wasSet);
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/vm/finalizerthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ extern "C" void SystemJS_ExecuteFinalizationCallback()
INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP;
{
GCX_COOP();
// TODO-WASM https://github.com/dotnet/runtime/issues/123712
// ManagedThreadBase::KickOff(FinalizerThread::FinalizerThreadWorkerIteration, NULL);
ManagedThreadBase::KickOff(FinalizerThread::FinalizerThreadWorkerIteration, NULL);
}
UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP;
}
Expand Down
26 changes: 23 additions & 3 deletions src/coreclr/vm/method.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,6 +2474,18 @@ BOOL MethodDesc::ShouldCallPrestub()
#endif // FEATURE_PORTABLE_ENTRYPOINTS
}

#ifdef FEATURE_PORTABLE_ENTRYPOINTS
void MethodDesc::ResetPortableEntryPoint()
{
PCODE tempEntry = GetTemporaryEntryPointIfExists();
Copy link
Member

@AaronRobinsonMSFT AaronRobinsonMSFT Feb 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is needed, please create a GetPortableEntryPointIfExists(). All these methods should be in the same block/area. Ideally this would be define after the GetPortableEntryPoint() in how it was defined in the header. Keeping the functions in the same order is a big benefit for searching for things in general.

if (tempEntry != (PCODE)NULL)
{
PortableEntryPoint* pep = PortableEntryPoint::ToPortableEntryPoint(tempEntry);
pep->Init(this); // Re-initializes: clears _pActualCode, _pInterpreterData, _flags
}
}
#endif // FEATURE_PORTABLE_ENTRYPOINTS

//*******************************************************************************
void MethodDesc::Reset()
{
Expand All @@ -2490,10 +2502,12 @@ void MethodDesc::Reset()
// Reset any flags relevant to the old code
ClearFlagsOnUpdate();

#ifndef FEATURE_PORTABLE_ENTRYPOINTS
#ifdef FEATURE_PORTABLE_ENTRYPOINTS
ResetPortableEntryPoint();
#else // !FEATURE_PORTABLE_ENTRYPOINTS
_ASSERTE(HasPrecode());
GetPrecode()->Reset();
#endif // !FEATURE_PORTABLE_ENTRYPOINTS
#endif // FEATURE_PORTABLE_ENTRYPOINTS

if (HasNativeCodeSlot())
{
Expand Down Expand Up @@ -3276,6 +3290,10 @@ void MethodDesc::ResetCodeEntryPoint()
ClearInterpreterCodePointer();
#endif

#ifdef FEATURE_PORTABLE_ENTRYPOINTS
ResetPortableEntryPoint();
#endif // FEATURE_PORTABLE_ENTRYPOINTS

if (MayHaveEntryPointSlotsToBackpatch())
{
BackpatchToResetEntryPointSlots();
Expand Down Expand Up @@ -3313,7 +3331,9 @@ void MethodDesc::ResetCodeEntryPointForEnC()
#endif

LOG((LF_ENC, LL_INFO100000, "MD::RCEPFENC: this:%p - %s::%s\n", this, m_pszDebugClassName, m_pszDebugMethodName));
#ifndef FEATURE_PORTABLE_ENTRYPOINTS
#ifdef FEATURE_PORTABLE_ENTRYPOINTS
ResetPortableEntryPoint();
#else // !FEATURE_PORTABLE_ENTRYPOINTS
LOG((LF_ENC, LL_INFO100000, "MD::RCEPFENC: HasPrecode():%s, HasNativeCodeSlot():%s\n",
(HasPrecode() ? "true" : "false"), (HasNativeCodeSlot() ? "true" : "false")));
if (HasPrecode())
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/method.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,6 +1619,8 @@ class MethodDesc
void EnsurePortableEntryPoint();

PCODE GetPortableEntryPoint();

void ResetPortableEntryPoint();
#endif // FEATURE_PORTABLE_ENTRYPOINTS

//*******************************************************************************
Expand Down
Loading