diff options
| author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-16 11:45:27 +0000 |
|---|---|---|
| committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-16 11:45:27 +0000 |
| commit | cd391985a187f4f82e1e04cba334930180a513ba (patch) | |
| tree | eee060a4b91eca01bc573dad712a2cbf5d0890f7 /vm.c | |
| parent | ddddf044b27c87b0b2d5b31bb1ed2277f211ec1e (diff) | |
* backport r39276 from trunk. [ruby-dev:46997] [Bug #7825]
* 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/branches/ruby_2_0_0@39279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
| -rw-r--r-- | vm.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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); } } |