bpo-38631: Add _Py_NO_RETURN to functions calling Py_FatalError() (GH-18278)

vstinner · web-flow · commit 2a4903fcce54 · 2020-01-30T13:09:11.000+01:00
Add _Py_NO_RETURN to functions calling Py_FatalError():

* _PyObject_AssertFailed()
* dummy_dealloc()
* faulthandler_fatal_error_thread()
* none_dealloc()
* notimplemented_dealloc()
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -443,7 +443,7 @@ _PyObject_DebugTypeStats(FILE *out);
    NDEBUG against a Python built with NDEBUG defined.
 
    msg, expr and function can be NULL. */
-PyAPI_FUNC(void) _PyObject_AssertFailed(
+PyAPI_FUNC(void) _Py_NO_RETURN _PyObject_AssertFailed(
     PyObject *obj,
     const char *expr,
     const char *msg,
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
@@ -1065,24 +1065,10 @@ faulthandler_sigsegv(PyObject *self, PyObject *args)
     Py_RETURN_NONE;
 }
 
-static void
+static void _Py_NO_RETURN
 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 *
diff --git a/Objects/object.c b/Objects/object.c
@@ -1646,7 +1646,7 @@ none_repr(PyObject *op)
 }
 
 /* ARGUSED */
-static void
+static void _Py_NO_RETURN
 none_dealloc(PyObject* ignore)
 {
     /* This should never get called, but we also don't want to SEGV if
@@ -1784,7 +1784,7 @@ notimplemented_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
     Py_RETURN_NOTIMPLEMENTED;
 }
 
-static void
+static void _Py_NO_RETURN
 notimplemented_dealloc(PyObject* ignore)
 {
     /* This should never get called, but we also don't want to SEGV if
@@ -2225,7 +2225,7 @@ _PyTrash_thread_destroy_chain(void)
 }
 
 
-void
+void _Py_NO_RETURN
 _PyObject_AssertFailed(PyObject *obj, const char *expr, const char *msg,
                        const char *file, int line, const char *function)
 {
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -2529,7 +2529,7 @@ dummy_repr(PyObject *op)
     return PyUnicode_FromString("<dummy key>");
 }
 
-static void
+static void _Py_NO_RETURN
 dummy_dealloc(PyObject* ignore)
 {
     Py_FatalError("deallocating <dummy key>");

Original file line number	Diff line number	Diff line change
`@@ -1646,7 +1646,7 @@ none_repr(PyObject *op)`
`1646`	`1646`	`}`
`1647`	`1647`
`1648`	`1648`	`/* ARGUSED */`
`1649`		`-static void`
	`1649`	`+static void _Py_NO_RETURN`
`1650`	`1650`	`none_dealloc(PyObject* ignore)`
`1651`	`1651`	`{`
`1652`	`1652`	`/* This should never get called, but we also don't want to SEGV if`
`@@ -1784,7 +1784,7 @@ notimplemented_new(PyTypeObject type, PyObject args, PyObject *kwargs)`
`1784`	`1784`	`Py_RETURN_NOTIMPLEMENTED;`
`1785`	`1785`	`}`
`1786`	`1786`
`1787`		`-static void`
	`1787`	`+static void _Py_NO_RETURN`
`1788`	`1788`	`notimplemented_dealloc(PyObject* ignore)`
`1789`	`1789`	`{`
`1790`	`1790`	`/* This should never get called, but we also don't want to SEGV if`
`@@ -2225,7 +2225,7 @@ _PyTrash_thread_destroy_chain(void)`
`2225`	`2225`	`}`
`2226`	`2226`
`2227`	`2227`
`2228`		`-void`
	`2228`	`+void _Py_NO_RETURN`
`2229`	`2229`	`_PyObject_AssertFailed(PyObject obj, const char expr, const char *msg,`
`2230`	`2230`	`const char file, int line, const char function)`
`2231`	`2231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2529,7 +2529,7 @@ dummy_repr(PyObject *op)`
`2529`	`2529`	`return PyUnicode_FromString("<dummy key>");`
`2530`	`2530`	`}`
`2531`	`2531`
`2532`		`-static void`
	`2532`	`+static void _Py_NO_RETURN`
`2533`	`2533`	`dummy_dealloc(PyObject* ignore)`
`2534`	`2534`	`{`
`2535`	`2535`	`Py_FatalError("deallocating <dummy key>");`