From 6e103e8412aff67cfbe877afb25d966ab6eaf09c Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Oct 2014 07:19:49 +0000
Subject: merge revision(s) 47896: [Backport #10369]

	* array.c (ary_recycle_hash): add RB_GC_GUARD
	  (rb_ary_diff): remove volatile
	  [Bug #10369]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index 57999fbd97..54d3d763e0 100644
--- a/array.c
+++ b/array.c
@@ -3781,6 +3781,7 @@ ary_recycle_hash(VALUE hash)
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
@@ -3804,7 +3805,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));
-- 
cgit v1.2.3