nagachika	2014-10-15 23:12:22 +0900 (Wed, 15 Oct 2014)

  New Revision: 47947

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

  Log:
    merge revision(s) r47891: [Backport #10373]
    
    proc.c: method body GC guard
    
    * proc.c (rb_mod_define_method): guard method body to prevent its
      method entry from GC.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/proc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/proc.c
===================================================================
--- ruby_2_1/proc.c	(revision 47946)
+++ ruby_2_1/proc.c	(revision 47947)
@@ -1666,6 +1666,7 @@ rb_mod_define_method(int argc, VALUE *ar https://github.com/ruby/ruby/blob/trunk/ruby_2_1/proc.c#L1666
 	if (noex == NOEX_MODFUNC) {
 	    rb_method_entry_set(rb_singleton_class(mod), id, method->me, NOEX_PUBLIC);
 	}
+	RB_GC_GUARD(body);
     }
     else if (rb_obj_is_proc(body)) {
 	rb_proc_t *proc;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47946)
+++ ruby_2_1/version.h	(revision 47947)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 250
+#define RUBY_PATCHLEVEL 251
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47891


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