[Python-checkins] bpo-37191: Avoid declaration-after-statement in header included from Python.h (GH-13887)
Victor Stinner
webhook-mailer at python.org
Fri Jun 7 12:32:01 EDT 2019
https://github.com/python/cpython/commit/9689f80e61e5863668a562793ebb85031ef9fd3e
commit: 9689f80e61e5863668a562793ebb85031ef9fd3e
branch: 3.8
author: Petr Viktorin <pviktori at redhat.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-06-07T18:31:56+02:00
summary:
bpo-37191: Avoid declaration-after-statement in header included from Python.h (GH-13887)
files:
A Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst
M Include/cpython/abstract.h
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index 7ab2045923d8..2ea3209bca10 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -81,13 +81,14 @@ static inline vectorcallfunc
_PyVectorcall_Function(PyObject *callable)
{
PyTypeObject *tp = Py_TYPE(callable);
+ Py_ssize_t offset = tp->tp_vectorcall_offset;
+ vectorcallfunc *ptr;
if (!PyType_HasFeature(tp, _Py_TPFLAGS_HAVE_VECTORCALL)) {
return NULL;
}
assert(PyCallable_Check(callable));
- Py_ssize_t offset = tp->tp_vectorcall_offset;
assert(offset > 0);
- vectorcallfunc *ptr = (vectorcallfunc *)(((char *)callable) + offset);
+ ptr = (vectorcallfunc*)(((char *)callable) + offset);
return *ptr;
}
@@ -114,14 +115,16 @@ static inline PyObject *
_PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
+ PyObject *res;
+ vectorcallfunc func;
assert(kwnames == NULL || PyTuple_Check(kwnames));
assert(args != NULL || PyVectorcall_NARGS(nargsf) == 0);
- vectorcallfunc func = _PyVectorcall_Function(callable);
+ func = _PyVectorcall_Function(callable);
if (func == NULL) {
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
return _PyObject_MakeTpCall(callable, args, nargs, kwnames);
}
- PyObject *res = func(callable, args, nargsf, kwnames);
+ res = func(callable, args, nargsf, kwnames);
return _Py_CheckFunctionResult(callable, res, NULL);
}
diff --git a/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst b/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst
new file mode 100644
index 000000000000..7cb296d33bb5
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst
@@ -0,0 +1,3 @@
+Python.h does not need compiler support for intermingled declarations (GCC's
+``-Wdeclaration-after-statement``), which were added in 3.8.0 Beta 1. Note
+that in Python 3.9, intermingled declarations will be needed again.
More information about the Python-checkins
mailing list