summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-16 07:41:55 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-16 07:41:55 +0000
commitb4add2ac2be49677b05402bf236c7e547949e0a8 (patch)
tree679c9b0681aaa44ed0dad55790edb12f7e61838d /vm.c
parent7cbeff908fb75f82b08b2e7eeaed937167eef2d6 (diff)
* vm.c (rb_thread_mark): mark a working Proc of bmethod
(a method defined by define_method) even if the method was removed. We could not trace working Proc object which represents the body of bmethod if the method was removed (alias/undef/overridden). Simply, it was mark miss. This patch by Kazuki Tsujimoto. [Bug #7825] NOTE: We can brush up this marking because we do not need to mark `me' on each living control frame. We need to mark `me's only if `me' was free'ed. This is future work after Ruby 2.0.0. * test/ruby/test_method.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index 36def2c..3b40498 100644
--- a/vm.c
+++ b/vm.c
@@ -1782,7 +1782,11 @@ rb_thread_mark(void *ptr)
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;
+ if (cfp->me) {
+ /* TODO: marking `me' can be more sophisticated way */
+ ((rb_method_entry_t *)cfp->me)->mark = 1;
+ rb_mark_method_entry(cfp->me);
+ }
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
}
}