nobu	2012-03-18 17:17:39 +0900 (Sun, 18 Mar 2012)

  New Revision: 35080

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35080

  Log:
    * gc.c (free_method_entry_i): method entry may be in
      unlinked_method_entry_list.  [ruby-core:43383][Bug #6171]

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/test/ruby/test_method.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35079)
+++ ChangeLog	(revision 35080)
@@ -1,3 +1,8 @@
+Sun Mar 18 17:17:36 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (free_method_entry_i): method entry may be in
+	  unlinked_method_entry_list.  [ruby-core:43383][Bug #6171]
+
 Sun Mar 18 15:27:31 2012  Tanaka Akira  <akr@f...>
 
 	* compile.c: typo fix by Run Paint Run Run.
Index: gc.c
===================================================================
--- gc.c	(revision 35079)
+++ gc.c	(revision 35080)
@@ -1709,7 +1709,9 @@
 static int
 free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
 {
-    rb_free_method_entry(me);
+    if (!me->mark) {
+	rb_free_method_entry(me);
+    }
     return ST_CONTINUE;
 }
 
Index: test/ruby/test_method.rb
===================================================================
--- test/ruby/test_method.rb	(revision 35079)
+++ test/ruby/test_method.rb	(revision 35080)
@@ -461,4 +461,16 @@
     assert_nothing_raised { v.instance_eval { mv2 } }
     assert_nothing_raised { v.instance_eval { mv3 } }
   end
+
+  def test_bound_method_entry
+    bug6171 = '[ruby-core:43383]'
+    assert_ruby_status([], <<-EOC, bug6171)
+      class Bug6171
+        def initialize(target)
+          define_singleton_method(:reverse, target.method(:reverse).to_proc)
+        end
+      end
+      1000.times {p = Bug6171.new('test'); 10000.times {p.reverse}}
+      EOC
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/