merge revision(s) r47896: [Backport ruby#10369]

nagachika · nagachika · commit a50794de2eac · 2014-10-15T14:24:14.000Z
* array.c (ary_recycle_hash): add RB_GC_GUARD (rb_ary_diff): remove volatile [Bug ruby#10369] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 15 23:13:43 2014  Eric Wong  <e@80x24.org>
+
+	* 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@ruby-lang.org>
 
 	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
diff --git a/array.c b/array.c
@@ -3949,6 +3949,7 @@ ary_recycle_hash(VALUE hash)
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
@@ -3972,7 +3973,7 @@ static VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    volatile VALUE hash;
+    VALUE hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2));
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +Wed Oct 15 23:13:43 2014  Eric Wong  <[email protected]>
++
 +	* 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  <[email protected]>
 	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
Original file line number	Diff line number	Diff line change
`@@ -3949,6 +3949,7 @@ ary_recycle_hash(VALUE hash)`
`3949`	`3949`	`RHASH(hash)->ntbl = 0;`
`3950`	`3950`	`st_free_table(tbl);`
`3951`	`3951`	`}`
	`3952`	`+ RB_GC_GUARD(hash);`
`3952`	`3953`	`}`
`3953`	`3954`
`3954`	`3955`	`/*`
`@@ -3972,7 +3973,7 @@ static VALUE`
`3972`	`3973`	`rb_ary_diff(VALUE ary1, VALUE ary2)`
`3973`	`3974`	`{`
`3974`	`3975`	`VALUE ary3;`
`3975`		`- volatile VALUE hash;`
	`3976`	`+ VALUE hash;`
`3976`	`3977`	`long i;`
`3977`	`3978`
`3978`	`3979`	`hash = ary_make_hash(to_ary(ary2));`