ktsj	2016-11-06 00:30:55 +0900 (Sun, 06 Nov 2016)

  New Revision: 56605

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56605

  Log:
    * vm_eval.c (vm_call0_cfunc_with_frame): pass method id to
      dtrace hook. follow up r56592.

  Modified files:
    trunk/ChangeLog
    trunk/vm_eval.c
Index: vm_eval.c
===================================================================
--- vm_eval.c	(revision 56604)
+++ vm_eval.c	(revision 56605)
@@ -116,7 +116,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* t https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L116
     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* t https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L137
 	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;
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56604)
+++ ChangeLog	(revision 56605)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Nov  6 00:22:51 2016  Kazuki Tsujimoto  <kazuki@c...>
+
+	* 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@f...>
 
 	* lib/resolv.rb (Resolv::LOC::Coord.create): fixed.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/