From 91ad9122a51d795b1267191ec0e40a3e910dbe11 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 12 Apr 2015 15:11:21 +0000 Subject: 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 --- ChangeLog | 4 ++++ class.c | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cdead1c06..7245393770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 13 00:09:48 2015 Koichi Sasada + + * class.c (rb_prepend_module): need a WB for klass -> origin. + Sun Apr 12 23:53:33 2015 Nobuyoshi Nakada * ext/fiddle/extconf.rb: needs --enable-shared when linked to diff --git a/class.c b/class.c index 8cd663ee01..65d0d30abd 100644 --- a/class.c +++ b/class.c @@ -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, diff --git a/version.h b/version.h index eb293eaa99..9447953522 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3