merges r23616 from trunk into ruby_1_9_1.

--
* cont.c (cont_capture, fiber_store): reraise transferred error.

* cont.c (fiber_switch): transfers dead fiber error to the previouse
  or root fiber if the current fiber is dead.  [ruby-core:23651]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index bf56b2b6d2..e239390681 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -164,5 +164,10 @@ class TestFiber < Test::Unit::TestCase
     assert_equal(nil, Thread.current[:v]); fb.resume
     assert_equal(nil, Thread.current[:v]);
   end
+
+  def test_resume_self
+    f = Fiber.new {f.resume}
+    assert_raise(FiberError, '[ruby-core:23651]') {f.transfer}
+  end
 end