diff options
Diffstat (limited to 'Modules/faulthandler.c')
| -rw-r--r-- | Modules/faulthandler.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 1c1e4fb7d1..4fc8ebd4e3 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -521,12 +521,10 @@ static PyObject* faulthandler_disable_py(PyObject *self) { if (!fatal_error.enabled) { - Py_INCREF(Py_False); - return Py_False; + Py_RETURN_FALSE; } faulthandler_disable(); - Py_INCREF(Py_True); - return Py_True; + Py_RETURN_TRUE; } static PyObject* @@ -980,12 +978,21 @@ faulthandler_sigsegv(PyObject *self, PyObject *args) static void faulthandler_fatal_error_thread(void *plock) { +#ifndef __clang__ PyThread_type_lock *lock = (PyThread_type_lock *)plock; +#endif Py_FatalError("in new thread"); +#ifndef __clang__ + /* Issue #28152: Py_FatalError() is declared with + __attribute__((__noreturn__)). GCC emits a warning without + "PyThread_release_lock()" (compiler bug?), but Clang is smarter and + emits a warning on the return. */ + /* notify the caller that we are done */ PyThread_release_lock(lock); +#endif } static PyObject * |