Skip to content

gh-94673: Clarify About Runtime State Related to Static Builtin Types #117761

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 8 commits into from
Apr 12, 2024
Merged

gh-94673: Clarify About Runtime State Related to Static Builtin Types #117761

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0b035e
Add a note about the static builtin types to struct types_state.
ericsnowcurrently Apr 11, 2024
a73483b
Add asserts for static builtin type initialization constraints.
ericsnowcurrently Apr 11, 2024
b8d622e
Add _PyRuntimeState.types.next_builtin_index.
ericsnowcurrently Apr 11, 2024
00feed6
Revert "Add _PyRuntimeState.types.next_builtin_index."
ericsnowcurrently Apr 12, 2024
6e1853b
Describe the correct type for tp_subclasses.
ericsnowcurrently Apr 12, 2024
7b029d9
Clarify that tp_subclasses is PyObject* for other type objects.
ericsnowcurrently Apr 12, 2024
7cf7c04
Flip around the condition in static_builtin_state_init().
ericsnowcurrently Apr 12, 2024
f668cf1
Drop an unnecessary line escape.
ericsnowcurrently Apr 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
Flip around the condition in static_builtin_state_init().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 12, 2024
commit 7cf7c04e08eae0744f6d45e876f92df7c2265693
5 changes: 2 additions & 3 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,11 @@ _PyStaticType_GetState(PyInterpreterState *interp, PyTypeObject *self)
static void
static_builtin_state_init(PyInterpreterState *interp, PyTypeObject *self)
{
if (!static_builtin_index_is_set(self)) {
assert(_Py_IsMainInterpreter(interp));
if (_Py_IsMainInterpreter(interp)) {
assert(!static_builtin_index_is_set(self));
static_builtin_index_set(self, interp->types.num_builtins_initialized);
}
else {
assert(!_Py_IsMainInterpreter(interp));
assert(static_builtin_index_get(self) == \

@gvanrossum gvanrossum Apr 12, 2024

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.

Suggested change
assert(static_builtin_index_get(self) == \
assert(static_builtin_index_get(self) ==

@ericsnowcurrently ericsnowcurrently Apr 12, 2024

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.

fixed

interp->types.num_builtins_initialized);
}
Expand Down