[前][次][番号順一覧][スレッド一覧]

ruby-changes:39915

From: nobu <ko1@a...>
Date: Fri, 2 Oct 2015 00:19:09 +0900 (JST)
Subject: [ruby-changes:39915] nobu:r51996 (trunk): proc.c: fix symbol proc mark

nobu	2015-10-02 00:18:42 +0900 (Fri, 02 Oct 2015)

  New Revision: 51996

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

  Log:
    proc.c: fix symbol proc mark
    
    * proc.c (proc_mark): block.ep of Proc from Symbol is now NULL.
      [ruby-core:70961] [Bug #11560]

  Modified files:
    trunk/ChangeLog
    trunk/proc.c
    trunk/test/ruby/test_symbol.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51995)
+++ ChangeLog	(revision 51996)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Oct  2 00:18:39 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* proc.c (proc_mark): block.ep of Proc from Symbol is now NULL.
+	  [ruby-core:70961] [Bug #11560]
+
 Wed Sep 30 15:47:13 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_args.c (vm_caller_setup_arg_block): bypass Symbol#to_proc
Index: proc.c
===================================================================
--- proc.c	(revision 51995)
+++ proc.c	(revision 51996)
@@ -48,7 +48,9 @@ proc_mark(void *ptr) https://github.com/ruby/ruby/blob/trunk/proc.c#L48
     rb_proc_t *proc = ptr;
     RUBY_MARK_UNLESS_NULL(proc->block.proc);
     RUBY_MARK_UNLESS_NULL(proc->block.self);
-    RUBY_MARK_UNLESS_NULL(rb_vm_proc_envval(proc));
+    if (proc->block.ep) {
+	RUBY_MARK_UNLESS_NULL(rb_vm_proc_envval(proc));
+    }
     if (proc->block.iseq && RUBY_VM_IFUNC_P(proc->block.iseq)) {
 	rb_gc_mark((VALUE)(proc->block.iseq));
     }
Index: test/ruby/test_symbol.rb
===================================================================
--- test/ruby/test_symbol.rb	(revision 51995)
+++ test/ruby/test_symbol.rb	(revision 51996)
@@ -122,6 +122,11 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_symbol.rb#L122
       GC.stress = true
       true.tap(&:itself)
     end;
+
+    assert_ruby_status([], <<-"end;", timeout: 0.1)
+      GC.stress = true
+      100.times {Proc.new(&:itself)}
+    end;
   end
 
   def test_call

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

[前][次][番号順一覧][スレッド一覧]