diff options
author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 16:46:53 -0800 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 16:46:53 -0800 |
commit | b1a1742796fce8078f9f1f3d5e3161122fae3b0a (patch) | |
tree | 89c863764481b7c7fbe645be42b16e1d35e92751 /Modules/faulthandler.c | |
parent | 391ed6c73cb1964b57d0b538370a76d03d30511b (diff) | |
parent | cf1f5444eb42a8dc252b295d3863288309996a5d (diff) | |
download | cpython-b1a1742796fce8078f9f1f3d5e3161122fae3b0a.tar.gz |
Merge from 3.6
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 * |