commit 4e53abb0f4773e1cce68a4f41ddbb43e74364c5f
author Victor Stinner <vstinner@python.org> Tue Mar 10 23:49:16 2020 +0100
committer GitHub <noreply@github.com> Tue Mar 10 23:49:16 2020 +0100
tree 355a5073945fa5045a4b1354f9468c589d6d9158
parent 88f82b2b9ea3514359cb6e3218121f75334063ac

bpo-38631: _PyGILState_Init() returns PyStatus (GH-18908)

_PyGILState_Init() now returns PyStatus rather than calling
Py_FatalError() on failure.

Python/pylifecycle.c

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index d00bf82..bc32eff 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -551,7 +551,10 @@
     _PyEval_FiniThreads(&runtime->ceval);
 
     /* Auto-thread-state API */
-    _PyGILState_Init(tstate);
+    status = _PyGILState_Init(tstate);
+    if (_PyStatus_EXCEPTION(status)) {
+        return status;
+    }
 
     /* Create the GIL */
     status = _PyEval_InitThreads(tstate);

Python/pystate.c

diff --git a/Python/pystate.c b/Python/pystate.c
index a926e97..504f5f4 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1147,7 +1147,7 @@
 /* Internal initialization/finalization functions called by
    Py_Initialize/Py_FinalizeEx
 */
-void
+PyStatus
 _PyGILState_Init(PyThreadState *tstate)
 {
     /* must init with valid states */
@@ -1157,13 +1157,14 @@
     struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;
 
     if (PyThread_tss_create(&gilstate->autoTSSkey) != 0) {
-        Py_FatalError("Could not allocate TSS entry");
+        return _PyStatus_NO_MEMORY();
     }
     gilstate->autoInterpreterState = tstate->interp;
     assert(PyThread_tss_get(&gilstate->autoTSSkey) == NULL);
     assert(tstate->gilstate_counter == 0);
 
     _PyGILState_NoteThreadState(gilstate, tstate);
+    return _PyStatus_OK();
 }
 
 PyInterpreterState *