Skip to content

Commit

Permalink
a64: fix crash on register stack mark/sweep pass
Browse files Browse the repository at this point in the history
* 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/trunk@59307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
takano32 committed Jul 10, 2017
1 parent f1fe99b commit 7aa74a0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions thread_pthread.c
Expand Up @@ -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;
{
Expand All @@ -762,12 +768,6 @@ ruby_init_stack(volatile VALUE *addr
native_main_thread.stack_start < 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)
Expand Down

0 comments on commit 7aa74a0

Please sign in to comment.