Skip to content

gh-101476: Add _PyType_GetModuleState #101477

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
miss-islington merged 11 commits into from
Feb 23, 2023
Merged

gh-101476: Add _PyType_GetModuleState #101477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
795763c
gh-101476: Add _PyType_GetModuleState
erlend-aasland Jan 31, 2023
813fd94
Also assert that module != NULL
erlend-aasland Jan 31, 2023
959367e
Update Include/internal/pycore_typeobject.h
erlend-aasland Feb 1, 2023
62d9dad
Sync with main
erlend-aasland Feb 3, 2023
6ce3ab0
Address review: add comment
erlend-aasland Feb 3, 2023
52be3ef
Sync with main
erlend-aasland Feb 6, 2023
c76260a
Address review: follow existing naming convention for fast APIs
erlend-aasland Feb 6, 2023
cc628d9
Sync with main
erlend-aasland Feb 10, 2023
fc2a473
Amend
erlend-aasland Feb 10, 2023
52bb5ee
Pull in main
erlend-aasland Feb 23, 2023
049ace5
Revert name change
erlend-aasland Feb 23, 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
16 changes: 16 additions & 0 deletions Include/internal/pycore_typeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
extern "C" {
#endif

#include "pycore_moduleobject.h"

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif
Expand Down Expand Up @@ -62,6 +64,20 @@ _PyStaticType_GET_WEAKREFS_LISTPTR(static_builtin_state *state)
return &state->tp_weaklist;
}

/* Like PyType_GetModuleState, but skips verification
* that type is a heap type with an associated module */
static inline void *
_PyType_GetModuleState(PyTypeObject *type)
Comment thread
erlend-aasland marked this conversation as resolved.
Resolved
{
assert(PyType_Check(type));
assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE);
PyHeapTypeObject *et = (PyHeapTypeObject *)type;
assert(et->ht_module);
PyModuleObject *mod = (PyModuleObject *)(et->ht_module);
assert(mod != NULL);

@vstinner vstinner May 24, 2023

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.

This assertion is the same than assert(et->ht_module);, no? If you only keep one, I suggest keeping assert(mod != NULL); since we use mod below.

@erlend-aasland erlend-aasland Jun 2, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

... or the first assert could be changed to assert(et != NULL).

return mod->md_state;
}

struct types_state {
struct type_cache type_cache;
size_t num_builtins_initialized;
Expand Down
3 changes: 2 additions & 1 deletion Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "pycore_call.h" // _PyObject_CallNoArgs()
#include "pycore_long.h" // _PyLong_GetZero()
#include "pycore_moduleobject.h" // _PyModule_GetState()
#include "pycore_typeobject.h" // _PyType_GetModuleState()
#include "pycore_object.h" // _PyObject_GC_TRACK()
#include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "structmember.h" // PyMemberDef
Expand Down Expand Up @@ -48,7 +49,7 @@ get_module_state(PyObject *mod)
static inline itertools_state *
get_module_state_by_cls(PyTypeObject *cls)
{
void *state = PyType_GetModuleState(cls);
void *state = _PyType_GetModuleState(cls);
assert(state != NULL);
return (itertools_state *)state;
}
Expand Down