From 0518d299fddcb13ada2cfdc591b95be07c00abdc Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 27 Oct 2015 15:23:35 +0000 Subject: [PATCH] merge revision(s) 51713: [Backport #11492] * vm.c (hook_before_rewind): prevent kicking :return event while finishing vm_exec func because invoke_block_from_c() kick a :return event for bmethods. [Bug #11492] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++ test/ruby/test_settracefunc.rb | 68 ++++++++++++++++++++++++++++++++++ version.h | 6 +-- vm.c | 14 +++++-- 4 files changed, 90 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 797ccd3d16..63826f3bb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Oct 27 23:58:32 2015 Koichi Sasada + + * vm.c (hook_before_rewind): prevent kicking :return event while + finishing vm_exec func because invoke_block_from_c() kick a :return + event for bmethods. + [Bug #11492] + + * test/ruby/test_settracefunc.rb: add a test. + Tue Oct 27 23:38:26 2015 Nobuyoshi Nakada * configure.in: check for libunwind.h, which is not available in diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 1dcd2ccbee..b09ed17ce8 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -1211,6 +1211,74 @@ class TestSetTraceFunc < Test::Unit::TestCase end end + class C11492 + define_method(:foo_return){ + return true + } + define_method(:foo_break){ + break true + } + end + + def test_define_method_on_return + # return + events = [] + obj = C11492.new + TracePoint.new(:call, :return){|tp| + next unless target_thread? + events << [tp.event, tp.method_id] + }.enable{ + obj.foo_return + } + assert_equal([[:call, :foo_return], [:return, :foo_return]], events, 'Bug #11492') + + # break + events = [] + obj = C11492.new + TracePoint.new(:call, :return){|tp| + next unless target_thread? + events << [tp.event, tp.method_id] + }.enable{ + obj.foo_break + } + assert_equal([[:call, :foo_break], [:return, :foo_break]], events, 'Bug #11492') + + # set_trace_func + # return + events = [] + begin + set_trace_func(lambda{|event, file, lineno, mid, binding, klass| + next unless target_thread? + case event + when 'call', 'return' + events << [event, mid] + end + }) + obj.foo_return + set_trace_func(nil) + + assert_equal([['call', :foo_return], ['return', :foo_return]], events, 'Bug #11492') + ensure + end + + # break + events = [] + begin + set_trace_func(lambda{|event, file, lineno, mid, binding, klass| + next unless target_thread? + case event + when 'call', 'return' + events << [event, mid] + end + }) + obj.foo_break + set_trace_func(nil) + + assert_equal([['call', :foo_break], ['return', :foo_break]], events, 'Bug #11492') + ensure + end + end + def test_recursive assert_ruby_status [], %q{ stack = [] diff --git a/version.h b/version.h index 17a84bb62b..2b4aa05ae7 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.4" -#define RUBY_RELEASE_DATE "2015-10-27" -#define RUBY_PATCHLEVEL 182 +#define RUBY_RELEASE_DATE "2015-10-28" +#define RUBY_PATCHLEVEL 183 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" diff --git a/vm.c b/vm.c index 4ed901659c..32145ce08b 100644 --- a/vm.c +++ b/vm.c @@ -1294,7 +1294,7 @@ vm_frametype_name(const rb_control_frame_t *cfp) #endif static void -hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp) +hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp, int will_finish_vm_exec) { switch (VM_FRAME_TYPE(th->cfp)) { case VM_FRAME_MAGIC_METHOD: @@ -1305,7 +1305,13 @@ hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp) case VM_FRAME_MAGIC_LAMBDA: if (VM_FRAME_TYPE_BMETHOD_P(th->cfp)) { EXEC_EVENT_HOOK(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil); - EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, th->cfp->me->called_id, th->cfp->me->klass, Qnil); + + 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, + th->cfp->me->called_id, + th->cfp->me->klass, Qnil); + } } else { EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil); @@ -1486,7 +1492,7 @@ vm_exec(rb_thread_t *th) if (!catch_iseqval) { th->errinfo = Qnil; result = GET_THROWOBJ_VAL(err); - hook_before_rewind(th, th->cfp); + hook_before_rewind(th, th->cfp, TRUE); vm_pop_frame(th); goto finish_vme; } @@ -1629,7 +1635,7 @@ vm_exec(rb_thread_t *th) } else { /* skip frame */ - hook_before_rewind(th, th->cfp); + hook_before_rewind(th, th->cfp, FALSE); if (VM_FRAME_TYPE_FINISH_P(th->cfp)) { vm_pop_frame(th);