usa	2014-09-17 15:23:24 +0900 (Wed, 17 Sep 2014)

  New Revision: 47612

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47612

  Log:
    merge revision(s) 46495: [Backport #9971]
    
    signal.c: no cfunc frame at stack overflow
    
    * signal.c (check_stack_overflow): avoid pushing a cfunc frame,
      trying to fix stack overflow deadlock.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/signal.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47611)
+++ ruby_2_0_0/version.h	(revision 47612)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-17"
-#define RUBY_PATCHLEVEL 574
+#define RUBY_PATCHLEVEL 575
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_0_0/signal.c
===================================================================
--- ruby_2_0_0/signal.c	(revision 47611)
+++ ruby_2_0_0/signal.c	(revision 47612)
@@ -614,7 +614,7 @@ check_stack_overflow(const void *addr) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/signal.c#L614
 {
     int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
     NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = ruby_current_thread;
     if (ruby_stack_overflowed_p(th, addr)) {
 	ruby_thread_stack_overflow(th);
     }

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46495


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/