Skip to content

Commit 9af0f53

Browse files
committed
merge revision(s) 49898: [Backport ruby#10951]
* vm_insnhelper.c (lep_svar_set): add WBs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent f201642 commit 9af0f53

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Wed Jun 17 11:39:15 2015 Koichi Sasada <ko1@atdot.net>
2+
3+
* vm_insnhelper.c (lep_svar_set): add WBs.
4+
15
Tue Jun 9 16:29:49 2015 Eric Wong <e@80x24.org>
26

37
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.1.7"
2-
#define RUBY_RELEASE_DATE "2015-06-09"
3-
#define RUBY_PATCHLEVEL 366
2+
#define RUBY_RELEASE_DATE "2015-06-17"
3+
#define RUBY_PATCHLEVEL 367
44

55
#define RUBY_RELEASE_YEAR 2015
66
#define RUBY_RELEASE_MONTH 6
7-
#define RUBY_RELEASE_DAY 9
7+
#define RUBY_RELEASE_DAY 17
88

99
#include "ruby/version.h"
1010

vm_insnhelper.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,16 @@ lep_svar_set(rb_thread_t *th, VALUE *lep, rb_num_t key, VALUE val)
200200

201201
switch (key) {
202202
case 0:
203-
svar->u1.value = val;
203+
RB_OBJ_WRITE(svar, &svar->u1.value, val);
204204
return;
205205
case 1:
206-
svar->u2.value = val;
206+
RB_OBJ_WRITE(svar, &svar->u2.value, val);
207207
return;
208208
default: {
209209
VALUE ary = svar->u3.value;
210210

211211
if (NIL_P(ary)) {
212-
svar->u3.value = ary = rb_ary_new();
212+
RB_OBJ_WRITE(svar, &svar->u3.value, ary = rb_ary_new());
213213
}
214214
rb_ary_store(ary, key - DEFAULT_SPECIAL_VAR_COUNT, val);
215215
}

0 commit comments

Comments
 (0)