Skip to content

Commit 0031bf2

Browse files
committed
Fix VirtualCallStubManager stats capturing on EE shutdown
Before this change logging stats to StubLog file doesn't work because on EE shutdown we don't shut down manager. Since it's only about logging we can perform uninit earlier.
1 parent 56d7e5d commit 0031bf2

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/coreclr/vm/ceemain.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,8 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
13261326

13271327
{
13281328
CONTRACT_VIOLATION(ModeViolation);
1329+
// At the moment, this doesn't do anything more than log statistics.
1330+
VirtualCallStubManager::UninitStatic();
13291331

13301332
// On the new plan, we only do the tear-down under the protection of the loader
13311333
// lock -- after the OS has stopped all other threads.
@@ -1348,10 +1350,6 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
13481350
// Terminate the debugging services.
13491351
TerminateDebugger();
13501352
#endif // DEBUGGING_SUPPORTED
1351-
1352-
//@TODO: find the right place for this
1353-
VirtualCallStubManager::UninitStatic();
1354-
13551353
WriteJitHelperCountToSTRESSLOG();
13561354

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

0 commit comments

Comments
 (0)