From 2ff855724a40ffcb1c1c63be3640aa4f181fc3d8 Mon Sep 17 00:00:00 2001 From: Kazuki Tsujimoto Date: Sat, 10 Sep 2016 13:12:26 +0900 Subject: [PATCH 1/2] TracePoint#method_id should return method_id, not callee_id --- eval.c | 2 +- method.h | 2 +- proc.c | 2 +- test/ruby/test_settracefunc.rb | 6 +++--- vm.c | 18 +++++++++--------- vm_eval.c | 4 ++-- vm_insnhelper.c | 10 +++++----- vm_method.c | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eval.c b/eval.c index b660957..4906a43 100644 --- a/eval.c +++ b/eval.c @@ -738,7 +738,7 @@ rb_raise_jump(VALUE mesg, VALUE cause) ID mid = me->called_id; rb_vm_pop_frame(th); - 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); diff --git a/method.h b/method.h index 315915b..510c9b6 100644 --- a/method.h +++ b/method.h @@ -205,7 +205,7 @@ void rb_free_method_entry(const rb_method_entry_t *me); void rb_sweep_method_entry(void *vm); const rb_method_entry_t *rb_method_entry_clone(const rb_method_entry_t *me); -const rb_callable_method_entry_t *rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, VALUE defined_class); +const rb_callable_method_entry_t *rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID called_id, VALUE defined_class); void rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src); void rb_scope_visibility_set(rb_method_visibility_t); diff --git a/proc.c b/proc.c index c096f62..ff08a55 100644 --- a/proc.c +++ b/proc.c @@ -2225,7 +2225,7 @@ umethod_bind(VALUE method, VALUE recv) else { klass = rb_include_class_new(methclass, klass); } - RB_OBJ_WRITE(method, &bound->me, rb_method_entry_complement_defined_class(bound->me, klass)); + RB_OBJ_WRITE(method, &bound->me, rb_method_entry_complement_defined_class(bound->me, bound->me->called_id, klass)); } return method; diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 3132636..855b904 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -1153,8 +1153,8 @@ def test_aliased_c_method } assert_equal([ [:call, :size], - [:c_call, :original_size], - [:c_return, :original_size], + [:c_call, :size], + [:c_return, :size], [:return, :size] ], events, "should use alias method name for tracing c methods") end @@ -1287,7 +1287,7 @@ def test_recursive }.enable{ p 1 } - }, %w[:p :inspect 1], [], '[Bug #9940]') + }, %w[:p :to_s 1], [], '[Bug #9940]') end def method_prefix event diff --git a/vm.c b/vm.c index 74226d7..2e9d767 100644 --- a/vm.c +++ b/vm.c @@ -522,8 +522,8 @@ rb_vm_pop_cfunc_frame(void) rb_control_frame_t *cfp = th->cfp; const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp); - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, cfp->self, me->called_id, me->owner, Qnil); - RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->called_id); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, cfp->self, me->def->original_id, me->owner, Qnil); /* TODO */ + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id); vm_pop_frame(th, cfp, cfp->ep); } @@ -983,11 +983,11 @@ invoke_bmethod(rb_thread_t *th, const rb_iseq_t *iseq, VALUE self, const struct th->cfp->sp + arg_size, iseq->body->local_table_size - arg_size, iseq->body->stack_max); - RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->called_id); - EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->called_id, me->owner, Qnil); + RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->def->original_id); + EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->def->original_id, me->owner, Qnil); ret = vm_exec(th); - EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->called_id, me->owner, ret); - RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->called_id); + EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->def->original_id, me->owner, ret); + RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->def->original_id); return ret; } @@ -1602,7 +1602,7 @@ hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp, int will_finish_vm_ if (!will_finish_vm_exec) { /* kick RUBY_EVENT_RETURN at invoke_block_from_c() for bmethod */ EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, - rb_vm_frame_method_entry(th->cfp)->called_id, + rb_vm_frame_method_entry(th->cfp)->def->original_id, rb_vm_frame_method_entry(th->cfp)->owner, Qnil); } } @@ -1734,11 +1734,11 @@ vm_exec(rb_thread_t *th) while (th->cfp->pc == 0 || th->cfp->iseq == 0) { if (UNLIKELY(VM_FRAME_TYPE(th->cfp) == VM_FRAME_MAGIC_CFUNC)) { 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)->def->original_id, rb_vm_frame_method_entry(th->cfp)->owner, Qnil); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, rb_vm_frame_method_entry(th->cfp)->owner, - rb_vm_frame_method_entry(th->cfp)->called_id); + rb_vm_frame_method_entry(th->cfp)->def->original_id); } rb_vm_pop_frame(th); } diff --git a/vm_eval.c b/vm_eval.c index 18cd9dd..a712e55 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -117,7 +117,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons VALUE block_handler = calling->block_handler; RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, mid); - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, mid, me->owner, Qnil); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, me->def->original_id, me->owner, Qnil); { rb_control_frame_t *reg_cfp = th->cfp; @@ -136,7 +136,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons VM_PROFILE_UP(C2C_POPF); rb_vm_pop_frame(th); } - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, mid, me->owner, val); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->def->original_id, me->owner, val); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, mid); return val; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 7169a0f..11aad2a 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1723,8 +1723,8 @@ vm_call_cfunc_with_frame(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb VALUE block_handler = calling->block_handler; int argc = calling->argc; - RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, me->called_id); - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, me->called_id, me->owner, Qundef); + 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, me->owner, Qundef); vm_push_frame(th, NULL, VM_FRAME_MAGIC_CFUNC | VM_FRAME_FLAG_CFRAME | VM_ENV_FLAG_LOCAL, recv, block_handler, (VALUE)me, @@ -1742,8 +1742,8 @@ vm_call_cfunc_with_frame(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb rb_vm_pop_frame(th); - EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->called_id, me->owner, val); - RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->called_id); + EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->def->original_id, me->owner, val); + RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id); return val; } @@ -2072,7 +2072,7 @@ aliased_callable_method_entry(const rb_callable_method_entry_t *me) if (orig_me->defined_class == 0) { VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner); VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE)); - cme = rb_method_entry_complement_defined_class(orig_me, defined_class); + cme = rb_method_entry_complement_defined_class(orig_me, me->called_id, defined_class); if (me->def->alias_count + me->def->complemented_count == 0) { RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme); diff --git a/vm_method.c b/vm_method.c index b5a6f53..675bed0 100644 --- a/vm_method.c +++ b/vm_method.c @@ -408,9 +408,9 @@ rb_method_entry_clone(const rb_method_entry_t *src_me) } const rb_callable_method_entry_t * -rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, VALUE defined_class) +rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID called_id, VALUE defined_class) { - rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, defined_class, + rb_method_entry_t *me = rb_method_entry_alloc(called_id, src_me->owner, defined_class, method_definition_addref_complement(src_me->def)); METHOD_ENTRY_FLAGS_COPY(me, src_me); METHOD_ENTRY_COMPLEMENTED_SET(me); @@ -811,7 +811,7 @@ prepare_callable_method_entry(VALUE defined_class, ID id, const rb_method_entry_ VM_ASSERT(callable_method_entry_p(cme)); } else { - cme = rb_method_entry_complement_defined_class(me, defined_class); + cme = rb_method_entry_complement_defined_class(me, me->called_id, defined_class); rb_id_table_insert(mtbl, id, (VALUE)cme); VM_ASSERT(callable_method_entry_p(cme)); } @@ -944,7 +944,7 @@ rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_e const rb_method_entry_t *resolved_me = resolve_refined_method(refinements, (const rb_method_entry_t *)me, &defined_class); if (resolved_me && resolved_me->defined_class == 0) { - return rb_method_entry_complement_defined_class(resolved_me, defined_class); + return rb_method_entry_complement_defined_class(resolved_me, me->called_id, defined_class); } else { return (const rb_callable_method_entry_t *)resolved_me; -- 2.7.4