nagachika	2015-06-15 03:43:10 +0900 (Mon, 15 Jun 2015)

  New Revision: 50899

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

  Log:
    merge revision(s) 49898: [Backport #10951]
    
    * vm_insnhelper.c (lep_svar_set): add WBs.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_insnhelper.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50898)
+++ ruby_2_2/ChangeLog	(revision 50899)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Jun 15 03:24:23 2015  Koichi Sasada  <ko1@a...>
+
+	* vm_insnhelper.c (lep_svar_set): add WBs.
+
 Fri Jun 12 01:39:49 2015  Eric Wong  <e@8...>
 
 	* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50898)
+++ ruby_2_2/version.h	(revision 50899)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
-#define RUBY_RELEASE_DATE "2015-06-12"
-#define RUBY_PATCHLEVEL 133
+#define RUBY_RELEASE_DATE "2015-06-15"
+#define RUBY_PATCHLEVEL 134
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 
Index: ruby_2_2/vm_insnhelper.c
===================================================================
--- ruby_2_2/vm_insnhelper.c	(revision 50898)
+++ ruby_2_2/vm_insnhelper.c	(revision 50899)
@@ -186,16 +186,16 @@ lep_svar_set(rb_thread_t *th, VALUE *lep https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_insnhelper.c#L186
 
     switch (key) {
       case 0:
-	svar->u1.value = val;
+	RB_OBJ_WRITE(svar, &svar->u1.value, val);
 	return;
       case 1:
-	svar->u2.value = val;
+	RB_OBJ_WRITE(svar, &svar->u2.value, val);
 	return;
       default: {
 	VALUE ary = svar->u3.value;
 
 	if (NIL_P(ary)) {
-	    svar->u3.value = ary = rb_ary_new();
+	    RB_OBJ_WRITE(svar, &svar->u3.value, ary = rb_ary_new());
 	}
 	rb_ary_store(ary, key - DEFAULT_SPECIAL_VAR_COUNT, val);
       }

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49898


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