Skip to content

bpo-40170: Hide implementation detail of Py_TRASHCAN_BEGIN macro #23235

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
vstinner merged 6 commits into from
Nov 24, 2020
Merged

bpo-40170: Hide implementation detail of Py_TRASHCAN_BEGIN macro #23235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ab6dc8
Use PyType_GetSlot() in Py_TRASHCAN_BEGIN macro.
shihai1991 Nov 11, 2020
b288c3e
add the _PyTrash_cond() function
shihai1991 Nov 12, 2020
a0c82d7
apply victor's comment
shihai1991 Nov 13, 2020
3d2f872
apply victor's comment
shihai1991 Nov 13, 2020
db2d98c
apply victor's comment
shihai1991 Nov 13, 2020
477dbd8
apply victor's comment
shihai1991 Nov 24, 2020
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
apply victor's comment
  • Loading branch information
@shihai1991
shihai1991 committed Nov 13, 2020
commit a0c82d7bf4fd53cca29556c3e293e2dc73a1a144
5 changes: 0 additions & 5 deletions Doc/whatsnew/3.10.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,11 +439,6 @@ New Features
* The :c:func:`PyType_GetSlot` function can accept static types.
(Contributed by Hai Shi and Petr Viktorin in :issue:`41073`.)

* The ``Py_TRASHCAN_BEGIN`` macro no longer accesses PyTypeObject attributes,
but now can get the condition by calling the new private
:c:func:`_PyTrash_cond()` function which hides implementation details.
(Contributed by Hai Shi in :issue:`40170`.)


Porting to Python 3.10
----------------------
Expand Down
6 changes: 3 additions & 3 deletions Include/cpython/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ struct _ts;
/* Python 3.9 private API, invoked by the macros below. */
PyAPI_FUNC(int) _PyTrash_begin(struct _ts *tstate, PyObject *op);
PyAPI_FUNC(void) _PyTrash_end(struct _ts *tstate);
/* Python 3.10 private API, invoked by the macros below. */
PyAPI_FUNC(int) _PyTrash_cond(void *op_raw, void *dealloc);
/* Python 3.10 private API, invoked by the Py_TRASHCAN_BEGIN(). */
PyAPI_FUNC(int) _PyTrash_cond(PyObject *op, void *dealloc);

#define PyTrash_UNWIND_LEVEL 50

Expand All @@ -539,7 +539,7 @@ PyAPI_FUNC(int) _PyTrash_cond(void *op_raw, void *dealloc);
} while (0);

#define Py_TRASHCAN_BEGIN(op, dealloc) \
Py_TRASHCAN_BEGIN_CONDITION(op, _PyTrash_cond(op, dealloc));
Py_TRASHCAN_BEGIN_CONDITION(op, _PyTrash_cond(_PyObject_CAST(op), dealloc))

/* For backwards compatibility, these macros enable the trashcan
* unconditionally */
Expand Down
3 changes: 1 addition & 2 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,9 +2135,8 @@ _PyTrash_end(PyThreadState *tstate)


int

@vstinner vstinner Nov 24, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please add comment explaining that it is used by the Py_TRASHCAN_BEGIN macro.

@shihai1991 shihai1991 Nov 24, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Got it, updated.

_PyTrash_cond(void *op_raw, void *dealloc)
_PyTrash_cond(PyObject *op, void *dealloc)
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
{
PyObject *op = _PyObject_CAST(op_raw);
PyTypeObject *tp = Py_TYPE(op);
return tp->tp_dealloc == (destructor)dealloc;
}
Expand Down