diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 11:25:19 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 11:25:19 +0000 |
| commit | f8f026c4d60a284ffeb03f9804bea85dab5ff4fa (patch) | |
| tree | 2ff1944feec941774858c04aa8f59f9d2d585e16 /vm_method.c | |
| parent | 4919dbabdb4042fee8cb3fb03c66536b1b032035 (diff) | |
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
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm_method.c b/vm_method.c index 24f37dc85f..a681df569f 100644 --- a/vm_method.c +++ b/vm_method.c @@ -410,9 +410,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; |