diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-22 06:45:28 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-22 06:45:28 +0000 |
commit | 6a35c26b2dfbd2a516e450e916eb8d13c3ff5ddf (patch) | |
tree | b48d3759a8b0e5031ad058f26ff129166803de1d /cont.c | |
parent | a44e41e8316820b51e183939d64b15ef68b321b2 (diff) | |
download | ruby-6a35c26b2dfbd2a516e450e916eb8d13c3ff5ddf.tar.gz |
* 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
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1164,6 +1164,9 @@ rb_fiber_start(void) if (state == TAG_RAISE) { rb_threadptr_async_errinfo_enque(th, th->errinfo); } + else if (state == TAG_FATAL) { + rb_threadptr_async_errinfo_enque(th, th->errinfo); + } else { VALUE err = rb_vm_make_jump_tag_but_local_jump(state, th->errinfo); if (!NIL_P(err)) |