summaryrefslogtreecommitdiff
path: root/src/vm/eetwain.cpp
diff options
context:
space:
mode:
authorJonghyun Park <parjong@gmail.com>2017-02-09 15:36:30 +0900
committerJan Kotas <jkotas@microsoft.com>2017-02-08 22:36:30 -0800
commit6c15439bf0a2b929b1e7a6adbb85e1b646c6c4ec (patch)
tree9bf35710bf914071a0b92a3070996a18b463933f /src/vm/eetwain.cpp
parent65248e40425a675326e841a1547870ce90ac9d35 (diff)
downloadcoreclr-6c15439bf0a2b929b1e7a6adbb85e1b646c6c4ec.tar.gz
coreclr-6c15439bf0a2b929b1e7a6adbb85e1b646c6c4ec.tar.bz2
coreclr-6c15439bf0a2b929b1e7a6adbb85e1b646c6c4ec.zip
Clean up EECodeManager::GetExactGenericsToken (#9429)
Diffstat (limited to 'src/vm/eetwain.cpp')
-rw-r--r--src/vm/eetwain.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp
index c120d8a4fb..46cff26791 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -5357,7 +5357,7 @@ PTR_VOID EECodeManager::GetParamTypeArg(PREGDISPLAY pContext,
}
#endif // !CROSSGEN_COMPILE
-#if defined(WIN64EXCEPTIONS) && !defined(CROSSGEN_COMPILE)
+#if defined(WIN64EXCEPTIONS) && defined(USE_GC_INFO_DECODER) && !defined(CROSSGEN_COMPILE)
/*
Returns the generics token. This is used by GetInstance() and GetParamTypeArg() on WIN64.
*/
@@ -5376,7 +5376,6 @@ PTR_VOID EECodeManager::GetExactGenericsToken(SIZE_T baseStackSlot,
{
LIMITED_METHOD_DAC_CONTRACT;
-#ifdef USE_GC_INFO_DECODER
GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken();
GcInfoDecoder gcInfoDecoder(
@@ -5426,14 +5425,10 @@ PTR_VOID EECodeManager::GetExactGenericsToken(SIZE_T baseStackSlot,
return PTR_VOID(taExactGenericsToken);
}
return NULL;
-#else // USE_GC_INFO_DECODER
- PORTABILITY_ASSERT("EECodeManager::GetExactGenericsToken");
- return NULL;
-#endif // USE_GC_INFO_DECODER
}
-#endif // WIN64EXCEPTIONS / CROSSGEN_COMPILE
+#endif // WIN64EXCEPTIONS && USE_GC_INFO_DECODER && !CROSSGEN_COMPILE
#ifndef CROSSGEN_COMPILE
/*****************************************************************************/