Remove hardcoded offsets for Python 3.14 and 3.15

pyproject.toml

@@ -22,6 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Debuggers",
 ]

src/pystack/_pystack/cpython/code.h

@@ -197,82 +197,4 @@ typedef struct
 } PyCodeObject;
 }  // namespace Python3_13
 
-namespace Python3_14 {
-typedef uint16_t _Py_CODEUNIT;
-
-typedef struct
-{
-    PyObject_VAR_HEAD PyObject* co_consts;
-    PyObject* co_names;
-    PyObject* co_exceptiontable;
-    int co_flags;
-    int co_argcount;
-    int co_posonlyargcount;
-    int co_kwonlyargcount;
-    int co_stacksize;
-    int co_firstlineno;
-    int co_nlocalsplus;
-    int co_framesize;
-    int co_nlocals;
-    int co_ncellvars;
-    int co_nfreevars;
-    uint32_t co_version;
-    PyObject* co_localsplusnames;
-    PyObject* co_localspluskinds;
-    PyObject* co_filename;
-    PyObject* co_name;
-    PyObject* co_qualname;
-    PyObject* co_linetable;
-    PyObject* co_weakreflist;
-    void* co_executors;
-    void* _co_cached;
-    uintptr_t _co_instrumentation_version;
-    void* _co_monitoring;
-    Py_ssize_t _co_unique_id;
-    int _co_firsttraceable;
-    void* co_extra;
-    /* deal with co_tlbc somehow */
-    char co_code_adaptive[1];
-} PyCodeObject;
-}  // namespace Python3_14
-
-namespace Python3_15 {
-typedef uint16_t _Py_CODEUNIT;
-
-typedef struct
-{
-    PyObject_VAR_HEAD PyObject* co_consts;
-    PyObject* co_names;
-    PyObject* co_exceptiontable;
-    int co_flags;
-    int co_argcount;
-    int co_posonlyargcount;
-    int co_kwonlyargcount;
-    int co_stacksize;
-    int co_firstlineno;
-    int co_nlocalsplus;
-    int co_framesize;
-    int co_nlocals;
-    int co_ncellvars;
-    int co_nfreevars;
-    uint32_t co_version;
-    PyObject* co_localsplusnames;
-    PyObject* co_localspluskinds;
-    PyObject* co_filename;
-    PyObject* co_name;
-    PyObject* co_qualname;
-    PyObject* co_linetable;
-    PyObject* co_weakreflist;
-    void* co_executors;
-    void* _co_cached;
-    uintptr_t _co_instrumentation_version;
-    void* _co_monitoring;
-    Py_ssize_t _co_unique_id;
-    int _co_firsttraceable;
-    void* co_extra;
-    /* deal with co_tlbc somehow */
-    char co_code_adaptive[1];
-} PyCodeObject;
-}  // namespace Python3_15
-
 }  // namespace pystack

src/pystack/_pystack/cpython/frame.h

@@ -147,24 +147,6 @@ typedef union _PyStackRef {
     uintptr_t bits;
 } _PyStackRef;
 
-typedef struct _interpreter_frame
-{
-    _PyStackRef f_executable;
-    void* previous;
-    void* f_funcobj;
-    PyObject* f_globals;
-    PyObject* f_builtins;
-    PyObject* f_locals;
-    PyObject* frame_obj;
-    _Py_CODEUNIT* instr_ptr;
-    _PyStackRef stackpointer;
-    /* int32_t tlbc_index; */
-    uint16_t return_offset;
-    char owner;
-    uint8_t visited;
-    void* localsplus[1];
-} PyFrameObject;
-
 }  // namespace Python3_14
 
 }  // namespace pystack

src/pystack/_pystack/cpython/gc.h

@@ -83,48 +83,4 @@ struct _gc_runtime_state
 
 }  // namespace Python3_8
 
