diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-09 15:38:12 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-08 22:38:12 -0800 |
| commit | 1002e0fc483430933b7f7e561b4a3bd7702249d8 (patch) | |
| tree | e2f6a3f7617fd02e952d078605580aeb1e5b3688 /src/vm | |
| parent | a336822c4610391e41d720010ab9f7d9969028ad (diff) | |
| download | coreclr-1002e0fc483430933b7f7e561b4a3bd7702249d8.tar.gz coreclr-1002e0fc483430933b7f7e561b4a3bd7702249d8.tar.bz2 coreclr-1002e0fc483430933b7f7e561b4a3bd7702249d8.zip | |
Clean up EECodeManager::GetInstance (#9424)
* Clean up EECodeManager::GetInstance
* Use !CROSSGEN_COMPILE instead of CROSSGEN_COMPILE
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/eetwain.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 94a1ece428..2624f4cef5 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -5113,6 +5113,7 @@ OBJECTREF* EECodeManager::GetAddrOfSecurityObject(CrawlFrame *pCF) } #endif +#ifndef CROSSGEN_COMPILE /***************************************************************************** * * Returns "this" pointer if it is a non-static method @@ -5134,7 +5135,7 @@ OBJECTREF EECodeManager::GetInstance( PREGDISPLAY pContext, SUPPORTS_DAC; } CONTRACTL_END; -#ifdef _TARGET_X86_ +#ifndef USE_GC_INFO_DECODER GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken(); unsigned relOffset = pCodeInfo->GetRelOffset(); @@ -5242,18 +5243,15 @@ OBJECTREF EECodeManager::GetInstance( PREGDISPLAY pContext, #endif return NULL; -#elif defined(USE_GC_INFO_DECODER) && !defined(CROSSGEN_COMPILE) +#else // !USE_GC_INFO_DECODER PTR_VOID token = EECodeManager::GetExactGenericsToken(pContext, pCodeInfo); OBJECTREF oRef = ObjectToOBJECTREF(PTR_Object(dac_cast<TADDR>(token))); VALIDATEOBJECTREF(oRef); return oRef; -#else // !_TARGET_X86_ && !(USE_GC_INFO_DECODER && !CROSSGEN_COMPILE) - PORTABILITY_ASSERT("Port: EECodeManager::GetInstance is not implemented on this platform."); - return NULL; -#endif // _TARGET_X86_ +#endif // USE_GC_INFO_DECODER } - +#endif // !CROSSGEN_COMPILE GenericParamContextType EECodeManager::GetParamContextType(PREGDISPLAY pContext, EECodeInfo * pCodeInfo) |