From 606b66db7dd142884acfdab7a40a29938ea729f1 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Dec 2012 04:30:44 +0000
Subject: [PATCH] * 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
---
 ChangeLog                   |  9 +++++++++
 ext/-test-/fatal/extconf.rb |  1 +
 ext/-test-/fatal/rb_fatal.c | 19 +++++++++++++++++++
 test/ruby/test_fiber.rb     |  9 +++++++++
 vm.c                        |  5 +++++
 5 files changed, 43 insertions(+)
 create mode 100644 ext/-test-/fatal/extconf.rb
 create mode 100644 ext/-test-/fatal/rb_fatal.c

diff --git a/ChangeLog b/ChangeLog
index 447c7ca835..906a1cd23e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Dec 18 09:45:14 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* 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.
+
 Tue Dec 18 13:17:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* vm_trace.c (tracepoint_attr_defined_class): Clean up rdoc for
diff --git a/ext/-test-/fatal/extconf.rb b/ext/-test-/fatal/extconf.rb
new file mode 100644
index 0000000000..e0cfeb2095
--- /dev/null
+++ b/ext/-test-/fatal/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/fatal/rb_fatal")
diff --git a/ext/-test-/fatal/rb_fatal.c b/ext/-test-/fatal/rb_fatal.c
new file mode 100644
index 0000000000..71aef4658a
--- /dev/null
+++ b/ext/-test-/fatal/rb_fatal.c
@@ -0,0 +1,19 @@
+#include <ruby.h>
+
+static VALUE
+ruby_fatal(VALUE obj, VALUE msg)
+{
+    const char *cmsg = NULL;
+
+    (void)obj;
+
+    cmsg = RSTRING_PTR(msg);
+    rb_fatal("%s", cmsg);
+    return 0; /* never reached */
+}
+
+void
+Init_rb_fatal(void)
+{
+    rb_define_method(rb_mKernel, "rb_fatal", ruby_fatal, 1);
+}
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index 7f15e74118..ac2805920e 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -269,5 +269,14 @@ class TestFiber < Test::Unit::TestCase
       Thread.new{ Fiber.new{ Thread.exit }.resume }.join
     end
   end
+
+  def test_fatal_in_fiber
+    assert_in_out_err(["-r-test-/fatal/rb_fatal", "-e", <<-EOS], "", [], /ok/)
+      Fiber.new{
+        rb_fatal "ok"
+      }.resume
+      puts :ng # unreachable.
+    EOS
+  end
 end
 
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;
     }