ruby-changes:27399
From: nobu <ko1@a...>
Date: Sun, 24 Feb 2013 13:36:11 +0900 (JST)
Subject: [ruby-changes:27399] nobu:r39451 (trunk): vm_insnhelper.c: compare with me in method top cfp
nobu 2013-02-24 13:36:00 +0900 (Sun, 24 Feb 2013) New Revision: 39451 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39451 Log: 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] Modified files: trunk/ChangeLog trunk/test/ruby/test_refinement.rb trunk/vm_insnhelper.c Index: ChangeLog =================================================================== --- ChangeLog (revision 39450) +++ ChangeLog (revision 39451) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sun Feb 24 13:35:57 2013 Nobuyoshi Nakada <nobu@r...> + + * 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@z...> * object.c: Document methods receiving string and convert to symbol Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 39450) +++ vm_insnhelper.c (revision 39451) @@ -1675,6 +1675,24 @@ find_refinement(VALUE refinements, VALUE https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1675 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 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 #ifdef _MSC_VER __forceinline @@ -1767,10 +1785,12 @@ vm_call_method(rb_thread_t *th, rb_contr https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1785 } me = rb_method_entry(refinement, ci->mid, &defined_class); if (me) { - if (ci->call == vm_call_super_method && - cfp->me && - rb_method_definition_eq(me->def, cfp->me->def)) { - goto no_refinement_dispatch; + if (ci->call == vm_call_super_method) { + rb_control_frame_t *top_cfp = current_method_entry(th, cfp); + if (top_cfp->me && + rb_method_definition_eq(me->def, top_cfp->me->def)) { + goto no_refinement_dispatch; + } } ci->me = me; ci->defined_class = defined_class; Index: test/ruby/test_refinement.rb =================================================================== --- test/ruby/test_refinement.rb (revision 39450) +++ test/ruby/test_refinement.rb (revision 39451) @@ -801,6 +801,31 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/test/ruby/test_refinement.rb#L801 assert_equal("mixin", TestRefinement::PrependAfterRefine::C.new.bar) 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 def eval_using(mod, s) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/