Skip to content

bpo-45116: Use Py_ALWAYS_INLINE in object.h #28427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 2 commits into from
Closed

bpo-45116: Use Py_ALWAYS_INLINE in object.h #28427

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad86f1c
bpo-45116: Use Py_ALWAYS_INLINE in object.h
vstinner Sep 17, 2021
ae234ff
Fix build on Windows
vstinner Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix build on Windows 
Py_ALWAYS_INLINE must be specified *before* the return type
  • Loading branch information
@vstinner
vstinner committed Sep 19, 2021
commit ae234ffea2d2c27ba927e446bdd032ada9c42953
34 changes: 17 additions & 17 deletions Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,31 +127,31 @@ PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y);
#define Py_Is(x, y) ((x) == (y))


static inline Py_ssize_t Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE Py_ssize_t
_Py_REFCNT(const PyObject *ob) {
return ob->ob_refcnt;
}
#define Py_REFCNT(ob) _Py_REFCNT(_PyObject_CAST_CONST(ob))


// bpo-39573: The Py_SET_TYPE() function must be used to set an object type.
static inline PyTypeObject* Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE PyTypeObject*
_Py_TYPE(const PyObject *ob)
{
return ob->ob_type;
}
#define Py_TYPE(ob) _Py_TYPE(_PyObject_CAST_CONST(ob))

// bpo-39573: The Py_SET_SIZE() function must be used to set an object size.
static inline Py_ssize_t Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE Py_ssize_t
_Py_SIZE(const PyVarObject *ob)
{
return ob->ob_size;
}
#define Py_SIZE(ob) _Py_SIZE(_PyVarObject_CAST_CONST(ob))


static inline int Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE int
_Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type)
{
// bpo-44378: Don't use Py_TYPE() since Py_TYPE() requires a non-const
Expand All @@ -161,23 +161,23 @@ _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type)
#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)


static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt)
{
ob->ob_refcnt = refcnt;
}
#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt)


static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
{
ob->ob_type = type;
}
#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)


static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size)
{
ob->ob_size = size;
Expand Down Expand Up @@ -266,7 +266,7 @@ PyAPI_FUNC(PyObject *) PyType_GetQualName(PyTypeObject *);
/* Generic type check */
PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);

static inline int Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE int
_PyObject_TypeCheck(PyObject *ob, PyTypeObject *type)
{
return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type);
Expand Down Expand Up @@ -483,7 +483,7 @@ PyAPI_FUNC(void) Py_DecRef(PyObject *);
PyAPI_FUNC(void) _Py_IncRef(PyObject *);
PyAPI_FUNC(void) _Py_DecRef(PyObject *);

static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_INCREF(PyObject *op)
{
#if defined(Py_REF_DEBUG) && defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000
Expand All @@ -500,7 +500,7 @@ _Py_INCREF(PyObject *op)
}
#define Py_INCREF(op) _Py_INCREF(_PyObject_CAST(op))

static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_DECREF(
#if defined(Py_REF_DEBUG) && !(defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000)
const char *filename, int lineno,
Expand Down Expand Up @@ -579,7 +579,7 @@ _Py_DECREF(
} while (0)

/* Function to use in case the object pointer can be NULL: */
static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_XINCREF(PyObject *op)
{
if (op != NULL) {
Expand All @@ -589,7 +589,7 @@ _Py_XINCREF(PyObject *op)

#define Py_XINCREF(op) _Py_XINCREF(_PyObject_CAST(op))

static inline void Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE void
_Py_XDECREF(PyObject *op)
{
if (op != NULL) {
Expand All @@ -606,14 +606,14 @@ PyAPI_FUNC(PyObject*) Py_NewRef(PyObject *obj);
// Similar to Py_NewRef(), but the object can be NULL.
PyAPI_FUNC(PyObject*) Py_XNewRef(PyObject *obj);

static inline PyObject* Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE PyObject*
_Py_NewRef(PyObject *obj)
{
Py_INCREF(obj);
return obj;
}

static inline PyObject* Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE PyObject*
_Py_XNewRef(PyObject *obj)
{
Py_XINCREF(obj);
Expand Down Expand Up @@ -749,7 +749,7 @@ times.
#endif


static inline int Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE int
PyType_HasFeature(PyTypeObject *type, unsigned long feature)
{
unsigned long flags;
Expand All @@ -764,14 +764,14 @@ PyType_HasFeature(PyTypeObject *type, unsigned long feature)

#define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag)

static inline int Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE int
_PyType_Check(PyObject *op)
{
return PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS);
}
#define PyType_Check(op) _PyType_Check(_PyObject_CAST(op))

static inline int Py_ALWAYS_INLINE
static inline Py_ALWAYS_INLINE int
_PyType_CheckExact(PyObject *op)
{
return Py_IS_TYPE(op, &PyType_Type);
Expand Down