Make any remaining pending calls before shutdown.

Author: ericsnowcurrently

Include/internal/pycore_ceval.h

@@ -11,6 +11,8 @@ extern "C" {
 #include "pycore_atomic.h"
 #include "pythread.h"
 
+PyAPI_FUNC(int) _Py_MakePendingCalls(void);
+
 struct _pending_calls {
     PyThread_type_lock lock;
     /* Request for running pending calls. */

Python/ceval.c

@@ -459,6 +459,14 @@ make_pending_calls(void)
     return res;
 }
 
+int
+_Py_MakePendingCalls(void)
+{
+    assert(PyGILState_Check());
+
+    return make_pending_calls();
+}
+
 /* Py_MakePendingCalls() is a simple wrapper for the sake
    of backward-compatibility. */
 int

Python/pylifecycle.c

@@ -1462,8 +1462,20 @@ Py_EndInterpreter(PyThreadState *tstate)
         Py_FatalError("Py_EndInterpreter: thread still has a frame");
     interp->finalizing = 1;
 
+    // Wrap up existing threads.
     wait_for_thread_shutdown();
 
+    // Make any remaining pending calls.
+    if (_Py_atomic_load_relaxed(&_PyRuntime.ceval.pending.calls_to_do)) {
+        if (_Py_MakePendingCalls() < 0) {
+            PyObject *exc, *val, *tb;
+            PyErr_Fetch(&exc, &val, &tb);
+            PyErr_BadInternalCall();
+            _PyErr_ChainExceptions(exc, val, tb);
+            PyErr_Print();
+        }
+    }
+
     call_py_exitfuncs(interp);
 
     if (tstate != interp->tstate_head || tstate->next != NULL)