nagachika	2019-03-15 07:21:30 +0900 (Fri, 15 Mar 2019)

  New Revision: 67259

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

  Log:
    merge revision(s) 63309:
    
    thread_sync.c (condvar_ptr): reset fork_gen after forking
    
    Otherwise the condition variable waiter list will always
    be empty, which is wrong :x
    
    [Bug #14725] [Bug #14634]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/thread_sync.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 67258)
+++ ruby_2_5/version.h	(revision 67259)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.5"
 #define RUBY_RELEASE_DATE "2019-03-15"
-#define RUBY_PATCHLEVEL 156
+#define RUBY_PATCHLEVEL 157
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_5/thread_sync.c
===================================================================
--- ruby_2_5/thread_sync.c	(revision 67258)
+++ ruby_2_5/thread_sync.c	(revision 67259)
@@ -1314,6 +1314,7 @@ condvar_ptr(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/thread_sync.c#L1314
 
     /* forked children can't reach into parent thread stacks */
     if (cv->fork_gen != fork_gen) {
+        cv->fork_gen = fork_gen;
         list_head_init(&cv->waitq);
     }
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 67258)
+++ ruby_2_5	(revision 67259)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63309

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