usa	2019-02-01 11:17:14 +0900 (Fri, 01 Feb 2019)

  New Revision: 66975

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66975

  Log:
    Revert r66968

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/cont.c
    branches/ruby_2_4/test/ruby/test_fiber.rb
    branches/ruby_2_4/thread.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/cont.c
===================================================================
--- ruby_2_4/cont.c	(revision 66974)
+++ ruby_2_4/cont.c	(revision 66975)
@@ -1660,20 +1660,6 @@ rb_fiber_s_current(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/cont.c#L1660
 
 
 
-#ifdef HAVE_WORKING_FORK
-void
-rb_fiber_atfork(rb_thread_t *th)
-{
-    if (th->root_fiber) {
-        if (&th->root_fiber->cont.saved_ec != th->ec) {
-            th->root_fiber = th->ec->fiber_ptr;
-            th->root_fiber->cont.type = ROOT_FIBER_CONTEXT;
-        }
-        th->root_fiber->prev = 0;
-    }
-}
-#endif
-
 /*
  *  Document-class: FiberError
  *
Index: ruby_2_4/test/ruby/test_fiber.rb
===================================================================
--- ruby_2_4/test/ruby/test_fiber.rb	(revision 66974)
+++ ruby_2_4/test/ruby/test_fiber.rb	(revision 66975)
@@ -256,11 +256,7 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_fiber.rb#L256
     end
     bug5700 = '[ruby-core:41456]'
     assert_nothing_raised(bug5700) do
-      Fiber.new do
-        pid = fork do
-          Fiber.new {}.transfer
-        end
-      end.resume
+      Fiber.new{ pid = fork {} }.resume
     end
     pid, status = Process.waitpid2(pid)
     assert_equal(0, status.exitstatus, bug5700)
Index: ruby_2_4/thread.c
===================================================================
--- ruby_2_4/thread.c	(revision 66974)
+++ ruby_2_4/thread.c	(revision 66975)
@@ -4172,14 +4172,12 @@ terminate_atfork_i(rb_thread_t *th, cons https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread.c#L4172
     }
 }
 
-void rb_fiber_atfork(rb_thread_t *);
 void
 rb_thread_atfork(void)
 {
     rb_thread_t *th = GET_THREAD();
     rb_thread_atfork_internal(th, terminate_atfork_i);
     th->join_list = NULL;
-    rb_fiber_atfork(th);
 
     /* We don't want reproduce CVE-2003-0900. */
     rb_reset_random_seed();
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 66974)
+++ ruby_2_4/version.h	(revision 66975)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.6"
-#define RUBY_RELEASE_DATE "2019-01-31"
-#define RUBY_PATCHLEVEL 346
+#define RUBY_RELEASE_DATE "2019-02-01"
+#define RUBY_PATCHLEVEL 347
 
 #define RUBY_RELEASE_YEAR 2019
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"
 
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 66974)
+++ ruby_2_4	(revision 66975)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /trunk:r64589,64593

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/