[Python-checkins] gh-91321: Add _Py_NULL macro (#92253)
vstinner
webhook-mailer at python.org
Tue May 3 15:38:41 EDT 2022
https://github.com/python/cpython/commit/551d02b3e697098236bb3a6e0a855b2ad8dc0424
commit: 551d02b3e697098236bb3a6e0a855b2ad8dc0424
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-05-03T21:38:37+02:00
summary:
gh-91321: Add _Py_NULL macro (#92253)
Fix C++ compiler warnings: "zero as null pointer constant"
(clang -Wzero-as-null-pointer-constant).
* Add the _Py_NULL macro used by static inline functions to use
nullptr in C++.
* Replace NULL with nullptr in _testcppext.cpp.
files:
M Include/cpython/abstract.h
M Include/cpython/unicodeobject.h
M Include/object.h
M Include/pyport.h
M Lib/test/_testcppext.cpp
M Lib/test/test_cppext.py
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index 77e2cfa02ed07..161e2cb30fde3 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -103,8 +103,8 @@ PyAPI_FUNC(PyObject *) PyObject_VectorcallMethod(
static inline PyObject *
PyObject_CallMethodNoArgs(PyObject *self, PyObject *name)
{
- return PyObject_VectorcallMethod(name, &self,
- 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+ size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+ return PyObject_VectorcallMethod(name, &self, nargsf, _Py_NULL);
}
static inline PyObject *
@@ -113,8 +113,8 @@ PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg)
PyObject *args[2] = {self, arg};
assert(arg != NULL);
- return PyObject_VectorcallMethod(name, args,
- 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+ size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+ return PyObject_VectorcallMethod(name, args, nargsf, _Py_NULL);
}
PyAPI_FUNC(PyObject *) _PyObject_CallMethod(PyObject *obj,
@@ -144,7 +144,7 @@ _PyObject_VectorcallMethodId(
{
PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
if (!oname) {
- return NULL;
+ return _Py_NULL;
}
return PyObject_VectorcallMethod(oname, args, nargsf, kwnames);
}
@@ -152,8 +152,8 @@ _PyObject_VectorcallMethodId(
static inline PyObject *
_PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name)
{
- return _PyObject_VectorcallMethodId(name, &self,
- 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+ size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+ return _PyObject_VectorcallMethodId(name, &self, nargsf, _Py_NULL);
}
static inline PyObject *
@@ -162,8 +162,8 @@ _PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg
PyObject *args[2] = {self, arg};
assert(arg != NULL);
- return _PyObject_VectorcallMethodId(name, args,
- 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+ size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET;
+ return _PyObject_VectorcallMethodId(name, args, nargsf, _Py_NULL);
}
PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h
index 96bfaaf4d2bad..8e182d0fbf799 100644
--- a/Include/cpython/unicodeobject.h
+++ b/Include/cpython/unicodeobject.h
@@ -642,9 +642,9 @@ static inline Py_ssize_t PyUnicode_GET_SIZE(PyObject *op)
{
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
- if (_PyASCIIObject_CAST(op)->wstr == NULL) {
+ if (_PyASCIIObject_CAST(op)->wstr == _Py_NULL) {
(void)PyUnicode_AsUnicode(op);
- assert(_PyASCIIObject_CAST(op)->wstr != NULL);
+ assert(_PyASCIIObject_CAST(op)->wstr != _Py_NULL);
}
return PyUnicode_WSTR_LENGTH(op);
_Py_COMP_DIAG_POP
@@ -674,7 +674,7 @@ Py_DEPRECATED(3.3)
static inline Py_UNICODE* PyUnicode_AS_UNICODE(PyObject *op)
{
wchar_t *wstr = _PyASCIIObject_CAST(op)->wstr;
- if (wstr != NULL) {
+ if (wstr != _Py_NULL) {
return wstr;
}
diff --git a/Include/object.h b/Include/object.h
index f93ecce13b409..a0dba697569c4 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -587,7 +587,7 @@ static inline void Py_DECREF(PyObject *op)
/* Function to use in case the object pointer can be NULL: */
static inline void Py_XINCREF(PyObject *op)
{
- if (op != NULL) {
+ if (op != _Py_NULL) {
Py_INCREF(op);
}
}
@@ -597,7 +597,7 @@ static inline void Py_XINCREF(PyObject *op)
static inline void Py_XDECREF(PyObject *op)
{
- if (op != NULL) {
+ if (op != _Py_NULL) {
Py_DECREF(op);
}
}
diff --git a/Include/pyport.h b/Include/pyport.h
index f6270be0ce5c0..614a2789fb078 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -33,6 +33,14 @@
# define _Py_CAST(type, expr) ((type)(expr))
#endif
+// Static inline functions should use _Py_NULL rather than using directly NULL
+// to prevent C++ compiler warnings. In C++, _Py_NULL uses nullptr.
+#ifdef __cplusplus
+# define _Py_NULL nullptr
+#else
+# define _Py_NULL NULL
+#endif
+
/* Defines to build Python and its standard library:
*
diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index 257843bfc7726..dc40f0ee9eb1c 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -52,7 +52,7 @@ test_api_casts(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
static PyMethodDef _testcppext_methods[] = {
{"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
- {"test_api_casts", test_api_casts, METH_NOARGS, NULL},
+ {"test_api_casts", test_api_casts, METH_NOARGS, nullptr},
{nullptr, nullptr, 0, nullptr} /* sentinel */
};
@@ -68,7 +68,7 @@ _testcppext_exec(PyObject *module)
static PyModuleDef_Slot _testcppext_slots[] = {
{Py_mod_exec, reinterpret_cast<void*>(_testcppext_exec)},
- {0, NULL}
+ {0, nullptr}
};
@@ -81,8 +81,8 @@ static struct PyModuleDef _testcppext_module = {
0, // m_size
_testcppext_methods, // m_methods
_testcppext_slots, // m_slots
- NULL, // m_traverse
- NULL, // m_clear
+ nullptr, // m_traverse
+ nullptr, // m_clear
nullptr, // m_free
};
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index fbb79bb8ac3ed..e056410456630 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -29,6 +29,8 @@
'-Werror',
# Warn on old-style cast (C cast) like: (PyObject*)op
'-Wold-style-cast',
+ # Warn when using NULL rather than _Py_NULL in static inline functions
+ '-Wzero-as-null-pointer-constant',
]
else:
# Don't pass any compiler flag to MSVC
More information about the Python-checkins
mailing list