Merge branch 'fix-issue-127011' of github.com:Agent-Hellboy/cpython into fix-issue-127011

Author: Agent-Hellboy

Include/internal/pycore_interp_structs.h

@@ -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
@@ -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;

Include/internal/pycore_memoryobject.h

@@ -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 *

Lib/test/test_remote_pdb.py

@@ -21,6 +21,10 @@
 from pdb import _PdbServer, _PdbClient
 
 
+if not sys.is_remote_debug_enabled():
+    raise unittest.SkipTest('remote debugging is disabled')
+
+
 @contextmanager
 def kill_on_error(proc):
     """Context manager killing the subprocess if a Python exception is raised."""

Modules/_interpreters_common.h

@@ -5,7 +5,6 @@
     _RESOLVE_MODINIT_FUNC_NAME(NAME)
 
 
-#ifdef REGISTERS_HEAP_TYPES
 static int
 ensure_xid_class(PyTypeObject *cls, xidatafunc getdata)
 {
@@ -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)
 {