1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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_3@59537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-08-09 08:24:37 +00:00
parent 380a1e6773
commit f6d9f6fd2a
3 changed files with 16 additions and 7 deletions

View file

@ -1,3 +1,12 @@
Wed Aug 9 17:22:29 2017 TAKANO `takano32' Mitsuhiro <tak@no32.tk>
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>
Wed Aug 9 17:10:27 2017 Shugo Maeda <shugo@ruby-lang.org>
* test/net/smtp/test_smtp.rb (test_tls_connect, test_tls_connect):

View file

@ -738,6 +738,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;
{
@ -760,12 +766,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)

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-08-09"
#define RUBY_PATCHLEVEL 347
#define RUBY_PATCHLEVEL 348
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 8