diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_eval.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Nov 6 00:22:51 2016 Kazuki Tsujimoto <kazuki@callcc.net> + + * vm_eval.c (vm_call0_cfunc_with_frame): pass method id to + dtrace hook. follow up r56592. + Sun Nov 6 00:06:38 2016 Tanaka Akira <akr@fsij.org> * lib/resolv.rb (Resolv::LOC::Coord.create): fixed. @@ -116,7 +116,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons ID mid = ci->mid; VALUE block_handler = calling->block_handler; - RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, mid); + RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, me->def->original_id); EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, me->def->original_id, mid, me->owner, Qnil); { rb_control_frame_t *reg_cfp = th->cfp; @@ -137,7 +137,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons rb_vm_pop_frame(th); } EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->def->original_id, mid, me->owner, val); - RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, mid); + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id); return val; } |