Enable EECodeManager::GetGSCookieAddr when CROSSGEN_COMPILE is not defined (dotnet...

Commit migrated from https://github.com/dotnet/coreclr/commit/93cb39e3c1bbd4407261926a7365949f288ebc37

diff --git a/src/coreclr/src/inc/eetwain.h b/src/coreclr/src/inc/eetwain.h
index cf6e867..cbed0cc 100644 (file)
--- a/src/coreclr/src/inc/eetwain.h
+++ b/src/coreclr/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/coreclr/src/vm/eetwain.cpp b/src/coreclr/src/vm/eetwain.cpp
index 7b0a5ee..b2387b2 100644 (file)
--- a/src/coreclr/src/vm/eetwain.cpp
+++ b/src/coreclr/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
 /*****************************************************************************