diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-06 13:08:41 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-06 13:08:41 +0000 |
commit | 60d6038ddaa6678ddcd7ce96ca6c947494b227a6 (patch) | |
tree | 0cc16dd0704a2c11acd4e51552565e8b427e0298 /class.c | |
parent | bd0c636211bb3063d9633d955f8807a1d9490048 (diff) | |
download | ruby-60d6038ddaa6678ddcd7ce96ca6c947494b227a6.tar.gz |
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
-rw-r--r-- | class.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -678,6 +678,13 @@ rb_include_module(VALUE klass, VALUE module) } static int +add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data) +{ + rb_add_refined_method_entry((VALUE) data, (ID) key); + return ST_CONTINUE; +} + +static int include_modules_at(VALUE klass, VALUE c, VALUE module) { VALUE p; @@ -707,6 +714,13 @@ include_modules_at(VALUE klass, VALUE c, VALUE module) } } c = RCLASS_SUPER(c) = rb_include_class_new(module, RCLASS_SUPER(c)); + if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) { + VALUE refined_class = + rb_refinement_module_get_refined_class(klass); + + st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, + (st_data_t) refined_class); + } if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries) changed = 1; skip: @@ -738,7 +752,7 @@ rb_prepend_module(VALUE klass, VALUE module) RCLASS_SUPER(klass) = origin; RCLASS_ORIGIN(klass) = origin; RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass); - RCLASS_M_TBL(klass) = 0; + RCLASS_M_TBL(klass) = st_init_numtable(); } changed = include_modules_at(klass, klass, module); if (changed < 0) |