usa	2015-04-13 16:52:40 +0900 (Mon, 13 Apr 2015)

  New Revision: 50285

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

  Log:
    merge revision(s) 49875: [Backport #10946]
    
    * class.c (rb_prepend_module): need a WB for klass -> origin.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/class.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50284)
+++ ruby_2_1/ChangeLog	(revision 50285)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Apr 13 16:52:14 2015  Koichi Sasada  <ko1@a...>
+
+	* class.c (rb_prepend_module): need a WB for klass -> origin.
+
 Mon Apr 13 16:48:14 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (vm_call_super): search next super class from the
Index: ruby_2_1/class.c
===================================================================
--- ruby_2_1/class.c	(revision 50284)
+++ ruby_2_1/class.c	(revision 50285)
@@ -936,7 +936,7 @@ rb_prepend_module(VALUE klass, VALUE mod https://github.com/ruby/ruby/blob/trunk/ruby_2_1/class.c#L936
 	OBJ_WB_UNPROTECT(origin); /* TODO: conservertive shading. Need more survery. */
 	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
 	RCLASS_SET_SUPER(klass, origin);
-	RCLASS_ORIGIN(klass) = origin;
+	RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin);
 	RCLASS_M_TBL_WRAPPER(origin) = RCLASS_M_TBL_WRAPPER(klass);
 	RCLASS_M_TBL_INIT(klass);
 	st_foreach(RCLASS_M_TBL(origin), move_refined_method,
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50284)
+++ ruby_2_1/version.h	(revision 50285)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-04-13"
-#define RUBY_PATCHLEVEL 331
+#define RUBY_PATCHLEVEL 332
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 4

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


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