Skip to content
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.

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

Fix VirtualCallStubManager stats capturing on EE shutdown #102073

Merged
merged 2 commits into from
May 13, 2024
Merged
Changes from 1 commit
Commits
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
6 changes: 2 additions & 4 deletions src/coreclr/vm/ceemain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,8 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)

{
CONTRACT_VIOLATION(ModeViolation);
// At the moment, this doesn't do anything more than log statistics.
VirtualCallStubManager::UninitStatic();
yurai007 marked this conversation as resolved.
Show resolved Hide resolved
yurai007 marked this conversation as resolved.
Show resolved Hide resolved

// On the new plan, we only do the tear-down under the protection of the loader
// lock -- after the OS has stopped all other threads.
Expand All @@ -1348,10 +1350,6 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
// Terminate the debugging services.
TerminateDebugger();
#endif // DEBUGGING_SUPPORTED

//@TODO: find the right place for this
VirtualCallStubManager::UninitStatic();

WriteJitHelperCountToSTRESSLOG();

STRESS_LOG0(LF_STARTUP, LL_INFO10, "EEShutdown shutting down logging");
Expand Down