From b0ec083a20c7b717492994f1ad7a03a97540f218 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 4 Dec 2018 01:41:55 +0000 Subject: process.c (retry_fork_async_signal_safe): fix -Wclobbered git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'process.c') diff --git a/process.c b/process.c index cbdb821819..d395b19c29 100644 --- a/process.c +++ b/process.c @@ -3925,11 +3925,11 @@ retry_fork_async_signal_safe(int *status, int *ep, volatile int try_gc = 1; struct child_handler_disabler_state old; int err; - rb_nativethread_lock_t *waitpid_lock; - - waitpid_lock = w && WAITPID_USE_SIGCHLD ? &GET_VM()->waitpid_lock : 0; + rb_nativethread_lock_t *const waitpid_lock_init = + (w && WAITPID_USE_SIGCHLD) ? &GET_VM()->waitpid_lock : 0; while (1) { + rb_nativethread_lock_t *waitpid_lock = waitpid_lock_init; prefork(); disable_child_handler_before_fork(&old); if (waitpid_lock) { @@ -3959,6 +3959,7 @@ retry_fork_async_signal_safe(int *status, int *ep, #endif } err = errno; + waitpid_lock = waitpid_lock_init; if (waitpid_lock) { if (pid > 0 && w != WAITPID_LOCK_ONLY) { w->pid = pid; -- cgit v1.2.3