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

* vm.c (hook_before_rewind): prevent kicking :return event while

Browse source 
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/trunk@51713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-08-28 01:20:32 +00:00
parent 0277e7e8f3
commit 868c98dccf
3 changed files with 87 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri Aug 28 10:16:20 2015 Koichi Sasada <ko1@atdot.net>
* 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.
Thu Aug 27 18:05:42 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/webrick/server.rb: use IO::NULL instead of '/dev/null'

68
test/ruby/test_settracefunc.rb
View file

@ -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_in_out_err([], %q{\
TracePoint.new(:c_call){|tp|

16
vm.c
View file

@ -1332,7 +1332,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:
@ -1343,9 +1343,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,
rb_vm_frame_method_entry(th->cfp)->called_id,
rb_vm_frame_method_entry(th->cfp)->owner, 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,
rb_vm_frame_method_entry(th->cfp)->called_id,
rb_vm_frame_method_entry(th->cfp)->owner, Qnil);
}
}
else {
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil);
@ -1531,7 +1535,7 @@ vm_exec(rb_thread_t *th)
if (!catch_iseq) {
th->errinfo = Qnil;
result = THROW_DATA_VAL(err);
hook_before_rewind(th, th->cfp);
hook_before_rewind(th, th->cfp, TRUE);
vm_pop_frame(th);
goto finish_vme;
}
@ -1671,7 +1675,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);