diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-10 17:12:53 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:36:06 -0800 |
commit | 54891e0650e69f08832f75a40dc102efc6115d38 (patch) | |
tree | 0e032a0b337767801f696cbaeacded267c694f32 /src/vm/multicorejitplayer.cpp | |
parent | 396f7d43b3c0f3ca7034a6d1d9cd7d6914778a1e (diff) | |
download | coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.gz coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.bz2 coreclr-54891e0650e69f08832f75a40dc102efc6115d38.zip |
Remove always defined FEATURE_CORECLR
Diffstat (limited to 'src/vm/multicorejitplayer.cpp')
-rw-r--r-- | src/vm/multicorejitplayer.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/vm/multicorejitplayer.cpp b/src/vm/multicorejitplayer.cpp index 7d13bbc462..adf7a381f4 100644 --- a/src/vm/multicorejitplayer.cpp +++ b/src/vm/multicorejitplayer.cpp @@ -373,9 +373,7 @@ MulticoreJitProfilePlayer::MulticoreJitProfilePlayer(AppDomain * pDomain, ICLRPr LIMITED_METHOD_CONTRACT; m_DomainID = pDomain->GetId(); -#if defined(FEATURE_CORECLR) m_pBinderContext = pBinderContext; -#endif m_nMySession = nSession; m_moduleCount = 0; m_headerModuleCount = 0; @@ -464,12 +462,10 @@ bool MulticoreJitManager::IsSupportedModule(Module * pModule, bool fMethodJit, b return false; } -#if defined(FEATURE_CORECLR) if (pFile->GetPath().IsEmpty()) // Ignore in-memory modules { return false; } -#endif if (! fMethodJit) @@ -550,10 +546,8 @@ bool MulticoreJitProfilePlayer::CompileMethodDesc(Module * pModule, MethodDesc * m_stats.m_nTryCompiling ++; -#if defined(FEATURE_CORECLR) // Reset the flag to allow managed code to be called in multicore JIT background thread from this routine ThreadStateNCStackHolder holder(-1, Thread::TSNC_CallingManagedCodeDisabled); -#endif // MakeJitWorker calls back to MulticoreJitCodeStorage::StoreMethodCode under MethodDesc lock pMD->MakeJitWorker(& header, CORJIT_FLAGS(CORJIT_FLAGS::CORJIT_FLAG_MCJIT_BACKGROUND)); @@ -886,7 +880,6 @@ bool MulticoreJitProfilePlayer::HandleModuleDependency(unsigned jitInfo) PlayerModuleInfo & mod = m_pModules[moduleTo]; -#if defined(FEATURE_CORECLR) // Load the module if necessary. if (!mod.m_pModule) { @@ -927,7 +920,6 @@ bool MulticoreJitProfilePlayer::HandleModuleDependency(unsigned jitInfo) } } } -#endif if (mod.UpdateNeedLevel((FileLoadLevel) level)) { @@ -941,7 +933,6 @@ bool MulticoreJitProfilePlayer::HandleModuleDependency(unsigned jitInfo) return true; } -#if defined(FEATURE_CORECLR) DomainAssembly * MulticoreJitProfilePlayer::LoadAssembly(SString & assemblyName) { STANDARD_VM_CONTRACT; @@ -992,7 +983,6 @@ DomainAssembly * MulticoreJitProfilePlayer::LoadAssembly(SString & assemblyName) return pDomainAssembly; } -#endif inline bool MethodJifInfo(unsigned inst) @@ -1052,17 +1042,6 @@ HRESULT MulticoreJitProfilePlayer::HandleMethodRecord(unsigned * buffer, int cou } else { -#if !defined(FEATURE_CORECLR) - if (m_nBlockingCount != 0) - { - if (! GroupWaitForModuleLoad(m_stats.m_nTotalMethod + pos)) // wait for blocking modules - { - goto Abort; - } - - _ASSERTE(m_nBlockingCount == 0); - } -#endif // To reduce contention with foreground thread, walk backward within the group of methods Jittable methods, not broken apart by dependency { @@ -1093,11 +1072,7 @@ HRESULT MulticoreJitProfilePlayer::HandleMethodRecord(unsigned * buffer, int cou PlayerModuleInfo & mod = m_pModules[inst >> 24]; -#if defined(FEATURE_CORECLR) _ASSERTE(mod.IsModuleLoaded()); -#else - _ASSERTE(mod.IsModuleLoaded() && ! mod.IsLowerLevel()); -#endif if (mod.m_enableJit) { @@ -1313,9 +1288,7 @@ HRESULT MulticoreJitProfilePlayer::PlayProfile() const ModuleRecord * pRec = (const ModuleRecord * ) pBuffer; if (((unsigned)(pRec->lenModuleName -#if defined(FEATURE_CORECLR) + pRec->lenAssemblyName -#endif ) > (rcdLen - sizeof(ModuleRecord))) || (m_moduleCount >= m_headerModuleCount)) { |