Merge pull request #175 from python/master

sthagen · web-flow · commit ae8e6ad5c09a · 2020-01-13T19:39:42.000+01:00
Sync Fork from Upstream Repo
diff --git a/Include/cpython/pyerrors.h b/Include/cpython/pyerrors.h
@@ -76,6 +76,7 @@ typedef PyOSErrorObject PyWindowsErrorObject;
 
 PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
 _PyErr_StackItem *_PyErr_GetTopmostException(PyThreadState *tstate);
+PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, PyObject **);
 
 /* Context manipulation (PEP 3134) */
 
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -15,7 +15,7 @@ struct _frame;
 
 #include "pycore_pystate.h"   /* PyInterpreterState.eval_frame */
 
-PyAPI_FUNC(void) _Py_FinishPendingCalls(struct pyruntimestate *runtime);
+PyAPI_FUNC(void) _Py_FinishPendingCalls(PyThreadState *tstate);
 PyAPI_FUNC(void) _PyEval_Initialize(struct _ceval_runtime_state *);
 PyAPI_FUNC(void) _PyEval_FiniThreads(
     struct _ceval_runtime_state *ceval);
diff --git a/Misc/NEWS.d/next/C API/2019-12-30-10-43-52.bpo-39164.WEV0uu.rst b/Misc/NEWS.d/next/C API/2019-12-30-10-43-52.bpo-39164.WEV0uu.rst
@@ -0,0 +1 @@
+Add a private ``_PyErr_GetExcInfo()`` function to retrieve exception information of the specified Python thread state.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -585,11 +585,11 @@ make_pending_calls(_PyRuntimeState *runtime)
 }
 
 void
-_Py_FinishPendingCalls(_PyRuntimeState *runtime)
+_Py_FinishPendingCalls(PyThreadState *tstate)
 {
     assert(PyGILState_Check());
 
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    _PyRuntimeState *runtime = tstate->interp->runtime;
     struct _pending_calls *pending = &runtime->ceval.pending;
 
     PyThread_acquire_lock(pending->lock, WAIT_LOCK);
diff --git a/Python/errors.c b/Python/errors.c
@@ -433,21 +433,27 @@ PyErr_Clear(void)
 
 
 void
-PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
+_PyErr_GetExcInfo(PyThreadState *tstate,
+                  PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
 {
-    PyThreadState *tstate = _PyThreadState_GET();
-
     _PyErr_StackItem *exc_info = _PyErr_GetTopmostException(tstate);
     *p_type = exc_info->exc_type;
     *p_value = exc_info->exc_value;
     *p_traceback = exc_info->exc_traceback;
 
-
     Py_XINCREF(*p_type);
     Py_XINCREF(*p_value);
     Py_XINCREF(*p_traceback);
 }
 
+
+void
+PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
+{
+    PyThreadState *tstate = _PyThreadState_GET();
+    return _PyErr_GetExcInfo(tstate, p_type, p_value, p_traceback);
+}
+
 void
 PyErr_SetExcInfo(PyObject *p_type, PyObject *p_value, PyObject *p_traceback)
 {
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1340,7 +1340,7 @@ Py_FinalizeEx(void)
     wait_for_thread_shutdown(tstate);
 
     // Make any remaining pending calls.
-    _Py_FinishPendingCalls(runtime);
+    _Py_FinishPendingCalls(tstate);
 
     /* The interpreter is still entirely intact at this point, and the
      * exit funcs may be relying on that.  In particular, if some thread

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add a private ``_PyErr_GetExcInfo()`` function to retrieve exception information of the specified Python thread state.
Original file line number	Diff line number	Diff line change
`@@ -585,11 +585,11 @@ make_pending_calls(_PyRuntimeState *runtime)`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`void`
`588`		`-_Py_FinishPendingCalls(_PyRuntimeState *runtime)`
	`588`	`+_Py_FinishPendingCalls(PyThreadState *tstate)`
`589`	`589`	`{`
`590`	`590`	`assert(PyGILState_Check());`
`591`	`591`
`592`		`- PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);`
	`592`	`+ _PyRuntimeState *runtime = tstate->interp->runtime;`
`593`	`593`	`struct _pending_calls *pending = &runtime->ceval.pending;`
`594`	`594`
`595`	`595`	`PyThread_acquire_lock(pending->lock, WAIT_LOCK);`