[Python-checkins] bpo-35059: Convert Py_XINCREF() to static inline function (GH-10224)
Victor Stinner
webhook-mailer at python.org
Mon Oct 29 15:52:46 EDT 2018
https://github.com/python/cpython/commit/541497e6197268517b0d492856027774c43e0949
commit: 541497e6197268517b0d492856027774c43e0949
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2018-10-29T20:52:41+01:00
summary:
bpo-35059: Convert Py_XINCREF() to static inline function (GH-10224)
Convert Py_XINCREF() and Py_XDECREF() macros into static inline
functions.
files:
M Include/object.h
diff --git a/Include/object.h b/Include/object.h
index f9c07f7d1398..799c40b2caf0 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -871,20 +871,24 @@ static inline void _Py_DECREF(const char *filename, int lineno,
} \
} while (0)
-/* Macros to use in case the object pointer may be NULL: */
-#define Py_XINCREF(op) \
- do { \
- PyObject *_py_xincref_tmp = (PyObject *)(op); \
- if (_py_xincref_tmp != NULL) \
- Py_INCREF(_py_xincref_tmp); \
- } while (0)
+/* Function to use in case the object pointer can be NULL: */
+static inline void _Py_XINCREF(PyObject *op)
+{
+ if (op != NULL) {
+ Py_INCREF(op);
+ }
+}
-#define Py_XDECREF(op) \
- do { \
- PyObject *_py_xdecref_tmp = (PyObject *)(op); \
- if (_py_xdecref_tmp != NULL) \
- Py_DECREF(_py_xdecref_tmp); \
- } while (0)
+#define Py_XINCREF(op) _Py_XINCREF((PyObject *)(op))
+
+static inline void _Py_XDECREF(PyObject *op)
+{
+ if (op != NULL) {
+ Py_DECREF(op);
+ }
+}
+
+#define Py_XDECREF(op) _Py_XDECREF((PyObject *)(op))
#ifndef Py_LIMITED_API
/* Safely decref `op` and set `op` to `op2`.
More information about the Python-checkins
mailing list