diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 15:08:11 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 15:08:11 +0000 |
| commit | c22cbdc1306dbf0a4019299057fca688aaa9106b (patch) | |
| tree | a4b602d7fbf2d57869ff99f2bb1314c37352e69e /eval_intern.h | |
| parent | e9373b36c856ca69e4d989af7a3700ca894df368 (diff) | |
merge revision(s) r45947,r45951: [Backport #9739] [Backport #9844]
* thread_win32.c (rb_w32_stack_overflow_handler): use Structured
Exception Handling by Addvectoredexceptionhandler() for machine
stack overflow on mingw.
This would be equivalent to the handling using __try and __exept
on mswin introduced by r43748.
Exception Handling by AddVectoredExceptionHandler() for machine
This would be equivalent to the handling using __try and __except
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_intern.h')
| -rw-r--r-- | eval_intern.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/eval_intern.h b/eval_intern.h index a0ecb5086b..5064fde257 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -95,6 +95,15 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval EXCEPTION_CONTINUE_SEARCH) { \ /* never reaches here */ \ } +#elif defined(__MINGW32__) +LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *); +#define SAVE_ROOT_JMPBUF_BEFORE_STMT \ + do { \ + PVOID _handler = AddVectoredExceptionHandler(1, rb_w32_stack_overflow_handler); + +#define SAVE_ROOT_JMPBUF_AFTER_STMT \ + RemoveVectoredExceptionHandler(_handler); \ + } while (0); #else #define SAVE_ROOT_JMPBUF_BEFORE_STMT #define SAVE_ROOT_JMPBUF_AFTER_STMT |