From 88aecdcd83873b94ada2c5f12042967eb5e15843 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Fri, 2 Dec 2016 18:21:56 +0900 Subject: [PATCH 1/2] [x86/Linux] Fix exception handling routine DispatchManagedException requires WIN64EXCEPTIONS to be defined, but it is not defined for x86/Linux. --- src/vm/exceptmacros.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vm/exceptmacros.h b/src/vm/exceptmacros.h index efed993a2db9..47eee0f3721d 100644 --- a/src/vm/exceptmacros.h +++ b/src/vm/exceptmacros.h @@ -296,7 +296,7 @@ VOID DECLSPEC_NORETURN RaiseTheExceptionInternalOnly(OBJECTREF throwable, BOOL r void UnwindAndContinueRethrowHelperInsideCatch(Frame* pEntryFrame, Exception* pException); VOID DECLSPEC_NORETURN UnwindAndContinueRethrowHelperAfterCatch(Frame* pEntryFrame, Exception* pException); -#ifdef FEATURE_PAL +#if defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHardwareException); #define INSTALL_MANAGED_EXCEPTION_DISPATCHER \ @@ -334,14 +334,14 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar UNREACHABLE(); \ } -#else +#else // defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) #define INSTALL_MANAGED_EXCEPTION_DISPATCHER #define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER #define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP #define UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP -#endif // FEATURE_PAL +#endif // defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) #define INSTALL_UNWIND_AND_CONTINUE_HANDLER_NO_PROBE \ { \ From 52bad654a942531a813f5a58e97fbb8c59dfa675 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Tue, 6 Dec 2016 09:08:32 +0900 Subject: [PATCH 2/2] Revise comment-style --- src/vm/exceptmacros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vm/exceptmacros.h b/src/vm/exceptmacros.h index 47eee0f3721d..9b6c5549f74c 100644 --- a/src/vm/exceptmacros.h +++ b/src/vm/exceptmacros.h @@ -334,14 +334,14 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar UNREACHABLE(); \ } -#else // defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) +#else // FEATURE_PAL && WIN64EXCEPTIONS #define INSTALL_MANAGED_EXCEPTION_DISPATCHER #define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER #define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP #define UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP -#endif // defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) +#endif // FEATURE_PAL && WIN64EXCEPTIONS #define INSTALL_UNWIND_AND_CONTINUE_HANDLER_NO_PROBE \ { \