Skip to content

GH-125174: Mark objects as statically allocated. #127797

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 11 commits into from
Dec 11, 2024
Merged

GH-125174: Mark objects as statically allocated. #127797

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5188c1c
Make explicit that refcnt is 32 bits even on 64 bit machines
markshannon Dec 10, 2024
ce2f515
Mark statically allocated objects
markshannon Dec 10, 2024
8d48e23
Update some initializers
markshannon Dec 10, 2024
22f58e7
Fix test on 32 bit machines
markshannon Dec 10, 2024
5d7e1c0
Fix some compiler warnings
markshannon Dec 10, 2024
2fd9d34
Set flags properly for all objects
markshannon Dec 10, 2024
3788c60
Add test
markshannon Dec 11, 2024
dea0fa8
Set immortal flag for FT build
markshannon Dec 11, 2024
7cb320b
Unroll loop to see which test is failing
markshannon Dec 11, 2024
7aefe57
Fix copy and paste errors
markshannon Dec 11, 2024
ddff596
Down downgrade from static immortal to plain immortal
markshannon Dec 11, 2024
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 some compiler warnings
  • Loading branch information
@markshannon
markshannon committed Dec 11, 2024
commit 5d7e1c046fd91ecc9a6442c3899bed7e58ad7354
4 changes: 4 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 @@ -137,7 +137,11 @@ static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n)
_Py_AddRefTotal(_PyThreadState_GET(), n);
#endif
#if !defined(Py_GIL_DISABLED)
#if SIZEOF_VOID_P > 4
op->ob_refcnt += (PY_UINT32_T)n;
#else
op->ob_refcnt += n;
#endif
#else
if (_Py_IsOwnedByCurrentThread(op)) {
uint32_t local = op->ob_ref_local;
Expand Down
6 changes: 5 additions & 1 deletion Include/refcount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ static inline Py_ALWAYS_INLINE int _Py_IsStaticImmortal(PyObject *op)
PyAPI_FUNC(void) _Py_SetRefcnt(PyObject *ob, Py_ssize_t refcnt);

static inline void Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) {
assert(refcnt >= 0);
#if defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030d0000
// Stable ABI implements Py_SET_REFCNT() as a function call
// on limited C API version 3.13 and newer.
Expand All @@ -154,9 +155,12 @@ static inline void Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) {
if (_Py_IsImmortal(ob)) {
return;
}

#ifndef Py_GIL_DISABLED
#if SIZEOF_VOID_P > 4
ob->ob_refcnt = (PY_UINT32_T)refcnt;
#else
ob->ob_refcnt = refcnt;
#endif
#else
if (_Py_IsOwnedByCurrentThread(ob)) {
if ((size_t)refcnt > (size_t)UINT32_MAX) {
Expand Down