nagachika	2014-10-15 23:24:14 +0900 (Wed, 15 Oct 2014)

  New Revision: 47949

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

  Log:
    merge revision(s) r47896: [Backport #10369]
    
    * array.c (ary_recycle_hash): add RB_GC_GUARD
      (rb_ary_diff): remove volatile
      [Bug #10369]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/array.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/array.c
===================================================================
--- ruby_2_1/array.c	(revision 47948)
+++ ruby_2_1/array.c	(revision 47949)
@@ -3949,6 +3949,7 @@ ary_recycle_hash(VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/array.c#L3949
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
@@ -3972,7 +3973,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_1/array.c#L3973
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    volatile VALUE hash;
+    VALUE hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2));
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47948)
+++ ruby_2_1/ChangeLog	(revision 47949)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Oct 15 23:13:43 2014  Eric Wong  <e@8...>
+
+	* array.c (ary_recycle_hash): add RB_GC_GUARD
+	  (rb_ary_diff): remove volatile
+	  [Bug #10369]
+
 Wed Oct 15 23:10:07 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47948)
+++ ruby_2_1/version.h	(revision 47949)
@@ -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 251
+#define RUBY_PATCHLEVEL 252
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

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


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