Skip to content

gh-117139: A StackRef Debugging Mode #121134

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
Fidget-Spinner wants to merge 11 commits into from
Closed

gh-117139: A StackRef Debugging Mode #121134

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ddf839e
A StackRef Debugging Mode
Fidget-Spinner Jun 28, 2024
0b0fa3d
Create 2024-06-29-00-02-42.gh-issue-117139.-lKXPB.rst
Fidget-Spinner Jun 28, 2024
d2c7bb9
fix CI
Fidget-Spinner Jun 28, 2024
2c6860a
Fixup defines
Fidget-Spinner Jun 28, 2024
ba49e58
Use a hashtable instead
Fidget-Spinner Jun 30, 2024
18d26ce
fix unused warning
Fidget-Spinner Jun 30, 2024
5ff2a57
fix build
Fidget-Spinner Jun 30, 2024
e2563c6
Fix build again
Fidget-Spinner Jun 30, 2024
fe687c3
Merge remote-tracking branch 'upstream/main' into stackref_debug_real
Fidget-Spinner Jun 30, 2024
a6e6576
Merge remote-tracking branch 'upstream/main' into stackref_debug_real
Fidget-Spinner Jul 17, 2024
a058c34
cleanup
Fidget-Spinner Jul 17, 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
cleanup
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jul 17, 2024
commit a058c345ce90f044ed4bd3691f84c0b78408f6d9
20 changes: 7 additions & 13 deletions Include/internal/pycore_stackref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ typedef union _PyStackRef {
uintptr_t bits;
} _PyStackRef;

struct _Py_stackref_entry {
PyObject *obj;
int is_live;
};

struct _Py_stackref_state {
PyMutex lock;
_Py_hashtable_t *entries;
Expand Down Expand Up @@ -118,7 +113,7 @@ PyAPI_FUNC(_PyStackRef) _PyStackRef_Dup(_PyStackRef stackref);
static const _PyStackRef PyStackRef_None = { .bits = 3 << RESERVED_BITS };
# else
# define PyStackRef_None ((_PyStackRef){.bits = ((uintptr_t)&_Py_NoneStruct) | Py_TAG_DEFERRED })
#endif
# endif
#else
# define PyStackRef_None ((_PyStackRef){.bits = ((uintptr_t)&_Py_NoneStruct) })
#endif
Expand All @@ -128,15 +123,15 @@ PyAPI_FUNC(_PyStackRef) _PyStackRef_Dup(_PyStackRef stackref);
#ifdef Py_GIL_DISABLED
static inline int
PyStackRef_Is(_PyStackRef a, _PyStackRef b) {
# if defined(Py_STACKREF_DEBUG)
# ifdef Py_STACKREF_DEBUG
// Note: stackrefs are unique. So even immortal objects will produce different stackrefs.
return _Py_stackref_to_object_transition(a, BORROW) == _Py_stackref_to_object_transition(b, BORROW);
# else
return a.bits == b.bits;
# endif
}
#else
#define PyStackRef_Is(a, b) ((a).bits == (b).bits)
# define PyStackRef_Is(a, b) ((a).bits == (b).bits)
#endif

static inline int
Expand All @@ -154,7 +149,7 @@ PyStackRef_IsNull(_PyStackRef stackref)
static inline PyObject *
PyStackRef_AsPyObjectBorrow(_PyStackRef stackref)
{
# if defined(Py_STACKREF_DEBUG)
# ifdef Py_STACKREF_DEBUG
return _Py_stackref_to_object_transition(stackref, BORROW);
# else
PyObject *cleared = ((PyObject *)((stackref).bits & (~Py_TAG_BITS)));
Expand All @@ -171,14 +166,14 @@ PyStackRef_AsPyObjectBorrow(_PyStackRef stackref)
static inline PyObject *
PyStackRef_AsPyObjectSteal(_PyStackRef stackref)
{
#ifdef Py_STACKREF_DEBUG
# ifdef Py_STACKREF_DEBUG
return _Py_stackref_to_object_transition(stackref, STEAL);
#else
# else
if (!PyStackRef_IsNull(stackref) && PyStackRef_IsDeferred(stackref)) {
return Py_NewRef(PyStackRef_AsPyObjectBorrow(stackref));
}
return PyStackRef_AsPyObjectBorrow(stackref);
#endif
# endif
}
#else
# define PyStackRef_AsPyObjectSteal(stackref) PyStackRef_AsPyObjectBorrow(stackref)
Expand Down Expand Up @@ -301,7 +296,6 @@ PyStackRef_CLOSE(_PyStackRef stackref)
static inline _PyStackRef
PyStackRef_DUP(_PyStackRef stackref)
{
#ifdef Py_GIL_DISABLED
# ifdef Py_STACKREF_DEBUG
stackref = _PyStackRef_Dup(stackref);
# endif
Expand Down