diff options
| -rw-r--r-- | src/inc/eetwain.h | 8 | ||||
| -rw-r--r-- | src/vm/eetwain.cpp | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/inc/eetwain.h b/src/inc/eetwain.h index ddcc1361f6..f51c5e661f 100644 --- a/src/inc/eetwain.h +++ b/src/inc/eetwain.h @@ -290,7 +290,6 @@ virtual void * GetGSCookieAddr(PREGDISPLAY pContext, virtual bool IsInPrologOrEpilog(DWORD relPCOffset, GCInfoToken gcInfoToken, size_t* prologSize) = 0; -#endif /* Returns true if the given IP is in the synchronized region of the method (valid for synchronized methods only) @@ -299,6 +298,7 @@ virtual bool IsInSynchronizedRegion( DWORD relOffset, GCInfoToken gcInfoToken, unsigned flags) = 0; +#endif // !USE_GC_INFO_DECODER /* Returns the size of a given function as reported in the GC info (does @@ -313,10 +313,12 @@ Returns the ReturnKind of a given function as reported in the GC info. virtual ReturnKind GetReturnKind(GCInfoToken gcInfotoken) = 0; +#ifndef USE_GC_INFO_DECODER /* Returns the size of the frame (barring localloc) */ virtual unsigned int GetFrameSize(GCInfoToken gcInfoToken) = 0; +#endif // USE_GC_INFO_DECODER #ifndef DACCESS_COMPILE @@ -568,7 +570,6 @@ bool IsInPrologOrEpilog( DWORD relOffset, GCInfoToken gcInfoToken, size_t* prologSize); -#endif /* Returns true if the given IP is in the synchronized region of the method (valid for synchronized functions only) @@ -578,6 +579,7 @@ bool IsInSynchronizedRegion( DWORD relOffset, GCInfoToken gcInfoToken, unsigned flags); +#endif // !USE_GC_INFO_DECODER /* Returns the size of a given function. @@ -590,11 +592,13 @@ Returns the ReturnKind of a given function. */ virtual ReturnKind GetReturnKind(GCInfoToken gcInfotoken); +#ifndef USE_GC_INFO_DECODER /* Returns the size of the frame (barring localloc) */ virtual unsigned int GetFrameSize(GCInfoToken gcInfoToken); +#endif // USE_GC_INFO_DECODER #ifndef DACCESS_COMPILE diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index ea3a576244..9b101c6806 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -5562,7 +5562,6 @@ bool EECodeManager::IsInPrologOrEpilog(DWORD relPCoffset, return ((info.prologOffs != hdrInfo::NOT_IN_PROLOG) || (info.epilogOffs != hdrInfo::NOT_IN_EPILOG)); } -#endif // USE_GC_INFO_DECODER /***************************************************************************** * @@ -5577,7 +5576,6 @@ bool EECodeManager::IsInSynchronizedRegion(DWORD relOffset, GC_NOTRIGGER; } CONTRACTL_END; -#ifndef USE_GC_INFO_DECODER hdrInfo info; DecodeGCHdrInfo(gcInfoToken, relOffset, &info); @@ -5594,11 +5592,8 @@ bool EECodeManager::IsInSynchronizedRegion(DWORD relOffset, // Synchronized methods have at most one epilog. The epilog does not have to be at the end of the method though. // Everything after the epilog is also in synchronized region. (info.epilogCnt != 0 && info.syncEpilogStart + info.epilogSize <= relOffset); -#else // USE_GC_INFO_DECODER - _ASSERTE(!"@NYI - EECodeManager::IsInSynchronizedRegion (EETwain.cpp)"); - return false; -#endif // USE_GC_INFO_DECODER } +#endif // !USE_GC_INFO_DECODER /***************************************************************************** * @@ -5669,6 +5664,7 @@ ReturnKind EECodeManager::GetReturnKind(GCInfoToken gcInfoToken) #endif } +#ifndef USE_GC_INFO_DECODER /***************************************************************************** * * Returns the size of the frame of the given function. @@ -5680,7 +5676,6 @@ unsigned int EECodeManager::GetFrameSize(GCInfoToken gcInfoToken) GC_NOTRIGGER; } CONTRACTL_END; -#ifndef USE_GC_INFO_DECODER hdrInfo info; DecodeGCHdrInfo(gcInfoToken, 0, &info); @@ -5689,11 +5684,8 @@ unsigned int EECodeManager::GetFrameSize(GCInfoToken gcInfoToken) // in all likelyhood _ASSERTE(!info.doubleAlign); return info.stackSize; -#else // USE_GC_INFO_DECODER - PORTABILITY_ASSERT("EECodeManager::GetFrameSize is not implemented on this platform."); - return false; -#endif // USE_GC_INFO_DECODER } +#endif // USE_GC_INFO_DECODER #ifndef DACCESS_COMPILE |