From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 20 Sep 2019 21:36:32 +0000 (+0200)
Subject: bpo-38205: Py_UNREACHABLE() calls Py_FatalError() (GH-16290) (GH-16306)
X-Git-Tag: v3.8.0rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245d439320e0921459502883fe809213e3b93e35;p=thirdparty%2FPython%2Fcpython.git

bpo-38205: Py_UNREACHABLE() calls Py_FatalError() (GH-16290) (GH-16306)

(cherry picked from commit b1542583bee204130934c2b90684041e29378250)
---

diff --git a/Include/pymacro.h b/Include/pymacro.h
index 1890619099a3..495c2c25c908 100644
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -100,6 +100,7 @@
 #  define Py_UNUSED(name) _unused_ ## name
 #endif
 
-#define Py_UNREACHABLE() abort()
+#define Py_UNREACHABLE() \
+    Py_FatalError("Unreachable C code path reached")
 
 #endif /* Py_PYMACRO_H */
diff --git a/Misc/NEWS.d/next/C API/2019-09-19-18-26-29.bpo-38205.Db1OJL.rst b/Misc/NEWS.d/next/C API/2019-09-19-18-26-29.bpo-38205.Db1OJL.rst
new file mode 100644
index 000000000000..1818e54d461a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-09-19-18-26-29.bpo-38205.Db1OJL.rst	
@@ -0,0 +1 @@
+The :c:func:`Py_UNREACHABLE` macro now calls :c:func:`Py_FatalError`.