diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-15 08:32:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-15 08:32:55 +0000 |
| commit | 3343feeebf5f3f7f3219eadab1d93e11b5ba9f6a (patch) | |
| tree | 2742f395e17e5c6396e0a6860be3390d2d62b704 | |
| parent | 48de9363d230f8b23afe14e5b18d0683858004ae (diff) | |
| download | ruby-3343feeebf5f3f7f3219eadab1d93e11b5ba9f6a.tar.gz | |
Handle machine stack overflow on mingw
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | eval_intern.h | 9 | ||||
| -rw-r--r-- | thread_win32.c | 12 |
3 files changed, 29 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Thu May 15 17:32:51 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * 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. + Wed May 14 19:31:03 2014 Koichi Sasada <ko1@atdot.net> * ext/openssl/depend: remove dependency from internal headers. diff --git a/eval_intern.h b/eval_intern.h index f19c252918..eb78a41a95 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 diff --git a/thread_win32.c b/thread_win32.c index db00a736f6..feadede50d 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -754,6 +754,18 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr) return rb_thread_raised_p(th, RAISED_STACKOVERFLOW); } +#if defined(__MINGW32__) +LONG WINAPI +rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *exception) +{ + if (exception->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) { + rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW); + raise(SIGSEGV); + } + return EXCEPTION_CONTINUE_SEARCH; +} +#endif + #ifdef RUBY_ALLOCA_CHKSTK void ruby_alloca_chkstk(size_t len, void *sp) |