Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSEH3]

Browse source 
Actually, in previous patch, wrong diagnostic context was being saved (and thus, restored).
Properly save and restore it now.
The drawback of this is that we have to let it run over finally and except blocks to have proper builds with -Wdeclaration-after-statement.

Spotted by Thomas.

CORE-8172

svn path=/trunk/; revision=63166
This commit is contained in:
Pierre Schweitzer 2014-05-04 21:01:41 +00:00
parent 497ebdc5d6
commit 6c45081356
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/include/reactos/libs/pseh/pseh3.h
View file

@ -346,8 +346,8 @@ _SEH3$_AutoCleanup(
(void)&&_SEH3$_l_BeforeFilterOrFinally; \ (void)&&_SEH3$_l_BeforeFilterOrFinally; \
(void)&&_SEH3$_l_FilterOrFinally; \ (void)&&_SEH3$_l_FilterOrFinally; \
\ \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
_Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
\ \
/* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \ /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \
enum { \ enum { \
@ -379,16 +379,14 @@ _Pragma("GCC diagnostic pop") \
_SEH3$_l_BeforeTry: (void)0; \ _SEH3$_l_BeforeTry: (void)0; \
_SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
\ \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
_Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
\ \
/* Forward declaration of the filter function */ \ /* Forward declaration of the filter function */ \
_SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \
\ \
/* Create a static data table that contains the jump target and filter function */ \ /* Create a static data table that contains the jump target and filter function */ \
static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { &&_SEH3$_l_HandlerTarget, _SEH3$_FILTER(&_SEH3$_FilterFunction, (__VA_ARGS__)), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \ static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { &&_SEH3$_l_HandlerTarget, _SEH3$_FILTER(&_SEH3$_FilterFunction, (__VA_ARGS__)), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \
\
_Pragma("GCC diagnostic pop") \
\ \
/* Register the registration record. */ \ /* Register the registration record. */ \
if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
@ -396,14 +394,9 @@ _Pragma("GCC diagnostic pop") \
\ \
/* Define an empty inline finally function */ \ /* Define an empty inline finally function */ \
_SEH3$_DEFINE_DUMMY_FINALLY(_SEH3$_FinallyFunction) \ _SEH3$_DEFINE_DUMMY_FINALLY(_SEH3$_FinallyFunction) \
\
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
_Pragma("GCC diagnostic push") \
\ \
/* Allow intrinsics for __except to be used */ \ /* Allow intrinsics for __except to be used */ \
_SEH3$_DECLARE_EXCEPT_INTRINSICS(); \ _SEH3$_DECLARE_EXCEPT_INTRINSICS(); \
\
_Pragma("GCC diagnostic pop") \
\ \
goto _SEH3$_l_DoTry; \ goto _SEH3$_l_DoTry; \
\ \
@ -437,16 +430,14 @@ _Pragma("GCC diagnostic pop") \
_SEH3$_l_BeforeTry: (void)0; \ _SEH3$_l_BeforeTry: (void)0; \
_SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
\ \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
_Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
\ \
/* Forward declaration of the finally function */ \ /* Forward declaration of the finally function */ \
_SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \
\ \
/* Create a static data table that contains the finally function */ \ /* Create a static data table that contains the finally function */ \
static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, _SEH3$_FINALLY(&_SEH3$_FinallyFunction), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \ static const SEH3$_SCOPE_TABLE _SEH3$_ScopeTable = { 0, _SEH3$_FINALLY(&_SEH3$_FinallyFunction), _SEH3$_TryLevel, _SEH3$_HANDLER_TYPE }; \
\
_Pragma("GCC diagnostic pop") \
\ \
/* Register the registration record. */ \ /* Register the registration record. */ \
if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
@ -478,6 +469,8 @@ _Pragma("GCC diagnostic pop") \
\ \
/* Implementation of the auto cleanup function */ \ /* Implementation of the auto cleanup function */ \
_SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \
\
_Pragma("GCC diagnostic pop") \
\ \
/* Close the outer scope */ \ /* Close the outer scope */ \
} while (0); } while (0);