-namespace Python3_14 {
-
-struct _gc_runtime_state
-{
-    PyObject* trash_delete_later;
-    int trash_delete_nesting;
-    int enabled;
-    int debug;
-    struct Python3_8::gc_generation young;
-    struct Python3_8::gc_generation old[2];
-    struct Python3_8::gc_generation permanent_generation;
-    struct gc_generation_stats generation_stats[NUM_GENERATIONS];
-    int collecting;
-    PyObject* garbage;
-    PyObject* callbacks;
-    Py_ssize_t heap_size;
-    Py_ssize_t work_to_do;
-    int visited_space;
-    int phase;
-};
-
-}  // namespace Python3_14
-
-namespace Python3_15 {
-
-struct _gc_runtime_state
-{
-    int enabled;
-    int debug;
-    struct Python3_8::gc_generation young;
-    struct Python3_8::gc_generation old[2];
-    struct Python3_8::gc_generation permanent_generation;
-    struct gc_generation_stats generation_stats[NUM_GENERATIONS];
-    int collecting;
-    struct _PyInterpreterFrame* frame;
-    PyObject* garbage;
-    PyObject* callbacks;
-    Py_ssize_t heap_size;
-    Py_ssize_t long_lived_total;
-    Py_ssize_t long_lived_pending;
-};
-
-}  // namespace Python3_15
-
 }  // namespace pystack

src/pystack/_pystack/cpython/interpreter.h

@@ -339,157 +339,4 @@ typedef struct _is
 } PyInterpreterState;
 }  // namespace Python3_13
 
-namespace Python3_14 {
-
-struct _pythreadstate;
-
-typedef struct
-{
-    Python3_13::PyMutex mutex;
-    unsigned long long thread;
-    size_t level;
-} _PyRecursiveMutex;
-
-struct _import_state
-{
-    PyObject* modules;
-    PyObject* modules_by_index;
-    PyObject* importlib;
-    int override_frozen_modules;
-    int override_multi_interp_extensions_check;
-    PyObject* import_func;
-    _PyRecursiveMutex lock;
-    /* diagnostic info in PyImport_ImportModuleLevelObject() */
-    struct
-    {
-        int import_level;
-        int64_t accumulated;
-        int header;
-    } find_and_load;
-};
-
-struct _gil_runtime_state
-{
-    unsigned long interval;
-    struct _pythreadstate* last_holder;
-    int locked;
-    unsigned long switch_number;
-    pthread_cond_t cond;
-    pthread_cond_t mutex;
-#ifdef FORCE_SWITCHING
-    pthread_cond_t switch_cond;
-    pthread_cond_t switch_mutex;
-#endif
-};
-
-typedef struct _is
-{
-    struct _ceval_state ceval;
-    void* _malloced;
-    struct _is* next;
-    int64_t id;
-    Py_ssize_t id_refcount;
-    int requires_idref;
-    long _whence;
-    int _initialized;
-    int _ready;
-    int finalizing;
-    uintptr_t last_restart_version;
-    struct pythreads
-    {
-        uint64_t next_unique_id;
-        struct _pythreadstate* head;
-        struct _pythreadstate* preallocated;
-        struct _pythreadstate* main;
-        Py_ssize_t count;
-        size_t stacksize;
-    } threads;
-    void* runtime;
-    struct _pythreadstate* _finalizing;
-    unsigned long _finalizing_id;
-    struct _gc_runtime_state gc;
-    PyObject* sysdict;
-    PyObject* builtins;
-    struct _import_state imports;
-    struct _gil_runtime_state _gil;
-} PyInterpreterState;
-
-}  // namespace Python3_14
-
-namespace Python3_15 {
-
-struct _pythreadstate;
-
-typedef struct
-{
-    Python3_13::PyMutex mutex;
-    unsigned long long thread;
-    size_t level;
-} _PyRecursiveMutex;
-
-struct _import_state
-{
-    PyObject* modules;
-    PyObject* modules_by_index;
-    PyObject* importlib;
-    int override_frozen_modules;
-    int override_multi_interp_extensions_check;
-    PyObject* import_func;
-    _PyRecursiveMutex lock;
-    /* diagnostic info in PyImport_ImportModuleLevelObject() */
-    struct
-    {
-        int import_level;
-        int64_t accumulated;
-        int header;
-    } find_and_load;
-};
-
-struct _gil_runtime_state
-{
-    unsigned long interval;
-    struct _pythreadstate* last_holder;
-    int locked;
-    unsigned long switch_number;
-    pthread_cond_t cond;
-    pthread_cond_t mutex;
-#ifdef FORCE_SWITCHING
-    pthread_cond_t switch_cond;
-    pthread_cond_t switch_mutex;
-#endif
-};
-
-typedef struct _is
-{
-    struct _ceval_state ceval;
-    struct _is* next;
-    int64_t id;
-    Py_ssize_t id_refcount;
-    int requires_idref;
-    long _whence;
-    int _initialized;
-    int _ready;
-    int finalizing;
-    uintptr_t last_restart_version;
-    struct pythreads
-    {
-        uint64_t next_unique_id;
-        struct _pythreadstate* head;
-        struct _pythreadstate* preallocated;
-        struct _pythreadstate* main;
-        Py_ssize_t count;
-        size_t stacksize;
-    } threads;
-    void* runtime;
-    struct _pythreadstate* _finalizing;
-    unsigned long _finalizing_id;
-    struct _gc_runtime_state gc;
-    PyObject* sysdict;
-    PyObject* builtins;
-    struct _import_state imports;
-    struct _gil_runtime_state _gil;
-} PyInterpreterState;
-
-}  // namespace Python3_15
-
 }  // namespace pystack

