diff options
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -1294,7 +1294,7 @@ vm_frametype_name(const rb_control_frame_t *cfp) #endif static void -hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp) +hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp, int will_finish_vm_exec) { switch (VM_FRAME_TYPE(th->cfp)) { case VM_FRAME_MAGIC_METHOD: @@ -1305,7 +1305,13 @@ hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp) case VM_FRAME_MAGIC_LAMBDA: if (VM_FRAME_TYPE_BMETHOD_P(th->cfp)) { EXEC_EVENT_HOOK(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil); - EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, th->cfp->me->called_id, th->cfp->me->klass, Qnil); + + if (!will_finish_vm_exec) { + /* kick RUBY_EVENT_RETURN at invoke_block_from_c() for bmethod */ + EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, + th->cfp->me->called_id, + th->cfp->me->klass, Qnil); + } } else { EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil); @@ -1486,7 +1492,7 @@ vm_exec(rb_thread_t *th) if (!catch_iseqval) { th->errinfo = Qnil; result = GET_THROWOBJ_VAL(err); - hook_before_rewind(th, th->cfp); + hook_before_rewind(th, th->cfp, TRUE); vm_pop_frame(th); goto finish_vme; } @@ -1629,7 +1635,7 @@ vm_exec(rb_thread_t *th) } else { /* skip frame */ - hook_before_rewind(th, th->cfp); + hook_before_rewind(th, th->cfp, FALSE); if (VM_FRAME_TYPE_FINISH_P(th->cfp)) { vm_pop_frame(th); |