From 6a35c26b2dfbd2a516e450e916eb8d13c3ff5ddf Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 22 Dec 2012 06:45:28 +0000 Subject: * cont.c (rb_fiber_start): in case of jump with TAG_FATAL, enqueue error into async_errinfo_queue, because you cannot call TH_TAG_JUMP() in this function. [ruby-dev:45218] [Bug #5993] * thread.c (rb_threadptr_execute_interrupts): now INT2FIX(TAG_FATAL) can be popped from async_errinfo_queue. * vm.c (rb_vm_make_jump_tag_but_local_jump): revert r38441. rb_vm_make_jump_tag_but_local_jump() shouldn't return exception in case of state == TAG_FATAL. * test/ruby/test_fiber.rb (test_exit_in_fiber): fix a test to illuminate Thread.exit should terminate current Thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_fiber.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index 4288cabe09..b6beca8d49 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -267,7 +267,7 @@ if false def test_exit_in_fiber bug5993 = '[ruby-dev:45218]' assert_nothing_raised(bug5993) do - Thread.new{ Fiber.new{ Thread.exit }.resume }.join + Thread.new{ Fiber.new{ Thread.exit }.resume; raise "unreachable" }.join end end -- cgit v1.2.1