summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-26 00:51:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-26 00:51:33 +0000
commit7d2ed51843a5e208044d93e4c91694d4d02ea202 (patch)
tree30bfee8e2d6a3f2c38f3604a18b4d473229e9504
parent7bfa1146e298acb72d9ee0301fcf37acb4699197 (diff)
* vm.c (rb_thread_mark): mark only self of normal iseqs, not
nodes. [ruby-dev:41874] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bb9b6b623..5edf7459e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 26 09:51:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (rb_thread_mark): mark only self of normal iseqs, not
+ nodes. [ruby-dev:41874]
+
Sun Jul 25 05:37:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_cmp): honor the result of infinite? method of the
diff --git a/vm.c b/vm.c
index f8509d766b..3010fe8ef3 100644
--- a/vm.c
+++ b/vm.c
@@ -1647,7 +1647,7 @@ rb_thread_mark(void *ptr)
while (cfp != limit_cfp) {
rb_gc_mark(cfp->proc);
- if (cfp->iseq) rb_gc_mark(cfp->iseq->self);
+ if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) rb_gc_mark(cfp->iseq->self);
if (cfp->me) ((rb_method_entry_t *)cfp->me)->mark = 1;
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
}