kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 56592: [Backport #11964]

Browse source 
* 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
This commit is contained in:
nagachika 2017-03-27 11:25:19 +00:00
parent 4919dbabdb
commit f8f026c4d6
10 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Mar 27 20:15:17 2017 Kazuki Tsujimoto <kazuki@callcc.net>
* 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.
Mon Mar 27 20:12:23 2017 Anton Davydov <mail@davydovanton.com> Mon Mar 27 20:12:23 2017 Anton Davydov <mail@davydovanton.com>
* lib/uri/mailto.rb: Removed needless `return` and use `.`` instead of `::` * lib/uri/mailto.rb: Removed needless `return` and use `.`` instead of `::`

2
eval.c
View file

@ -763,7 +763,7 @@ rb_raise_jump(VALUE mesg, VALUE cause)
ID mid = me->called_id; ID mid = me->called_id;
th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); 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); setup_exception(th, TAG_RAISE, mesg, cause);

2
method.h
View file

@ -205,7 +205,7 @@ void rb_free_method_entry(const rb_method_entry_t *me);
void rb_sweep_method_entry(void *vm); void rb_sweep_method_entry(void *vm);
const rb_method_entry_t *rb_method_entry_clone(const rb_method_entry_t *me); 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_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src);
void rb_scope_visibility_set(rb_method_visibility_t); void rb_scope_visibility_set(rb_method_visibility_t);

2
proc.c
View file

@ -2135,7 +2135,7 @@ umethod_bind(VALUE method, VALUE recv)
else { else {
klass = rb_include_class_new(methclass, klass); 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; return method;

6
test/ruby/test_settracefunc.rb
View file

@ -1153,8 +1153,8 @@ class TestSetTraceFunc < Test::Unit::TestCase
} }
assert_equal([ assert_equal([
[:call, :size], [:call, :size],
[:c_call, :original_size], [:c_call, :size],
[:c_return, :original_size], [:c_return, :size],
[:return, :size] [:return, :size]
], events, "should use alias method name for tracing c methods") ], events, "should use alias method name for tracing c methods")
end end
@ -1287,7 +1287,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
}.enable{ }.enable{
p 1 p 1
} }
}, %w[:p :inspect 1], [], '[Bug #9940]') }, %w[:p :to_s 1], [], '[Bug #9940]')
end end
def method_prefix event def method_prefix event

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3" #define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-27" #define RUBY_RELEASE_DATE "2017-03-27"
#define RUBY_PATCHLEVEL 260 #define RUBY_PATCHLEVEL 261
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

18
vm.c
View file

@ -433,8 +433,8 @@ rb_vm_pop_cfunc_frame(void)
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(th->cfp); const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(th->cfp);
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->cfp->self, me->called_id, me->owner, Qnil); EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->cfp->self, me->def->original_id, me->owner, Qnil);
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->called_id); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id);
vm_pop_frame(th); vm_pop_frame(th);
} }
@ -935,11 +935,11 @@ invoke_bmethod(rb_thread_t *th, const rb_iseq_t *iseq, VALUE self, const rb_bloc
th->cfp->sp + arg_size, iseq->body->local_size - arg_size, th->cfp->sp + arg_size, iseq->body->local_size - arg_size,
iseq->body->stack_max); iseq->body->stack_max);
RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->called_id); RUBY_DTRACE_METHOD_ENTRY_HOOK(th, me->owner, me->def->original_id);
EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->called_id, me->owner, Qnil); EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, self, me->def->original_id, me->owner, Qnil);
ret = vm_exec(th); ret = vm_exec(th);
EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->called_id, me->owner, ret); EXEC_EVENT_HOOK(th, RUBY_EVENT_RETURN, self, me->def->original_id, me->owner, ret);
RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->called_id); RUBY_DTRACE_METHOD_RETURN_HOOK(th, me->owner, me->def->original_id);
return ret; return ret;
} }
@ -1523,7 +1523,7 @@ hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp, int will_finish_vm_
if (!will_finish_vm_exec) { if (!will_finish_vm_exec) {
/* kick RUBY_EVENT_RETURN at invoke_block_from_c() for bmethod */ /* kick RUBY_EVENT_RETURN at invoke_block_from_c() for bmethod */
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, 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); rb_vm_frame_method_entry(th->cfp)->owner, Qnil);
} }
} }
@ -1673,11 +1673,11 @@ vm_exec(rb_thread_t *th)
while (th->cfp->pc == 0 || th->cfp->iseq == 0) { while (th->cfp->pc == 0 || th->cfp->iseq == 0) {
if (UNLIKELY(VM_FRAME_TYPE(th->cfp) == VM_FRAME_MAGIC_CFUNC)) { if (UNLIKELY(VM_FRAME_TYPE(th->cfp) == VM_FRAME_MAGIC_CFUNC)) {
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, th->cfp->self, 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); rb_vm_frame_method_entry(th->cfp)->owner, Qnil);
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, RUBY_DTRACE_CMETHOD_RETURN_HOOK(th,
rb_vm_frame_method_entry(th->cfp)->owner, 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);
} }
th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
} }

4
vm_eval.c
View file

@ -117,7 +117,7 @@ vm_call0_cfunc_with_frame(rb_thread_t* th, struct rb_calling_info *calling, cons
rb_block_t *blockptr = calling->blockptr; rb_block_t *blockptr = calling->blockptr;
RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, mid); 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; 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); VM_PROFILE_UP(C2C_POPF);
vm_pop_frame(th); 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); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, mid);
return val; return val;

10
vm_insnhelper.c
View file

@ -1628,8 +1628,8 @@ vm_call_cfunc_with_frame(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb
rb_block_t *blockptr = calling->blockptr; rb_block_t *blockptr = calling->blockptr;
int argc = calling->argc; int argc = calling->argc;
RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, me->called_id); RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, me->owner, me->def->original_id);
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, me->called_id, me->owner, Qundef); 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, recv, vm_push_frame(th, NULL, VM_FRAME_MAGIC_CFUNC, recv,
VM_ENVVAL_BLOCK_PTR(blockptr), (VALUE)me, VM_ENVVAL_BLOCK_PTR(blockptr), (VALUE)me,
@ -1647,8 +1647,8 @@ vm_call_cfunc_with_frame(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb
vm_pop_frame(th); vm_pop_frame(th);
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, me->called_id, 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, me->called_id); RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, me->owner, me->def->original_id);
return val; return val;
} }
@ -1975,7 +1975,7 @@ aliased_callable_method_entry(const rb_callable_method_entry_t *me)
if (orig_me->defined_class == 0) { if (orig_me->defined_class == 0) {
VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner); VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner);
VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE)); 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) { if (me->def->alias_count + me->def->complemented_count == 0) {
RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme); RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme);

8
vm_method.c
View file

@ -410,9 +410,9 @@ rb_method_entry_clone(const rb_method_entry_t *src_me)
} }
const rb_callable_method_entry_t * 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_definition_addref_complement(src_me->def));
METHOD_ENTRY_FLAGS_COPY(me, src_me); METHOD_ENTRY_FLAGS_COPY(me, src_me);
METHOD_ENTRY_COMPLEMENTED_SET(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)); VM_ASSERT(callable_method_entry_p(cme));
} }
else { 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); rb_id_table_insert(mtbl, id, (VALUE)cme);
VM_ASSERT(callable_method_entry_p(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); 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) { 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 { else {
return (const rb_callable_method_entry_t *)resolved_me; return (const rb_callable_method_entry_t *)resolved_me;