merges r31577 from trunk into ruby_1_9_2.

--
 * cont.c (cont_init): clear macihne_stack_start/end of saved thread to
   prevent mark machine stack of GC'ed Thread. root Fiber is not initialized by
   fiber_init(). based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
 * test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index edfe55a1d3..6c839cfe62 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -189,5 +189,16 @@ class TestFiber < Test::Unit::TestCase
       f1.transfer
     }, '[ruby-dev:40833]'
   end
+
+  def test_gc_root_fiber
+    bug4612 = '[ruby-core:35891]'
+
+    assert_normal_exit %q{
+      require 'fiber'
+      GC.stress = true
+      Thread.start{ Fiber.current; nil }.join
+      GC.start
+    }, bug4612
+  end
 end