nagachika	2014-06-24 00:27:46 +0900 (Tue, 24 Jun 2014)

  New Revision: 46524

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

  Log:
    merge revision(s) r46313: [Backport #9896]
    
    * eval.c (rb_using_refinement): add write-barriers for
      cref->nd_refinements.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/eval.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46523)
+++ ruby_2_1/ChangeLog	(revision 46524)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Jun 24 00:21:58 2014  Koichi Sasada  <ko1@a...>
+
+	* eval.c (rb_using_refinement): add write-barriers for
+	  cref->nd_refinements.
+
 Tue Jun 24 00:14:20 2014  Tanaka Akira  <akr@f...>
 
 	* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
Index: ruby_2_1/eval.c
===================================================================
--- ruby_2_1/eval.c	(revision 46523)
+++ ruby_2_1/eval.c	(revision 46524)
@@ -1098,11 +1098,11 @@ rb_using_refinement(NODE *cref, VALUE kl https://github.com/ruby/ruby/blob/trunk/ruby_2_1/eval.c#L1098
     Check_Type(klass, T_CLASS);
     Check_Type(module, T_MODULE);
     if (NIL_P(cref->nd_refinements)) {
-	cref->nd_refinements = hidden_identity_hash_new();
+	RB_OBJ_WRITE(cref, &cref->nd_refinements, hidden_identity_hash_new());
     }
     else {
 	if (cref->flags & NODE_FL_CREF_OMOD_SHARED) {
-	    cref->nd_refinements = rb_hash_dup(cref->nd_refinements);
+	    RB_OBJ_WRITE(cref, &cref->nd_refinements, rb_hash_dup(cref->nd_refinements));
 	    cref->flags &= ~NODE_FL_CREF_OMOD_SHARED;
 	}
 	if (!NIL_P(c = rb_hash_lookup(cref->nd_refinements, klass))) {
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46523)
+++ ruby_2_1/version.h	(revision 46524)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-24"
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

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


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