diff options
Diffstat (limited to 'src/vm/crst.cpp')
| -rw-r--r-- | src/vm/crst.cpp | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/src/vm/crst.cpp b/src/vm/crst.cpp index 9613798f93..36447e2232 100644 --- a/src/vm/crst.cpp +++ b/src/vm/crst.cpp @@ -33,25 +33,7 @@ VOID CrstBase::InitWorker(INDEBUG_COMMA(CrstType crstType) CrstFlags flags) CONTRACTL { THROWS; WRAPPER(GC_TRIGGERS); - } CONTRACTL_END; - - // Disallow creation of Crst before EE starts. But only complain if we end up - // being hosted, since such Crsts have escaped the hosting net and will cause - // AVs on next use. -#ifdef _DEBUG - static bool fEarlyInit; // = false - - if (!g_fEEStarted) - { - if (!CLRSyncHosted()) - fEarlyInit = true; - } - - // If we are now hosted, we better not have *ever* created some Crsts that are - // not known to our host. - _ASSERTE(!fEarlyInit || !CLRSyncHosted()); - -#endif + } CONTRACTL_END; _ASSERTE((flags & CRST_INITIALIZED) == 0); @@ -328,16 +310,7 @@ void CrstBase::Enter(INDEBUG(NoLevelCheckFlag noLevelCheckFlag/* = CRST_LEVEL_CH } } - { - if (CLRTaskHosted()) - { - Thread::BeginThreadAffinity(); - } - - UnsafeEnterCriticalSection(&m_criticalsection); - - } - + UnsafeEnterCriticalSection(&m_criticalsection); #ifdef _DEBUG PostEnter(); @@ -370,14 +343,7 @@ void CrstBase::Leave() Thread * pThread = GetThread(); #endif - { - UnsafeLeaveCriticalSection(&m_criticalsection); - - - if (CLRTaskHosted()) { - Thread::EndThreadAffinity(); - } - } + UnsafeLeaveCriticalSection(&m_criticalsection); // Check for both rare case using one if-check if (m_dwFlags & (CRST_TAKEN_DURING_SHUTDOWN | CRST_DEBUGGER_THREAD)) |