From 03a27899e86c0334e499151cf27cc6ddd3aebd4e Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Fri, 3 Feb 2017 11:15:28 +0900 Subject: [x86/Linux] Do NOT use GSCookie on Funclet (#9290) --- src/vm/eetwain.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/vm/eetwain.cpp') diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 8db5396ece..44f42a4a4d 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -5468,6 +5468,13 @@ void * EECodeManager::GetGSCookieAddr(PREGDISPLAY pContext, GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken(); unsigned relOffset = pCodeInfo->GetRelOffset(); +#ifdef WIN64EXCEPTIONS + if (pCodeInfo->IsFunclet()) + { + return NULL; + } +#endif + #if defined(_TARGET_X86_) CodeManStateBuf * stateBuf = (CodeManStateBuf*)pState->stateBuf; @@ -5507,11 +5514,6 @@ void * EECodeManager::GetGSCookieAddr(PREGDISPLAY pContext, } #elif defined(USE_GC_INFO_DECODER) - if (pCodeInfo->IsFunclet()) - { - return NULL; - } - GcInfoDecoder gcInfoDecoder( gcInfoToken, DECODE_GS_COOKIE -- cgit v1.2.3