Skip to content

gh-132776: Revert Moving memoryview XIData Code to memoryobject.c #132960

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 8 commits into from
Apr 25, 2025
Merged

gh-132776: Revert Moving memoryview XIData Code to memoryobject.c #132960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9dcd42
Fix a refleak.
ericsnowcurrently Apr 25, 2025
0b8010e
Add a TODO comment.
ericsnowcurrently Apr 25, 2025
6e6b3ad
Fix another refleak.
ericsnowcurrently Apr 25, 2025
67e1039
Revert "Fix another refleak."
ericsnowcurrently Apr 25, 2025
8801864
Revert "Add a TODO comment."
ericsnowcurrently Apr 25, 2025
89bab30
Revert "Fix a refleak."
ericsnowcurrently Apr 25, 2025
0633266
Revert "Initialize the XIData lookup registry in _PyXI_InitTypes()."
ericsnowcurrently Apr 25, 2025
378cdd3
Revert "Move memoryview XID code to Objects/memoryobject.c."
ericsnowcurrently Apr 25, 2025
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
4 changes: 1 addition & 3 deletions Include/internal/pycore_interp_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ extern "C" {

#include "pycore_ast_state.h" // struct ast_state
#include "pycore_llist.h" // struct llist_node
#include "pycore_memoryobject.h" // struct _memoryobject_state
#include "pycore_opcode_utils.h" // NUM_COMMON_CONSTANTS
#include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR
#include "pycore_structs.h" // PyHamtObject
Expand Down Expand Up @@ -913,10 +912,9 @@ struct _is {
struct _dtoa_state dtoa;
struct _py_func_state func_state;
struct _py_code_state code_state;

struct _Py_dict_state dict_state;
struct _Py_exc_state exc_state;
struct _memoryobject_state memobj_state;

struct _Py_mem_interp_free_queue mem_free_queue;

struct ast_state ast;
Expand Down
11 changes: 0 additions & 11 deletions Include/internal/pycore_memoryobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,6 @@ extern "C" {
# error "this header requires Py_BUILD_CORE define"
#endif

struct _memoryobject_state {
PyTypeObject *XIBufferViewType;
};

extern PyStatus _PyMemoryView_InitTypes(PyInterpreterState *);
extern void _PyMemoryView_FiniTypes(PyInterpreterState *);

// exported for _interpreters module
PyAPI_FUNC(PyTypeObject *) _PyMemoryView_GetXIBuffewViewType(void);


extern PyTypeObject _PyManagedBuffer_Type;

PyObject *
Expand Down
2 changes: 1 addition & 1 deletion Modules/_interpreters_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
_RESOLVE_MODINIT_FUNC_NAME(NAME)


#ifdef REGISTERS_HEAP_TYPES
static int
ensure_xid_class(PyTypeObject *cls, xidatafunc getdata)
{
Expand All @@ -17,6 +16,7 @@ ensure_xid_class(PyTypeObject *cls, xidatafunc getdata)
return _PyXIData_RegisterClass(&ctx, cls, getdata);
}

#ifdef REGISTERS_HEAP_TYPES
static int
clear_xid_class(PyTypeObject *cls)
{
Expand Down
Loading
Loading