* 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

3 files changed, 36 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d26674467..a6029f2ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Sat Feb 16 20:43:43 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* 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.
+
 Fri Feb 15 00:49:32 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 03d7cab2d7..23b348a94f 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -522,4 +522,18 @@ class TestMethod < Test::Unit::TestCase
     assert_equal(x.singleton_class, x.method(:bar).owner)
     assert(x.method(:foo) != x.method(:bar), bug7613)
   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);
 	    }
 	}