diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 17:59:31 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 17:59:31 +0000 |
commit | e197429a76bffa1d801c6ec46862c6f417982cdb (patch) | |
tree | 02d5a2f048527d130f70e11d6f1e62cacf148da2 /test | |
parent | 645b4e113054fbe2e2d7eb119116ae5b676e153d (diff) |
merge revision(s) 50206: [Backport #10724]
* vm.c (vm_exec): check other events when RETURN is thrown.
[Bug #10724]
* test/ruby/test_settracefunc.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_settracefunc.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 58e927c217..1dcd2ccbee 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -1332,4 +1332,24 @@ class TestSetTraceFunc < Test::Unit::TestCase } assert_equal [__LINE__ - 3, __LINE__ - 2], lines, 'Bug #10449' end + + class Bug10724 + def initialize + loop{return} + end + end + + def test_throwing_return_with_finish_frame + target_th = Thread.current + evs = [] + + TracePoint.new(:call, :return){|tp| + return if Thread.current != target_th + evs << tp.event + }.enable{ + a = Bug10724.new + } + + assert_equal([:call, :return], evs) + end end |