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

reset cache before iterating

Browse source 
cee02d754d resets pCMC and `me`
will be a invalidated and continuing the invalidated `me`,
it will break the data structure. This patch tris to clear
all methods of specified class before manipulating the `me`s.
[Issue #17417]
This commit is contained in:
Koichi Sasada 2020-12-22 05:27:47 +09:00
parent d0e4ccbefc
commit 520dcbd600
Notes: git 2020-12-22 06:09:54 +09:00 
Merged: https://github.com/ruby/ruby/pull/3964
2 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
class.c
View file

@ -1105,12 +1105,11 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
static enum rb_id_table_iterator_result
move_refined_method(ID key, VALUE value, void *data)
{
rb_method_entry_t *me = (rb_method_entry_t *) value;
VALUE klass = (VALUE)data;
struct rb_id_table *tbl = RCLASS_M_TBL(klass);
rb_method_entry_t *me = (rb_method_entry_t *)value;
if (me->def->type == VM_METHOD_TYPE_REFINED) {
rb_clear_method_cache(klass, me->called_id);
VALUE klass = (VALUE)data;
struct rb_id_table *tbl = RCLASS_M_TBL(klass);
if (me->def->body.refined.orig_me) {
const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
@ -1130,6 +1129,19 @@ move_refined_method(ID key, VALUE value, void *data)
}
}
static enum rb_id_table_iterator_result
cache_clear_refined_method(ID key, VALUE value, void *data)
{
rb_method_entry_t *me = (rb_method_entry_t *) value;
if (me->def->type == VM_METHOD_TYPE_REFINED) {
VALUE klass = (VALUE)data;
rb_clear_method_cache(klass, me->called_id);
}
return ID_TABLE_CONTINUE;
}
static void
ensure_origin(VALUE klass)
{
@ -1141,6 +1153,7 @@ ensure_origin(VALUE klass)
RCLASS_SET_ORIGIN(klass, origin);
RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
RCLASS_M_TBL_INIT(klass);
rb_id_table_foreach(RCLASS_M_TBL(origin), cache_clear_refined_method, (void *)klass);
rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
}
}

32
test/ruby/test_refinement.rb
View file

@ -2441,12 +2441,6 @@ class TestRefinement < Test::Unit::TestCase
$VERBOSE = verbose_bak
end
private
def eval_using(mod, s)
eval("using #{mod}; #{s}", Sandbox::BINDING)
end
# [Bug #17386]
def test_prepended_with_method_cache
foo = Class.new do
@ -2473,4 +2467,30 @@ class TestRefinement < Test::Unit::TestCase
foo.prepend code
assert_equal :Code, obj.foo
end
# [Bug #17417]
def test_prepended_with_method_cache_17417
assert_normal_exit %q{
module M
def hoge; end
end
module R
refine Hash do
def except *args; end
end
end
h = {}
h.method(:except) # put it on pCMC
Hash.prepend(M)
h.method(:except)
}
end
private
def eval_using(mod, s)
eval("using #{mod}; #{s}", Sandbox::BINDING)
end
end