diff options
| -rw-r--r-- | src/inc/eetwain.h | 8 | ||||
| -rw-r--r-- | src/vm/eetwain.cpp | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/inc/eetwain.h b/src/inc/eetwain.h index 1eed18b964..49ea207ed3 100644 --- a/src/inc/eetwain.h +++ b/src/inc/eetwain.h @@ -161,7 +161,7 @@ enum }; #ifndef DACCESS_COMPILE - +#ifndef WIN64EXCEPTIONS virtual void FixContext(ContextType ctxType, EHContext *ctx, EECodeInfo *pCodeInfo, @@ -171,7 +171,7 @@ virtual void FixContext(ContextType ctxType, CodeManState *pState, size_t ** ppShadowSP, // OUT size_t ** ppEndRegion) = 0; // OUT - +#endif // !WIN64EXCEPTIONS #endif // #ifndef DACCESS_COMPILE #ifdef _TARGET_X86_ @@ -372,7 +372,7 @@ public: #ifndef DACCESS_COMPILE - +#ifndef WIN64EXCEPTIONS /* Last chance for the runtime support to do fixups in the context before execution continues inside a filter, catch handler, or finally @@ -387,7 +387,7 @@ void FixContext(ContextType ctxType, CodeManState *pState, size_t ** ppShadowSP, // OUT size_t ** ppEndRegion); // OUT - +#endif // !WIN64EXCEPTIONS #endif // #ifndef DACCESS_COMPILE #ifdef _TARGET_X86_ diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 55413f6614..de656055b5 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -693,6 +693,7 @@ inline size_t GetSizeOfFrameHeaderForEnC(hdrInfo * info) #endif // !USE_GC_INFO_DECODER #ifndef DACCESS_COMPILE +#ifndef WIN64EXCEPTIONS /***************************************************************************** * @@ -718,8 +719,6 @@ void EECodeManager::FixContext( ContextType ctxType, _ASSERTE((ctxType == FINALLY_CONTEXT) == (thrownObject == NULL)); -#ifdef _TARGET_X86_ - _ASSERTE(sizeof(CodeManStateBuf) <= sizeof(pState->stateBuf)); CodeManStateBuf * stateBuf = (CodeManStateBuf*)pState->stateBuf; @@ -773,12 +772,10 @@ void EECodeManager::FixContext( ContextType ctxType, */ *((OBJECTREF*)&(ctx->Eax)) = thrownObject; - -#else // !_TARGET_X86_ - _ASSERTE(!"@NYI - EECodeManager::FixContext (EETwain.cpp)"); -#endif // _TARGET_X86_ } +#endif // !WIN64EXCEPTIONS + |