From b4add2ac2be49677b05402bf236c7e547949e0a8 Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 16 Feb 2013 07:41:55 +0000 Subject: * 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 --- ChangeLog | 15 +++++++++++++++ test/ruby/test_method.rb | 14 ++++++++++++++ vm.c | 6 +++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff283d688e..c69b5ac843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sat Feb 16 16:08:35 2013 Koichi Sasada + + * 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. + Sat Feb 16 15:45:56 2013 Koichi Sasada * proc.c (rb_binding_new_with_cfp): create binding object even if diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 59034eb83a..7de4479a2b 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -561,4 +561,18 @@ class TestMethod < Test::Unit::TestCase } assert_equal(c, c.instance_method(:foo).owner, bug7836) end + + def test_gced_bmethod + assert_normal_exit %q{ + require 'irb' + IRB::Irb.module_eval do + define_method(:eval_input) do + IRB::Irb.module_eval { alias_method :eval_input, :to_s } + GC.start + Kernel + end + end + IRB.start + }, '[Bug #7825]' + end end diff --git a/vm.c b/vm.c index 36def2cfae..3b404984cc 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); } } -- cgit v1.2.3