From 566f2eb501d94d4047a9aad4af0d74c6a96f34a9 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 14 Apr 2024 14:01:44 +0900
Subject: [PATCH] Merge `rb_fork_ruby2` into `rb_fork_ruby`

---
 process.c | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/process.c b/process.c
index b1f9931f06..09b0cc8d17 100644
--- a/process.c
+++ b/process.c
@@ -4215,50 +4215,30 @@ rb_fork_async_signal_safe(int *status,
     return result;
 }
 
-static rb_pid_t
-rb_fork_ruby2(struct rb_process_status *status)
+rb_pid_t
+rb_fork_ruby(int *status)
 {
+    struct rb_process_status child = {.status = 0};
     rb_pid_t pid;
     int try_gc = 1, err;
     struct child_handler_disabler_state old;
 
-    if (status) status->status = 0;
-
-    while (1) {
+    do {
         prefork();
 
         before_fork_ruby();
         disable_child_handler_before_fork(&old);
-        {
-            pid = rb_fork();
-            err = errno;
-            if (status) {
-                status->pid = pid;
-                status->error = err;
-            }
-        }
+
+        child.pid = pid = rb_fork();
+        child.error = err = errno;
+
         disable_child_handler_fork_parent(&old); /* yes, bad name */
         after_fork_ruby(pid);
 
-        if (pid >= 0) { /* fork succeed */
-            return pid;
-        }
+        /* repeat while fork failed but retryable */
+    } while (pid < 0 && handle_fork_error(err, &child, NULL, &try_gc) == 0);
 
-        /* fork failed */
-        if (handle_fork_error(err, status, NULL, &try_gc)) {
-            return -1;
-        }
-    }
-}
-
-rb_pid_t
-rb_fork_ruby(int *status)
-{
-    struct rb_process_status process_status = {0};
-
-    rb_pid_t pid = rb_fork_ruby2(&process_status);
-
-    if (status) *status = process_status.status;
+    if (status) *status = child.status;
 
     return pid;
 }