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 --- proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 755b03ea30..8f2ebdbc9c 100644 --- a/proc.c +++ b/proc.c @@ -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; -- cgit v1.2.3