Skip to content

gh-90667: Add specializations of Py_DECREF when types are known #30872

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

Merged
markshannon merged 18 commits into from
Apr 19, 2022
Merged

gh-90667: Add specializations of Py_DECREF when types are known #30872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ffe7d7b
Add specializations of Py_DECREF when types are known
sweeneyde Jan 23, 2022
d2d7b6f
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 25, 2022
5cb77fd
Strings should be freed with unicode_dealloc, not PyObject_Free!
sweeneyde Jan 25, 2022
f58ebcf
_Py_DECREF_IMMORTAL
sweeneyde Jan 25, 2022
0046cd7
Remove a layer of macros. Retain _Py_DECREF_INT for private use in lo…
sweeneyde Jan 25, 2022
8edfa4d
Hide more functions
sweeneyde Jan 26, 2022
d095c43
Use PyAPI_FUNC again
sweeneyde Jan 27, 2022
fa6a26a
Use PyObject* to avoid casts
sweeneyde Jan 27, 2022
35c0d25
Remove PyAPI_FUNC and mathmodule optimizations
sweeneyde Jan 27, 2022
feebdb3
Use _Py_FataRefcountError() directly. Move it to the same header file.
sweeneyde Jan 28, 2022
05b050b
remove (destructor) cast in bltinmodule and longobject
sweeneyde Jan 29, 2022
0d6a598
Add newline at end of NEWS entry
sweeneyde Feb 11, 2022
731f79d
Merge remote-tracking branch 'upstream/main' into special_decref
sweeneyde Feb 11, 2022
d5f49b2
Merge with main: resolve boolobject.c includes
sweeneyde Feb 24, 2022
b331bf8
merge with main
sweeneyde Apr 12, 2022
ad146ef
naming: IMMORTAL --> NO_DEALLOC
sweeneyde Apr 12, 2022
ec763e6
mrege with main
sweeneyde Apr 18, 2022
3dd308a
Remove _PyLong_ExactDealloc
sweeneyde Apr 19, 2022
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
Next Next commit
_Py_DECREF_IMMORTAL
  • Loading branch information
@sweeneyde
sweeneyde committed Jan 25, 2022
commit f58ebcfe7c0025f5991de26f1b33b4dd6700c111
16 changes: 0 additions & 16 deletions Include/boolobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,6 @@ PyAPI_FUNC(int) Py_IsTrue(PyObject *x);
PyAPI_FUNC(int) Py_IsFalse(PyObject *x);
#define Py_IsFalse(x) Py_Is((x), Py_False)

static inline void
_Py_DECREF_BOOL(PyObject *op)
{
assert(PyBool_Check(op));
#ifdef Py_REF_DEBUG
_Py_RefTotal--;
#endif
op->ob_refcnt--;
#ifdef Py_DEBUG
if (op->ob_refcnt <= 0) {
// Calls _Py_FatalRefcountError
_Py_Dealloc(op);
}
#endif
}

/* Macros for returning Py_True or Py_False, respectively */
#define Py_RETURN_TRUE return Py_NewRef(Py_True)
#define Py_RETURN_FALSE return Py_NewRef(Py_False)
Expand Down
31 changes: 15 additions & 16 deletions Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,21 @@ _Py_DECREF_SPECIALIZED(PyObject *op, const destructor destruct)
}
}

static inline void
_Py_DECREF_IMMORTAL(PyObject *op)
{
#ifdef Py_REF_DEBUG
_Py_RefTotal--;
#endif
op->ob_refcnt--;
#ifdef Py_DEBUG
if (op->ob_refcnt <= 0) {
// Calls _Py_FatalRefcountError for None, True, and False
_Py_Dealloc(op);
}
#endif
}

/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
* and tp_dealloc implementations.
*
Expand Down Expand Up @@ -638,22 +653,6 @@ Don't forget to apply Py_INCREF() when returning this value!!!
PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
#define Py_None (&_Py_NoneStruct)

static inline void
_Py_DECREF_NONE(PyObject *op)
{
assert(op == Py_None);
#ifdef Py_REF_DEBUG
_Py_RefTotal--;
#endif
(void)op;
((PyObject *)Py_None)->ob_refcnt--;
#ifdef Py_DEBUG
if (((PyObject *)Py_None)->ob_refcnt <= 0) {
// Calls _Py_FatalRefcountError
_Py_Dealloc(op);
}
#endif
}

// Test if an object is the None singleton, the same as "x is None" in Python.
PyAPI_FUNC(int) Py_IsNone(PyObject *x);
Expand Down
18 changes: 9 additions & 9 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3878,7 +3878,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

if (Py_IsNone(match)) {
_Py_DECREF_NONE(match);
_Py_DECREF_IMMORTAL(match);
Py_XDECREF(rest);
/* no match - jump to target */
JUMPTO(oparg);
Expand Down Expand Up @@ -3981,11 +3981,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
PyObject *cond = POP();
int err;
if (Py_IsTrue(cond)) {
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
DISPATCH();
}
if (Py_IsFalse(cond)) {
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
JUMPTO(oparg);
CHECK_EVAL_BREAKER();
DISPATCH();
Expand All @@ -4008,11 +4008,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
PyObject *cond = POP();
int err;
if (Py_IsFalse(cond)) {
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
DISPATCH();
}
if (Py_IsTrue(cond)) {
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
JUMPTO(oparg);
CHECK_EVAL_BREAKER();
DISPATCH();
Expand All @@ -4038,14 +4038,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
CHECK_EVAL_BREAKER();
DISPATCH();
}
_Py_DECREF_NONE(value);
_Py_DECREF_IMMORTAL(value);
DISPATCH();
}

TARGET(POP_JUMP_IF_NONE) {
PyObject *value = POP();
if (Py_IsNone(value)) {
_Py_DECREF_NONE(value);
_Py_DECREF_IMMORTAL(value);
JUMPTO(oparg);
CHECK_EVAL_BREAKER();
DISPATCH();
Expand All @@ -4059,7 +4059,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
int err;
if (Py_IsTrue(cond)) {
STACK_SHRINK(1);
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
DISPATCH();
}
if (Py_IsFalse(cond)) {
Expand All @@ -4083,7 +4083,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
int err;
if (Py_IsFalse(cond)) {
STACK_SHRINK(1);
_Py_DECREF_BOOL(cond);
_Py_DECREF_IMMORTAL(cond);
DISPATCH();
}
if (Py_IsTrue(cond)) {
Expand Down