diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2019-04-13 08:09:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-13 08:09:31 -0700 |
| commit | 8913aaa1388e263d537b19e78caaed6b124fc0ea (patch) | |
| tree | bd07a13ebfdfdb7c0537eb5969be818f3b735189 /src/classlibnative | |
| parent | 0fed62e68d1f8f8a756ec8ba5348bfde61057666 (diff) | |
| download | coreclr-8913aaa1388e263d537b19e78caaed6b124fc0ea.tar.gz coreclr-8913aaa1388e263d537b19e78caaed6b124fc0ea.tar.bz2 coreclr-8913aaa1388e263d537b19e78caaed6b124fc0ea.zip | |
Delete COMPlus_FinalizeOnShutdown (#23595)
This compat quirk is increasingly more broken since the framework is generally not compatible with, and we have not heard anybody actually using it.
Changed Environment.HasShutdownStarted to unconditionally return false. It does not make sense for it to ever return true with shutdown finalization disabled.
Diffstat (limited to 'src/classlibnative')
| -rw-r--r-- | src/classlibnative/bcltype/system.cpp | 12 | ||||
| -rw-r--r-- | src/classlibnative/bcltype/system.h | 3 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/classlibnative/bcltype/system.cpp b/src/classlibnative/bcltype/system.cpp index 38e5bba9ad..ce47c14e1b 100644 --- a/src/classlibnative/bcltype/system.cpp +++ b/src/classlibnative/bcltype/system.cpp @@ -356,18 +356,6 @@ INT32 QCALLTYPE SystemNative::GetProcessorCount() return processorCount; } -FCIMPL0(FC_BOOL_RET, SystemNative::HasShutdownStarted) -{ - FCALL_CONTRACT; - - // Return true if the EE has started to shutdown and is now going to - // aggressively finalize objects referred to by static variables OR - // if someone is unloading the current AppDomain AND we have started - // finalizing objects referred to by static variables. - FC_RETURN_BOOL(g_fEEShutDown & ShutDown_Finalize2); -} -FCIMPLEND - // FailFast is supported in BCL.small as internal to support failing fast in places where EEE used to be thrown. // // Static message buffer used by SystemNative::FailFast to avoid reliance on a diff --git a/src/classlibnative/bcltype/system.h b/src/classlibnative/bcltype/system.h index 803f1dfca8..95670a382c 100644 --- a/src/classlibnative/bcltype/system.h +++ b/src/classlibnative/bcltype/system.h @@ -69,9 +69,8 @@ public: static FCDECL3(VOID, FailFastWithExceptionAndSource, StringObject* refMessageUNSAFE, ExceptionObject* refExceptionUNSAFE, StringObject* errorSourceUNSAFE); // Returns the number of logical processors that can be used by managed code - static INT32 QCALLTYPE GetProcessorCount(); + static INT32 QCALLTYPE GetProcessorCount(); - static FCDECL0(FC_BOOL_RET, HasShutdownStarted); static FCDECL0(FC_BOOL_RET, IsServerGC); #ifdef FEATURE_COMINTEROP |