Skip to content

GH-104142: Fix _Py_RefcntAdd to respect immortality #104143

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
brandtbucher merged 4 commits into from
May 5, 2023
Merged

GH-104142: Fix _Py_RefcntAdd to respect immortality #104143

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e24771b
Add failing regression tests
brandtbucher May 3, 2023
9338eea
Fix _Py_RefcntAdd
brandtbucher May 3, 2023
be3b103
blurb add
brandtbucher May 3, 2023
1471b39
Merge branch 'main' into py-refcnt-add-immortal
JelleZijlstra May 4, 2023
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
Fix _Py_RefcntAdd
  • Loading branch information
@brandtbucher
brandtbucher committed May 3, 2023
commit 9338eea377684d03f588ae98bb9a93cc2125003b
3 changes: 3 additions & 0 deletions Include/internal/pycore_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ extern void _Py_DecRefTotal(PyInterpreterState *);
// Increment reference count by n
static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n)
{
if (_Py_IsImmortal(op)) {
return;
}
Comment on lines +61 to +63

@eduardo-elizondo eduardo-elizondo May 4, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One quick comment here is that if this were to be in a hot path, I would recommend using the same technique that we use for Py_INCREF to minimize the number of generated instructions to do the check and add: https://github.com/python/cpython/blob/main/Include/object.h#L620-L634

Now, given that it's only in use for sq_repeat in tuple and list, I don't think this is perf sensitive so keeping the code as you have it here should be good.

#ifdef Py_REF_DEBUG
_Py_AddRefTotal(_PyInterpreterState_GET(), n);
#endif
Expand Down