diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-03 11:32:22 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-02 18:32:22 -0800 |
| commit | 7554180ccf845804de069b2b6b3c1bab48009e26 (patch) | |
| tree | 669626fe674526c7a964a547ac52d928cb2cb41f /src/vm/eetwain.cpp | |
| parent | 03a27899e86c0334e499151cf27cc6ddd3aebd4e (diff) | |
| download | coreclr-7554180ccf845804de069b2b6b3c1bab48009e26.tar.gz coreclr-7554180ccf845804de069b2b6b3c1bab48009e26.tar.bz2 coreclr-7554180ccf845804de069b2b6b3c1bab48009e26.zip | |
Clean up GetAddrOfSecurityObjectFromCachedInfo (#9291)
GetAddrOfSecurityObjectFromCachedInfo seems to be X86-specific, but has
ifdef for other architectures.
This commit declares GetAddrOfSecurityObjectFromCachedInfo only for X86
to simplify its implementation.
Diffstat (limited to 'src/vm/eetwain.cpp')
| -rw-r--r-- | src/vm/eetwain.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 44f42a4a4d..eea54a8d3d 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -5026,6 +5026,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY pContext, #endif // _TARGET_X86_ +#ifdef _TARGET_X86_ /***************************************************************************** * * Return the address of the local security object reference @@ -5036,18 +5037,15 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY pContext, OBJECTREF* EECodeManager::GetAddrOfSecurityObjectFromCachedInfo(PREGDISPLAY pRD, StackwalkCacheUnwindInfo * stackwalkCacheUnwindInfo) { LIMITED_METHOD_CONTRACT; -#ifdef _TARGET_X86_ size_t securityObjectOffset = stackwalkCacheUnwindInfo->securityObjectOffset; + _ASSERTE(securityObjectOffset != 0); // We pretend that filters are ESP-based methods in UnwindEbpDoubleAlignFrame(). // Hence we cannot enforce this assert. // _ASSERTE(stackwalkCacheUnwindInfo->fUseEbpAsFrameReg); return (OBJECTREF *) (size_t) (*pRD->GetEbpLocation() - (securityObjectOffset * sizeof(void*))); -#else - PORTABILITY_ASSERT("EECodeManager::GetAddrOfSecurityObjectFromContext is not implemented on this platform."); - return NULL; -#endif } +#endif // _TARGET_X86_ #ifndef DACCESS_COMPILE OBJECTREF* EECodeManager::GetAddrOfSecurityObject(CrawlFrame *pCF) |