merges r28755 from trunk into ruby_1_9_2.

--
* vm.c (rb_thread_mark): mark only self of normal iseqs, not
  nodes.  [ruby-dev:41874]

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/vm.c b/vm.c
index 5809ba04ab..d222a46412 100644
--- a/vm.c
+++ b/vm.c
@@ -1646,8 +1646,11 @@ rb_thread_mark(void *ptr)
 	    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 (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);
 	    }