1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* class.c (move_refined_method): should insert a write barrier

Browse Source 
from an original class to a created (cloned) method entry.
* test/ruby/test_refinement.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-08-31 08:07:59 +00:00
parent c16523e67b
commit 15e48288fd
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Aug 31 17:04:45 2015 Koichi Sasada <ko1@atdot.net>
* class.c (move_refined_method): should insert a write barrier
from an original class to a created (cloned) method entry.
* test/ruby/test_refinement.rb: add a test.
Sun Aug 30 02:42:22 2015 Aaron Patterson <tenderlove@ruby-lang.org> Sun Aug 30 02:42:22 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support * ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support

6
class.c
View File

@ -911,7 +911,8 @@ static enum rb_id_table_iterator_result
move_refined_method(ID key, VALUE value, void *data) move_refined_method(ID key, VALUE value, void *data)
{ {
rb_method_entry_t *me = (rb_method_entry_t *) value; rb_method_entry_t *me = (rb_method_entry_t *) value;
struct rb_id_table *tbl = (struct rb_id_table *) data; VALUE klass = (VALUE)data;
struct rb_id_table *tbl = RCLASS_M_TBL(klass);
if (me->def->type == VM_METHOD_TYPE_REFINED) { if (me->def->type == VM_METHOD_TYPE_REFINED) {
if (me->def->body.refined.orig_me) { if (me->def->body.refined.orig_me) {
@ -919,6 +920,7 @@ move_refined_method(ID key, VALUE value, void *data)
RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL); RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
new_me = rb_method_entry_clone(me); new_me = rb_method_entry_clone(me);
rb_id_table_insert(tbl, key, (VALUE)new_me); rb_id_table_insert(tbl, key, (VALUE)new_me);
RB_OBJ_WRITTEN(klass, Qundef, new_me);
rb_method_entry_copy(me, orig_me); rb_method_entry_copy(me, orig_me);
return ID_TABLE_CONTINUE; return ID_TABLE_CONTINUE;
} }
@ -953,7 +955,7 @@ rb_prepend_module(VALUE klass, VALUE module)
RCLASS_SET_ORIGIN(klass, origin); RCLASS_SET_ORIGIN(klass, origin);
RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass); RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
RCLASS_M_TBL_INIT(klass); RCLASS_M_TBL_INIT(klass);
rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)RCLASS_M_TBL(klass)); rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
} }
changed = include_modules_at(klass, klass, module, FALSE); changed = include_modules_at(klass, klass, module, FALSE);
if (changed < 0) if (changed < 0)

13
test/ruby/test_refinement.rb
View File

@ -744,6 +744,7 @@ class TestRefinement < Test::Unit::TestCase
PrependIntoRefinement::User.invoke_baz_on(x)) PrependIntoRefinement::User.invoke_baz_on(x))
end end
PrependAfterRefine_CODE = <<-EOC
module PrependAfterRefine module PrependAfterRefine
class C class C
def foo def foo
@ -777,6 +778,18 @@ class TestRefinement < Test::Unit::TestCase
prepend Mixin prepend Mixin
end end
end end
EOC
eval PrependAfterRefine_CODE
def test_prepend_after_refine_wb_miss
assert_normal_exit %Q{
GC.stress = true
10.times{
#{PrependAfterRefine_CODE}
undef PrependAfterRefine
}
}
end
def test_prepend_after_refine def test_prepend_after_refine
x = eval_using(PrependAfterRefine::M, x = eval_using(PrependAfterRefine::M,