* 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

1 files changed, 0 insertions, 5 deletions

diff --git a/vm.c b/vm.c
index ca79a37b0e..a3e25ba52d 100644
--- a/vm.c
+++ b/vm.c
@@ -917,11 +917,6 @@ rb_vm_make_jump_tag_but_local_jump(int state, VALUE val)
       case TAG_RETRY:
 	result = make_localjump_error("retry outside of rescue clause", Qnil, state);
 	break;
-      case TAG_FATAL:
-	/* internal exception or Thread.exit */
-	/* Thread.exit set th->errinfo to INT2FIX(TAG_FATAL) */
-	if (!FIXNUM_P(val))
-	    result = val;
       default:
 	break;
     }