nobu	2010-07-26 13:01:38 +0900 (Mon, 26 Jul 2010)

  New Revision: 28755

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

  Log:
    * vm.c (rb_thread_mark): should mark iseq itself other than normal
      iseq.  [ruby-dev:41880]

  Modified files:
    trunk/ChangeLog
    trunk/vm.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28754)
+++ ChangeLog	(revision 28755)
@@ -1,3 +1,8 @@
+Mon Jul 26 13:01:25 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (rb_thread_mark): should mark iseq itself other than normal
+	  iseq.  [ruby-dev:41880]
+
 Mon Jul 26 11:51:01 2010  NARUSE, Yui  <naruse@r...>
 
 	* configure.in: define BROKEN_CLOSE on FreeBSD.
Index: vm.c
===================================================================
--- vm.c	(revision 28754)
+++ vm.c	(revision 28755)
@@ -1646,8 +1646,11 @@
 	    rb_gc_mark_locations(p, p + th->mark_stack_len);
 
 	    while (cfp != limit_cfp) {
+		rb_iseq_t *iseq = cfp->iseq;
 		rb_gc_mark(cfp->proc);
-		if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) rb_gc_mark(cfp->iseq->self);
+		if (iseq) {
+		    rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
+		}
 		if (cfp->me) ((rb_method_entry_t *)cfp->me)->mark = 1;
 		cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 	    }

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