a64: fix crash on register stack mark/sweep pass

takano32 · takano32 · commit 7aa74a0d0a22 · 2017-07-10T06:57:50.000Z
* 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
diff --git 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;
     {
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,12 @@ ruby_init_stack(volatile VALUE *addr`
`740`	`740`	`)`
`741`	`741`	`{`
`742`	`742`	`native_main_thread.id = pthread_self();`
	`743`	`+#ifdef __ia64`
	`744`	`+ if (!native_main_thread.register_stack_start \|\|`
	`745`	`+ (VALUE*)bsp < native_main_thread.register_stack_start) {`
	`746`	`+ native_main_thread.register_stack_start = (VALUE*)bsp;`
	`747`	`+ }`
	`748`	`+#endif`
`743`	`749`	`#if MAINSTACKADDR_AVAILABLE`
`744`	`750`	`if (native_main_thread.stack_maxsize) return;`
`745`	`751`	`{`
`@@ -762,12 +768,6 @@ ruby_init_stack(volatile VALUE *addr`
`762`	`768`	`native_main_thread.stack_start < addr)) {`
`763`	`769`	`native_main_thread.stack_start = (VALUE *)addr;`
`764`	`770`	`}`
`765`		`-#endif`
`766`		`-#ifdef __ia64`
`767`		`- if (!native_main_thread.register_stack_start \|\|`
`768`		`- (VALUE*)bsp < native_main_thread.register_stack_start) {`
`769`		`- native_main_thread.register_stack_start = (VALUE*)bsp;`
`770`		`- }`
`771`	`771`	`#endif`
`772`	`772`	`{`
`773`	`773`	`#if defined(HAVE_GETRLIMIT)`