diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 08:05:15 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 08:05:15 +0000 |
commit | 66163b7749fa4eb9e3e085dcfaac9df4715bc1f2 (patch) | |
tree | 48a53ca7de6001bd50cc21fe898cab960726b3d4 | |
parent | fffc133db1c5d6b4309f80ed28e7e7364ac90801 (diff) |
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@gentoo.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | thread_pthread.c | 12 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 43644e7c06..810f5c5de6 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -740,6 +740,12 @@ ruby_init_stack(volatile VALUE *addr ) { 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 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) @@ -1,6 +1,6 @@ #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 |