From 3f2f64dbeb846d84ddacd10c251d918d26229dac Mon Sep 17 00:00:00 2001 From: ktsj Date: Sat, 5 Nov 2016 15:30:55 +0000 Subject: [PATCH] * vm_eval.c (vm_call0_cfunc_with_frame): pass method id to dtrace hook. follow up r56592. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_eval.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce1d9f0c26..132a817c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 6 00:22:51 2016 Kazuki Tsujimoto + + * 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 * lib/resolv.rb (Resolv::LOC::Coord.create): fixed. diff --git a/vm_eval.c b/vm_eval.c index e7fd2a8e89..ace21b0468 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -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; }