vm_insnhelper.c: compare with me in method top cfp

* vm_insnhelper.c (vm_call_method): block level control frame does not
  have method entry, so obtain the method entry from method top-level
  control frame to be compared with refined method entry.
  [ruby-core:52750] [Bug #7925]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-24 04:36:00 +00:00
Родитель bd88e6c0b5
Коммит ac94eb1a91
3 изменённых файлов: 56 добавлений и 4 удалений

Просмотреть файл

@ -1,3 +1,10 @@
Sun Feb 24 13:35:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): block level control frame does not
have method entry, so obtain the method entry from method top-level
control frame to be compared with refined method entry.
[ruby-core:52750] [Bug #7925]
Wed Feb 20 13:23:00 2013 Zachary Scott <zachary@zacharyscott.net> Wed Feb 20 13:23:00 2013 Zachary Scott <zachary@zacharyscott.net>
* object.c: Document methods receiving string and convert to symbol * object.c: Document methods receiving string and convert to symbol

Просмотреть файл

@ -801,6 +801,31 @@ class TestRefinement < Test::Unit::TestCase
assert_equal("mixin", TestRefinement::PrependAfterRefine::C.new.bar) assert_equal("mixin", TestRefinement::PrependAfterRefine::C.new.bar)
end end
module SuperInBlock
class C
def foo(*args)
[:foo, *args]
end
end
module R
refine C do
def foo(*args)
tap do
return super(:ref, *args)
end
end
end
end
end
def test_super_in_block
bug7925 = '[ruby-core:52750] [Bug #7925]'
x = eval_using(SuperInBlock::R,
"TestRefinement:: SuperInBlock::C.new.foo(#{bug7925.dump})")
assert_equal([:foo, :ref, bug7925], x, bug7925)
end
private private
def eval_using(mod, s) def eval_using(mod, s)

Просмотреть файл

@ -1675,6 +1675,24 @@ find_refinement(VALUE refinements, VALUE klass)
static int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); static int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2);
static VALUE vm_call_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci); static VALUE vm_call_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci);
static rb_control_frame_t *
current_method_entry(rb_thread_t *th, rb_control_frame_t *cfp)
{
rb_control_frame_t *top_cfp = cfp;
if (cfp->iseq && cfp->iseq->type == ISEQ_TYPE_BLOCK) {
rb_iseq_t *local_iseq = cfp->iseq->local_iseq;
do {
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
if (RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) {
/* TODO: orphan block */
return top_cfp;
}
} while (cfp->iseq != local_iseq);
}
return cfp;
}
static static
#ifdef _MSC_VER #ifdef _MSC_VER
__forceinline __forceinline
@ -1767,10 +1785,12 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
} }
me = rb_method_entry(refinement, ci->mid, &defined_class); me = rb_method_entry(refinement, ci->mid, &defined_class);
if (me) { if (me) {
if (ci->call == vm_call_super_method && if (ci->call == vm_call_super_method) {
cfp->me && rb_control_frame_t *top_cfp = current_method_entry(th, cfp);
rb_method_definition_eq(me->def, cfp->me->def)) { if (top_cfp->me &&
goto no_refinement_dispatch; rb_method_definition_eq(me->def, top_cfp->me->def)) {
goto no_refinement_dispatch;
}
} }
ci->me = me; ci->me = me;
ci->defined_class = defined_class; ci->defined_class = defined_class;