nagachika	2017-07-23 17:05:15 +0900 (Sun, 23 Jul 2017)

  New Revision: 59405

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

  Log:
    merge revision(s) 59307: [Backport #13284]
    
    a64: fix crash on register stack mark/sweep pass
    
    * thread_pthread.c: move 'register_stack_start' earlier.
      [ruby-core:79928] [Bug #13284] [Fix GH-1625]
    
    Author:    Sergei Trofimovich <slyfox@g...>

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/thread_pthread.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/thread_pthread.c
===================================================================
--- ruby_2_4/thread_pthread.c	(revision 59404)
+++ ruby_2_4/thread_pthread.c	(revision 59405)
@@ -740,6 +740,12 @@ ruby_init_stack(volatile VALUE *addr https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread_pthread.c#L740
     )
 {
     native_main_thread.id = pthread_self();
+#ifdef __ia64
+    if (!native_main_thread.register_stack_start ||
+        (VALUE*)bsp < native_main_thread.register_stack_start) {
+        native_main_thread.register_stack_start = (VALUE*)bsp;
+    }
+#endif
 #if MAINSTACKADDR_AVAILABLE
     if (native_main_thread.stack_maxsize) return;
     {
@@ -763,12 +769,6 @@ ruby_init_stack(volatile VALUE *addr https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread_pthread.c#L769
         native_main_thread.stack_start = (VALUE *)addr;
     }
 #endif
-#ifdef __ia64
-    if (!native_main_thread.register_stack_start ||
-        (VALUE*)bsp < native_main_thread.register_stack_start) {
-        native_main_thread.register_stack_start = (VALUE*)bsp;
-    }
-#endif
     {
 #if defined(HAVE_GETRLIMIT)
 #if defined(PTHREAD_STACK_DEFAULT)
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 59404)
+++ ruby_2_4/version.h	(revision 59405)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-07-23"
-#define RUBY_PATCHLEVEL 156
+#define RUBY_PATCHLEVEL 157
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 59404)
+++ ruby_2_4	(revision 59405)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59307

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