8000 gh-117482: Fix Builtin Types Slot Wrappers When Embedded by ericsnowcurrently · Pull Request #121636 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-117482: Fix Builtin Types Slot Wrappers When Embedded #121636

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
wants to merge 10 commits into from
Closed

gh-117482: Fix Builtin Types Slot Wrappers When Embedded #121636

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
99c5746
Restore the finalization code.
ericsnowcurrently Jul 11, 2024
853c7d2
Factor out static type def helpers.
ericsnowcurrently Jul 11, 2024
753be4d
Do not preserve the metaclass on the def.
ericsnowcurrently Jul 11, 2024
5c422f4
Do not return the def from managed_static_type_state_clear().
ericsnowcurrently Jul 11, 2024
eba8751
Factor out struct static_type_def.
ericsnowcurrently Jul 11, 2024
8000ab3
Clear the index after getting the def.
ericsnowcurrently Jul 11, 2024
6b17676
Do not overwrite the entire type struct; only the tp slot operators.
ericsnowcurrently Jul 11, 2024
e777250
Preserve the type substructs too.
ericsnowcurrently Jul 11, 2024
8520cfc
Fix a compiler error on Windows.
ericsnowcurrently Jul 11, 2024
631bf66
Merge branch 'main' into fix-builtin-slot-wrappers-embedded
ericsnowcurrently Aug 12, 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
Do not overwrite the entire type struct; only the tp slot operators.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 11, 2024
commit 6b17676e566fa1e1099f2718e3f250c8f654cc02
27 changes: 20 additions & 7 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ managed_static_type_index_clear(PyTypeObject *self)
}


static pytype_slotdef slotdefs[];
static void ** slotptr(PyTypeObject *, int);

typedef struct static_type_def *static_type_def;

static inline static_type_def
Expand All @@ -171,8 +174,9 @@ managed_static_type_init_def(static_type_def def, PyTypeObject *type)
&& !(type->tp_flags & Py_TPFLAGS_READYING));

/* We preserve the original type struct value to restore during
finalization. This will also preserve (thus restore) any extra
values set on the struct before this. */
finalization. This will also preserve any extra values set on
the struct before this. Technically, we only need the operator
"tp" slots, but it's simpler to copy the whole struct. */
PyTypeObject *deftype = &def->type;
memcpy(deftype, type, sizeof(PyTypeObject));
}
Expand All @@ -192,13 +196,23 @@ managed_static_type_fini_def(static_type_def def, PyTypeObject *type,
}

/* Preserve specific data before potentially wiping it. */
PyTypeObject *metaclass = Py_TYPE(type);
destructor dealloc = type->tp_dealloc;

/* Restore the static type to it's (mostly) original values.
We leave _Py_TPFLAGS_STATIC_BUILTIN set on tp_flags. */
/* Restore the static type's original operator "tp" slot values.
We do not bother restoring any of the other preserved data,
nor do we even overwrite any of it. */
PyTypeObject *deftype = &def->type;
memcpy(type, deftype, sizeof(PyTypeObject));
for (pytype_slotdef *p = slotdefs; p->name; p++) {
void **defptr = slotptr(deftype, p->offset);
if (defptr == NULL) {
continue;
}
if (defptr == (void **)&def->type.tp_call) {
continue;
}
void **typeptr = slotptr(type, p->offset);
*typeptr = *defptr;
}

/* Currently, there is a small set of cases where a static type
might be used after it has been finalized. For example, some
Expand All @@ -213,7 +227,6 @@ managed_static_type_fini_def(static_type_def def, PyTypeObject *type,
yet. Thankfully, those exceptional cases only require a small
subset of the type, all of which is static data. Thus, in the
meantime, we preserve those parts. */
Py_SET_TYPE(type, metaclass);
type->tp_dealloc = dealloc;
}

Expand Down
0