From f8f026c4d60a284ffeb03f9804bea85dab5ff4fa Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 27 Mar 2017 11:25:19 +0000 Subject: merge revision(s) 56592: [Backport #11964] * eval.c, method.h, proc.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: TracePoint#method_id should return method_id, not callee_id. [ruby-core:77241] [Feature #12747] * test/ruby/test_settracefunc.rb: change accordingly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 3a9e25c8b4..80ea6561c0 100644 --- a/eval.c +++ b/eval.c @@ -763,7 +763,7 @@ rb_raise_jump(VALUE mesg, VALUE cause) ID mid = me->called_id; th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, me->def->original_id, klass, Qnil); setup_exception(th, TAG_RAISE, mesg, cause); -- cgit v1.2.3