From 2c1a9c3db35785087bba6624d7df5130be8ab97e Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 27 Jun 2014 08:03:11 +0000 Subject: merge revision(s) 43748,45947,45951: [Backport #9739] * eval_intern.h (SAVE_ROOT_JMPBUF): workaround for the failure of test/ruby/test_exception.rb on Windows. wrap by __try and __exception statements on mswin to raise SIGSEGV when EXCEPTION_STACK_OVERFLOW is occurred, because MSVCRT doesn't handle the exception. however, (1) mingw-gcc doesn't support __try and __exception statements, and (2) we cannot retry SystemStackError after this change yet (maybe crashed) because SEH and longjmp() are too uncongenial. * signal.c (check_stack_overflow, CHECK_STACK_OVERFLOW): now defined on Windows, too. * thread_win32.c (ruby_stack_overflowed_p): ditto. * 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_0_0@46576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 25 +++++++++++++++++++++++++ eval_intern.h | 28 ++++++++++++++++++++++++++++ signal.c | 6 +++++- thread_win32.c | 18 ++++++++++++++++++ version.h | 2 +- 5 files changed, 77 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cd119b741..5a98b9ac1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Fri Jun 27 17:02:36 2014 Hiroshi Shirosaki + + * 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 __except + on mswin introduced by r43748. + +Fri Jun 27 17:02:36 2014 NAKAMURA Usaku + + * eval_intern.h (SAVE_ROOT_JMPBUF): workaround for the failure of + test/ruby/test_exception.rb on Windows. + wrap by __try and __exception statements on mswin to raise SIGSEGV + when EXCEPTION_STACK_OVERFLOW is occurred, because MSVCRT doesn't + handle the exception. + however, (1) mingw-gcc doesn't support __try and __exception + statements, and (2) we cannot retry SystemStackError after this + change yet (maybe crashed) because SEH and longjmp() are too + uncongenial. + + * signal.c (check_stack_overflow, CHECK_STACK_OVERFLOW): now defined on + Windows, too. + + * thread_win32.c (ruby_stack_overflowed_p): ditto. + Fri Jun 27 16:56:38 2014 Eric Wong * signal.c (signal_exec): ignore immediate cmd for SIG_IGN diff --git a/eval_intern.h b/eval_intern.h index 334b8d439a..a47480a953 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -83,9 +83,37 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval #include +#ifdef _MSC_VER +#define SAVE_ROOT_JMPBUF_BEFORE_STMT \ + __try { +#define SAVE_ROOT_JMPBUF_AFTER_STMT \ + } \ + __except (GetExceptionCode() == EXCEPTION_STACK_OVERFLOW ? \ + (rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW), \ + raise(SIGSEGV), \ + EXCEPTION_EXECUTE_HANDLER) : \ + 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 +#endif + #define SAVE_ROOT_JMPBUF(th, stmt) do \ if (ruby_setjmp((th)->root_jmpbuf) == 0) { \ + SAVE_ROOT_JMPBUF_BEFORE_STMT \ stmt; \ + SAVE_ROOT_JMPBUF_AFTER_STMT \ } \ else { \ rb_fiber_start(); \ diff --git a/signal.c b/signal.c index 31f433baf7..bd9420081c 100644 --- a/signal.c +++ b/signal.c @@ -605,7 +605,7 @@ rb_get_next_signal(void) } -#ifdef USE_SIGALTSTACK +#if defined(USE_SIGALTSTACK) || defined(_WIN32) static void check_stack_overflow(const void *addr) { @@ -616,7 +616,11 @@ check_stack_overflow(const void *addr) ruby_thread_stack_overflow(th); } } +#ifdef _WIN32 +#define CHECK_STACK_OVERFLOW() check_stack_overflow(0) +#else #define CHECK_STACK_OVERFLOW() check_stack_overflow(info->si_addr) +#endif #else #define CHECK_STACK_OVERFLOW() (void)0 #endif diff --git a/thread_win32.c b/thread_win32.c index 49c143603b..2bb56d0646 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -766,6 +766,24 @@ native_reset_timer_thread(void) } } +int +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) diff --git a/version.h b/version.h index c21160ca90..80f1bd6c60 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-06-27" -#define RUBY_PATCHLEVEL 500 +#define RUBY_PATCHLEVEL 501 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.3