diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2016-05-07 10:47:59 +0200 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-05-07 10:47:59 +0200 |
| commit | 29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4 (patch) | |
| tree | 6d78c357065c39e7bed9f86178b9af47944aaefd /src/vm/multicorejitplayer.cpp | |
| parent | 0ef1fc9aa3d65d41b5b9c8cd4911a1f8cdece049 (diff) | |
| download | coreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.tar.gz coreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.tar.bz2 coreclr-29fcfe2938e3890cd6fb302d2f8c6dabc1a09fc4.zip | |
Remove FEATURE_HOSTED_BINDER definition (#4838)
The FEATURE_HOSTED_BINDER is always on so remove it from all the sources.
Diffstat (limited to 'src/vm/multicorejitplayer.cpp')
| -rw-r--r-- | src/vm/multicorejitplayer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/vm/multicorejitplayer.cpp b/src/vm/multicorejitplayer.cpp index 44a1f4fd83..0c69fdcf94 100644 --- a/src/vm/multicorejitplayer.cpp +++ b/src/vm/multicorejitplayer.cpp @@ -373,7 +373,7 @@ MulticoreJitProfilePlayer::MulticoreJitProfilePlayer(AppDomain * pDomain, ICLRPr LIMITED_METHOD_CONTRACT; m_DomainID = pDomain->GetId(); -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) m_pBinderContext = pBinderContext; #endif m_nMySession = nSession; @@ -464,7 +464,7 @@ bool MulticoreJitManager::IsSupportedModule(Module * pModule, bool fMethodJit, b return false; } -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) if (pFile->GetPath().IsEmpty()) // Ignore in-memory modules { return false; @@ -550,7 +550,7 @@ bool MulticoreJitProfilePlayer::CompileMethodDesc(Module * pModule, MethodDesc * m_stats.m_nTryCompiling ++; -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#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 @@ -886,7 +886,7 @@ bool MulticoreJitProfilePlayer::HandleModuleDependency(unsigned jitInfo) PlayerModuleInfo & mod = m_pModules[moduleTo]; -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) // Load the module if necessary. if (!mod.m_pModule) { @@ -941,7 +941,7 @@ bool MulticoreJitProfilePlayer::HandleModuleDependency(unsigned jitInfo) return true; } -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) DomainAssembly * MulticoreJitProfilePlayer::LoadAssembly(SString & assemblyName) { STANDARD_VM_CONTRACT; @@ -1093,7 +1093,7 @@ HRESULT MulticoreJitProfilePlayer::HandleMethodRecord(unsigned * buffer, int cou PlayerModuleInfo & mod = m_pModules[inst >> 24]; -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) _ASSERTE(mod.IsModuleLoaded()); #else _ASSERTE(mod.IsModuleLoaded() && ! mod.IsLowerLevel()); @@ -1313,7 +1313,7 @@ HRESULT MulticoreJitProfilePlayer::PlayProfile() const ModuleRecord * pRec = (const ModuleRecord * ) pBuffer; if (((unsigned)(pRec->lenModuleName -#if defined(FEATURE_CORECLR) && defined(FEATURE_HOSTED_BINDER) +#if defined(FEATURE_CORECLR) + pRec->lenAssemblyName #endif ) > (rcdLen - sizeof(ModuleRecord))) || |