* vm.c (rb_vm_make_jump_tag_but_local_jump): take care of the case

  TAG_JUMP() with TAG_FATAL (ex. rb_fatal()).

* test/ruby/test_fiber.rb (test_fatal_in_fiber): add a test for above.

* ext/-test-/fatal/extconf.rb, ext/-test-/fatal/rb_fatal.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/vm.c b/vm.c
index 2266754fc7..a15bdbbbbf 100644
--- a/vm.c
+++ b/vm.c
@@ -917,6 +917,11 @@ 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;
     }