8000 GH-95707: Fix uses of `Py_TPFLAGS_MANAGED_DICT` by markshannon · Pull Request #95854 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-95707: Fix uses of Py_TPFLAGS_MANAGED_DICT #95854

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
merged 9 commits into from
Aug 15, 2022
Merged

GH-95707: Fix uses of Py_TPFLAGS_MANAGED_DICT #95854

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc5fef4
Make sure that tp_dictoffset is correct with Py_TPFLAGS_MANAGED_DICT …
markshannon Aug 2, 2022
1c1e488
Revert mistaken change.
markshannon Aug 2, 2022
8bf2f63
Avoid traversing managed dict twice when subclassing class with Py_TP…
markshannon Aug 3, 2022
305dc9e
Add news.
markshannon Aug 3, 2022
62bf97e
Merge branch 'main' into fixup-dictoffset-for-managed-dict
markshannon Aug 4, 2022
8f04bce
Merge branch 'main' into fixup-dictoffset-for-managed-dict
markshannon Aug 10, 2022
00cf844
Reject explicitly negative tp_dictoffsets, and set tp_dictoffset to -…
markshannon Aug 10, 2022
595c34a
Allow negative tp_dictoffset again. It seems harmless.
markshannon Aug 10, 2022
319a8ce
Make test for tp_dictoffset stricter.
markshannon Aug 15, 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
Revert mistaken change.
  • Loading branch information
@markshannon
markshannon committed Aug 2, 2022
commit 1c1e488601925aa2d64490dfc97de60e6db1a37f
2 changes: 1 addition & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3078,7 +3078,7 @@ type_new_descriptors(const type_new_ctx *ctx, PyTypeObject *type)
if (ctx->add_dict && ctx->base->tp_itemsize == 0) {
assert((type->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0);
type->tp_flags |= Py_TPFLAGS_MANAGED_DICT;
type->tp_dictoffset = -type->tp_basicsize - (Py_ssize_t)sizeof(PyObject *)*3;
type->tp_dictoffset = -slotoffset - (Py_ssize_t)sizeof(PyObject *)*3;
}

type->tp_basicsize = slotoffset;
Expand Down
0