diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-01-31 18:43:27 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-01-31 10:43:27 +0100 |
| commit | 93cb39e3c1bbd4407261926a7365949f288ebc37 (patch) | |
| tree | 9ff3b2b488de43b122bc1ea420b610c357a682f1 | |
| parent | b2d57bb99fce38ef8b150d5eac5b0a56b6e5f6b2 (diff) | |
| download | coreclr-93cb39e3c1bbd4407261926a7365949f288ebc37.tar.gz coreclr-93cb39e3c1bbd4407261926a7365949f288ebc37.tar.bz2 coreclr-93cb39e3c1bbd4407261926a7365949f288ebc37.zip | |
Enable EECodeManager::GetGSCookieAddr when CROSSGEN_COMPILE is not defined (#9209)
| -rw-r--r-- | src/inc/eetwain.h | 4 | ||||
| -rw-r--r-- | src/vm/eetwain.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/inc/eetwain.h b/src/inc/eetwain.h index cf6e867d78..cbed0cc857 100644 --- a/src/inc/eetwain.h +++ b/src/inc/eetwain.h @@ -270,6 +270,7 @@ virtual PTR_VOID GetParamTypeArg(PREGDISPLAY pContext, virtual GenericParamContextType GetParamContextType(PREGDISPLAY pContext, EECodeInfo * pCodeInfo) = 0; +#ifndef CROSSGEN_COMPILE /* Returns the offset of the GuardStack cookie if it exists. Returns NULL if there is no cookie. @@ -277,6 +278,7 @@ virtual GenericParamContextType GetParamContextType(PREGDISPLAY pContext, virtual void * GetGSCookieAddr(PREGDISPLAY pContext, EECodeInfo * pCodeInfo, CodeManState * pState) = 0; +#endif #ifndef USE_GC_INFO_DECODER /* @@ -538,6 +540,7 @@ PTR_VOID GetExactGenericsToken(SIZE_T baseStackSlot, #endif // WIN64EXCEPTIONS && !CROSSGEN_COMPILE +#ifndef CROSSGEN_COMPILE /* Returns the offset of the GuardStack cookie if it exists. Returns NULL if there is no cookie. @@ -546,6 +549,7 @@ virtual void * GetGSCookieAddr(PREGDISPLAY pContext, EECodeInfo * pCodeInfo, CodeManState * pState); +#endif #ifndef USE_GC_INFO_DECODER diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 7b0a5eeaf5..b2387b2834 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -5432,6 +5432,7 @@ PTR_VOID EECodeManager::GetExactGenericsToken(SIZE_T baseStackSlot, #endif // WIN64EXCEPTIONS / CROSSGEN_COMPILE +#ifndef CROSSGEN_COMPILE /*****************************************************************************/ void * EECodeManager::GetGSCookieAddr(PREGDISPLAY pContext, @@ -5478,7 +5479,7 @@ void * EECodeManager::GetGSCookieAddr(PREGDISPLAY pContext, return PVOID(SIZE_T(pContext->SP + argSize + info->gsCookieOffset)); } -#elif defined(USE_GC_INFO_DECODER) && !defined(CROSSGEN_COMPILE) +#elif defined(USE_GC_INFO_DECODER) if (pCodeInfo->IsFunclet()) { return NULL; @@ -5506,6 +5507,7 @@ void * EECodeManager::GetGSCookieAddr(PREGDISPLAY pContext, return NULL; #endif } +#endif #ifndef USE_GC_INFO_DECODER /***************************************************************************** |