From 68bac3cca4d8975d9f8ac2e4772471a30c604b12 Mon Sep 17 00:00:00 2001 From: kosaki Date: Fri, 18 Dec 2015 02:09:38 +0000 Subject: [PATCH] * vm.c (vm_exec): call RUBY_DTRACE_CMETHOD_RETURN_HOOK instead of RUBY_DTRACE_METHOD_RETURN_HOOK. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 093ebec3e0..d0ae0e74e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 11 06:39:30 2015 KOSAKI Motohiro + + * vm.c (vm_exec): call RUBY_DTRACE_CMETHOD_RETURN_HOOK instead of + RUBY_DTRACE_METHOD_RETURN_HOOK. + Fri Dec 18 10:24:44 2015 SHIBATA Hiroshi * lib/irb/ruby-lex.rb: fixed parse error for striped heredocument syntax. diff --git a/vm.c b/vm.c index 2dd2dfc879..58ed56b993 100644 --- a/vm.c +++ b/vm.c @@ -1670,7 +1670,7 @@ vm_exec(rb_thread_t *th) EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->cfp->self, rb_vm_frame_method_entry(th->cfp)->called_id, rb_vm_frame_method_entry(th->cfp)->owner, Qnil); - RUBY_DTRACE_METHOD_RETURN_HOOK(th, + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, rb_vm_frame_method_entry(th->cfp)->owner, rb_vm_frame_method_entry(th->cfp)->called_id); }