Skip to content

gh-95795: Move types.next_version_tag to PyInterpreterState #102343

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
ericsnowcurrently merged 9 commits into from
Apr 24, 2023
+94 −43
Merged

gh-95795: Move types.next_version_tag to PyInterpreterState #102343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83e16d5
Move types.next_version_tag to PyInterpreterState for non-core-static…
ericsnowcurrently Feb 28, 2023
c9281e4
Add NEXT_GLOBAL_VERSION_TAG.
ericsnowcurrently Mar 3, 2023
95ffcd1
Handle static types correctly in assign_version_tag().
ericsnowcurrently Mar 3, 2023
f3b707d
Verify that builtin types have builtin bases.
ericsnowcurrently Mar 3, 2023
c32b834
Add an assert.
ericsnowcurrently Mar 3, 2023
6362a36
Do not invalidate the method cache for static builtin types.
ericsnowcurrently Mar 3, 2023
5f8c3e4
Merge branch 'main' into isolate-types-next-version-tag
ericsnowcurrently Apr 24, 2023
0d78c1b
Only use deepfreeze in the main interpreter.
ericsnowcurrently Apr 24, 2023
5e9ec1d
Merge branch 'main' into isolate-types-next-version-tag
ericsnowcurrently Apr 24, 2023
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
Merge branch 'main' into isolate-types-next-version-tag
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 24, 2023
commit 5f8c3e4e55f561ba00427c353b9fbb5bc3d23695
2 changes: 0 additions & 2 deletions Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ typedef struct pyruntimestate {
struct _py_object_runtime_state object_state;
struct _Py_float_runtime_state float_state;
struct _Py_unicode_runtime_state unicode_state;
struct _Py_dict_runtime_state dict_state;
struct _py_func_runtime_state func_state;
struct _types_runtime_state types;

/* All the objects that are shared by the runtime's interpreters. */
Expand Down
6 changes: 6 additions & 0 deletions Include/internal/pycore_runtime_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ extern PyTypeObject _PyExc_MemoryError;
}, \
}, \
.dtoa = _dtoa_state_INIT(&(INTERP)), \
.dict_state = { \
.next_keys_version = 2, \
}, \
.func_state = { \
.next_version = 1, \
}, \
.types = { \
.next_version_tag = _Py_TYPE_BASE_VERSION_TAG, \
}, \
Expand Down
3 changes: 2 additions & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,8 @@ assign_version_tag(PyInterpreterState *interp, PyTypeObject *type)

int PyUnstable_Type_AssignVersionTag(PyTypeObject *type)
{
return assign_version_tag(type);
PyInterpreterState *interp = _PyInterpreterState_GET();
return assign_version_tag(interp, type);
}


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.