1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) r47191: [Backport #10140]

* iseq.c (rb_iseq_clone): Should not insert write barrier from
	  non-RVALUE data (to non-RVALUE data, of course).
	  Ruby 2.1 also has a same problem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-09-09 17:59:51 +00:00
parent 8ba979b0eb
commit d2f4d58d52
3 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Wed Sep 10 02:51:38 2014 Koichi Sasada <ko1@atdot.net>
* iseq.c (rb_iseq_clone): Should not insert write barrier from
non-RVALUE data (to non-RVALUE data, of course).
Ruby 2.1 also has a same problem.
Wed Sep 10 02:33:08 2014 Koichi Sasada <ko1@atdot.net>
* parse.y (setup_fake_str): fake strings should not set class by

2
iseq.c
View file

@ -1943,7 +1943,7 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
if (iseq0->cref_stack->nd_next) {
RB_OBJ_WRITE(iseq1->cref_stack, &iseq1->cref_stack->nd_next, iseq0->cref_stack->nd_next);
}
RB_OBJ_WRITE(iseq1, &iseq1->klass, newcbase);
RB_OBJ_WRITE(iseq1->self, &iseq1->klass, newcbase);
}
return newiseq;

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-09-10"
#define RUBY_PATCHLEVEL 228
#define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9