diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:11:21 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:11:21 +0000 |
commit | 91ad9122a51d795b1267191ec0e40a3e910dbe11 (patch) | |
tree | 9463b7ca6626724a07873e85047bd66982010df9 | |
parent | 98c244c122e21f5e4f73d42fcf8b8264012f9f3c (diff) |
merge revision(s) 49875: [Backport #10946]
* class.c (rb_prepend_module): need a WB for klass -> origin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | class.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Apr 13 00:09:48 2015 Koichi Sasada <ko1@atdot.net> + + * class.c (rb_prepend_module): need a WB for klass -> origin. + Sun Apr 12 23:53:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/fiddle/extconf.rb: needs --enable-shared when linked to @@ -932,7 +932,7 @@ rb_prepend_module(VALUE klass, VALUE module) OBJ_WB_UNPROTECT(origin); /* TODO: conservative shading. Need more survey. */ 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, @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.2" #define RUBY_RELEASE_DATE "2015-04-13" -#define RUBY_PATCHLEVEL 89 +#define RUBY_PATCHLEVEL 90 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 4 |