naruse	2012-02-09 17:08:46 +0900 (Thu, 09 Feb 2012)

  New Revision: 34513

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34513

  Log:
    merge revision(s) 33410:
    
    * cont.c (cont_mark): mark original Thread object from saved_thread.
      [ruby-dev:44567] [Bug #5386]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/cont.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34512)
+++ ruby_1_9_3/ChangeLog	(revision 34513)
@@ -1,3 +1,8 @@
+Thu Feb  9 17:08:20 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* 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  <naruse@r...>
 
 	* cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
Index: ruby_1_9_3/cont.c
===================================================================
--- ruby_1_9_3/cont.c	(revision 34512)
+++ ruby_1_9_3/cont.c	(revision 34513)
@@ -139,6 +139,7 @@
 	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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34512)
+++ ruby_1_9_3/version.h	(revision 34513)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/