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 /proc.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 'proc.c')
-rw-r--r-- | proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2135,7 +2135,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; |