src/pystack/_pystack/cpython/runtime.h

@@ -619,21 +619,6 @@ typedef struct _Py_DebugOffsets
 typedef struct pyruntimestate
 {
     _Py_DebugOffsets debug_offsets;
-    int _initialized;
-    int preinitializing;
-    int preinitialized;
-    int core_initialized;
-    int initialized;
-    struct _pythreadstate* finalizing;
-    unsigned long _finalizing_id;
-
-    struct pyinterpreters
-    {
-        Python3_13::PyMutex mutex;
-        PyInterpreterState* head;
-        PyInterpreterState* main;
-        int64_t next_id;
-    } interpreters;
 } PyRuntimeState;
 
 }  // namespace Python3_14
@@ -859,21 +844,6 @@ typedef struct _Py_DebugOffsets
 typedef struct pyruntimestate
 {
     _Py_DebugOffsets debug_offsets;
-    int _initialized;
-    int preinitializing;
-    int preinitialized;
-    int core_initialized;
-    int initialized;
-    struct _pythreadstate* finalizing;
-    unsigned long _finalizing_id;
-
-    struct pyinterpreters
-    {
-        Python3_13::PyMutex mutex;
-        PyInterpreterState* head;
-        PyInterpreterState* main;
-        int64_t next_id;
-    } interpreters;
 } PyRuntimeState;
 
 }  // namespace Python3_15

src/pystack/_pystack/cpython/string.h

@@ -122,23 +122,9 @@ struct _PyUnicode_State
 
 }  // namespace Python3_14t
 
-namespace Python3_15t {
-
-struct _PyUnicode_State
-{
-    unsigned char interned;
-    unsigned int kind : 3;
-    unsigned int compact : 1;
-    unsigned int ascii : 1;
-    unsigned int statically_allocated : 1;
-};
-
-}  // namespace Python3_15t
-
 union AnyPyUnicodeState {
     Python3::_PyUnicode_State python3;
     Python3_14t::_PyUnicode_State python3_14t;
-    Python3_15t::_PyUnicode_State python3_15t;
 };
 
 }  // namespace pystack