From 475f86f4512045a0aa0ebfffb85c3566cb6d2cd0 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 9 Feb 2012 08:08:46 +0000 Subject: merge revision(s) 33410: * cont.c (cont_mark): mark original Thread object from saved_thread. [ruby-dev:44567] [Bug #5386] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ cont.c | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f57016cc80..73e384f441 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 9 17:08:20 2012 CHIKANAGA Tomoyuki + + * cont.c (cont_mark): mark original Thread object from saved_thread. + [ruby-dev:44567] [Bug #5386] + Thu Feb 9 17:05:07 2012 NARUSE, Yui * cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD diff --git a/cont.c b/cont.c index f7a9057f65..490ffac80b 100644 --- a/cont.c +++ b/cont.c @@ -139,6 +139,7 @@ cont_mark(void *ptr) rb_context_t *cont = ptr; rb_gc_mark(cont->value); rb_thread_mark(&cont->saved_thread); + rb_gc_mark(cont->saved_thread.self); if (cont->vm_stack) { #ifdef CAPTURE_JUST_VALID_VM_STACK diff --git a/version.h b/version.h index 3ff34ae322..5effd2e0f5 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 75 +#define RUBY_PATCHLEVEL 76 #define RUBY_RELEASE_DATE "2012-02-09" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3