From bc69a7df4c6738d44b6fa75742458c6985750ddb Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 14 Jun 2015 18:43:10 +0000 Subject: [PATCH] merge revision(s) 49898: [Backport #10951] * vm_insnhelper.c (lep_svar_set): add WBs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ version.h | 6 +++--- vm_insnhelper.c | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae878d36e2..b9794a9413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jun 15 03:24:23 2015 Koichi Sasada + + * vm_insnhelper.c (lep_svar_set): add WBs. + Fri Jun 12 01:39:49 2015 Eric Wong * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile diff --git a/version.h b/version.h index 826ebeeb98..6a4a3de86f 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #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" diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 8b2f8e78c4..b40ebe1814 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -186,16 +186,16 @@ lep_svar_set(rb_thread_t *th, VALUE *lep, rb_num_t key, VALUE val) 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); }