pystack 1.2.0__tar.gz → 1.4.0__tar.gz

{pystack-1.2.0 → pystack-1.4.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.4.0
 commit = True
 message = 
 	Prepare for {new_version} release

{pystack-1.2.0 → pystack-1.4.0}/MANIFEST.in

@@ -14,6 +14,7 @@ include README.md
 include src/pystack/py.typed
 include .bumpversion.cfg
 include .pre-commit-config.yaml
+include build_scripts/elfutils_contiguous_segments.diff
 
 recursive-include src/pystack/_pystack *
 recursive-include src/pystack *.py

{pystack-1.2.0 → pystack-1.4.0}/Makefile

@@ -93,6 +93,11 @@ docs:  ## Generate documentation
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 
+.PHONY: docs-live
+docs-live:  ## Serve documentation on localhost:8000, with live-reload
+	$(MAKE) -C docs clean
+	$(MAKE) -C docs livehtml
+
 .PHONY: gh-pages
 gh-pages:  ## Publish documentation on GitHub Pages
 	$(eval GIT_REMOTE := $(shell git remote get-url $(UPSTREAM_GIT_REMOTE)))

pystack-1.4.0/NEWS.rst

@@ -0,0 +1,75 @@
+.. note
+   You should *NOT* add new change log entries to this file, this
+   file is managed by towncrier. You *may* edit previous change logs to
+   fix problems like typo corrections or such.
+
+Changelog
+=========
+
+.. towncrier release notes start
+
+pystack 1.4.0 (2024-09-11)
+--------------------------
+
+Features
+~~~~~~~~
+
+- Add support for Python 3.13 (#186)
+- Add a new ``--version`` command line flag to show the version of pystack (#203)
+- Support debugging free-threading (a.k.a. "nogil") Python 3.13 builds. Note that PyStack can't itself be run with ``python3.13t``, it can only attach to a ``python3.13t`` process or core file from another interpreter. (#206)
+
+
+Bug Fixes
+~~~~~~~~~
+
+- Fix a bug that was causing Python scripts executed directly via shebang to report the shell script as the executable. (#184)
+- Heap corruption could cause PyStack to fail to generate a stack when ``--locals`` mode was used. This has been fixed by falling back to a reasonable default when attempting to format the repr of a local variable causes a dereference of an invalid pointer. (#194)
+- Fix a crash when analysing processes where the eval loop has a shim frame at the bottom of the stack (#204)
+
+
+pystack 1.3.0 (2023-11-28)
+--------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+- Add a patch to the bundled elfutils used to create wheels to account for a bug when analysing cores with interleaved segments (#153)
+- Removed the unused ``--self`` flag. (#141)
+- Fix some instances when identifying the pthread id was failing in systems without GLIBC (#152)
+- Fix several some race conditions when stopping threads in multithreaded programs (#155)
+- Ensure log messages that contain non-UTF-8 data are not lost (#155)
+
+
+pystack 1.2.0 (2023-07-31)
+--------------------------
+
+Features
+~~~~~~~~
+
+- Add support for Python 3.12 (#108)
+- Improve the performance of reading memory from running processes (#124)
+- Improve the performance of reading memory from core files (#126)
+
+
+pystack 1.1.0 (2023-07-10)
+--------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+- Allow building with older elfutils than 0.188 when building with glibc (for musl libc we still need newer versions). (#40)
+- Improve error reporting when attaching to a process is forbidden. (#98)
+- Fix a crash that could occur under some unusual conditions if elfutils could not unwind the stack. (#101)
+- Drop a use of the f-string ``=`` specifier, which wasn't introduced until Python 3.8 (running PyStack with Python 3.7 was failing because of this). (#92)
+
+
+pystack 1.0.1 (2023-04-11)
+--------------------------
+
+No significant changes.
+
+
+pystack 1.0.0 (2023-04-06)
+--------------------------
+
+-  Initial release.

{pystack-1.2.0 → pystack-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystack
-Version: 1.2.0
+Version: 1.4.0
 Summary: Analysis of the stack of remote python processes
 Home-page: https://github.com/bloomberg/pystack
 Author: Pablo Galindo Salgado
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Debuggers
 Requires-Python: >=3.7.0
@@ -88,6 +89,8 @@ package.
 Check your package manager on how to install these dependencies (e.g.,
 `apt-get install libdw-dev libelf-dev` in Debian-based systems). Note that you may need to tell the
 compiler where to find the header and library files of the dependencies for the build to succeed.
+If `pkg-config` is available (e.g. `apt-get install pkg-config` on Debian-based systems), it will
+automatically be used to locate the libraries and configure the correct build flags.
 Check your distribution's documentation to determine the location of the header and library files
 or for more detailed information. When building on Alpine Linux (or any other distribution that
 doesn't use glibc) you'll need elfutils 0.188 or newer. You may need to build this from source if
@@ -152,7 +155,7 @@ where the running process must not be impacted in any way (other than being temp
 though `--no-block` can avoid even that). There are several options available:
 
 ```shell
-usage: pystack remote [-h] [-v] [--no-color] [--no-block] [--native] [--native-all] [--locals] [--exhaustive] [--self] pid
+usage: pystack remote [-h] [-v] [--no-color] [--no-block] [--native] [--native-all] [--locals] [--exhaustive] pid
 
 positional arguments:
   pid            The PID of the remote process

{pystack-1.2.0 → pystack-1.4.0}/README.md

@@ -68,6 +68,8 @@ package.
 Check your package manager on how to install these dependencies (e.g.,
 `apt-get install libdw-dev libelf-dev` in Debian-based systems). Note that you may need to tell the
 compiler where to find the header and library files of the dependencies for the build to succeed.
+If `pkg-config` is available (e.g. `apt-get install pkg-config` on Debian-based systems), it will
+automatically be used to locate the libraries and configure the correct build flags.
 Check your distribution's documentation to determine the location of the header and library files
 or for more detailed information. When building on Alpine Linux (or any other distribution that
 doesn't use glibc) you'll need elfutils 0.188 or newer. You may need to build this from source if
@@ -132,7 +134,7 @@ where the running process must not be impacted in any way (other than being temp
 though `--no-block` can avoid even that). There are several options available:
 
 ```shell
-usage: pystack remote [-h] [-v] [--no-color] [--no-block] [--native] [--native-all] [--locals] [--exhaustive] [--self] pid
+usage: pystack remote [-h] [-v] [--no-color] [--no-block] [--native] [--native-all] [--locals] [--exhaustive] pid
 
 positional arguments:
   pid            The PID of the remote process

pystack-1.4.0/build_scripts/elfutils_contiguous_segments.diff

@@ -0,0 +1,66 @@
+diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c
+index 3ef62a7d..09ee37b3 100644
+--- a/libdwfl/dwfl_segment_report_module.c
++++ b/libdwfl/dwfl_segment_report_module.c
+@@ -737,17 +737,34 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
+ 	        && invalid_elf (module->elf, module->disk_file_has_build_id,
+ 				&build_id))
+ 	      {
+-		elf_end (module->elf);
+-		close (module->fd);
+-		module->elf = NULL;
+-		module->fd = -1;
++		/* If MODULE's build-id doesn't match the disk file's
++		   build-id, close ELF only if MODULE and ELF refer to
++		   different builds of files with the same name.  This
++		   prevents premature closure of the correct ELF in cases
++		   where segments of a module are non-contiguous in memory.  */
++		if (name != NULL && module->name[0] != '\0'
++		    && strcmp (basename (module->name), basename (name)) == 0)
++		  {
++		    elf_end (module->elf);
++		    close (module->fd);
++		    module->elf = NULL;
++		    module->fd = -1;
++		  }
+ 	      }
+-	    if (module->elf != NULL)
++	    else if (module->elf != NULL)
+ 	      {
+-		/* Ignore this found module if it would conflict in address
+-		   space with any already existing module of DWFL.  */
++		/* This module has already been reported.  */
+ 		skip_this_module = true;
+ 	      }
++	    else
++	      {
++		/* Only report this module if we haven't already done so.  */
++		for (Dwfl_Module *mod = dwfl->modulelist; mod != NULL;
++		     mod = mod->next)
++		  if (mod->low_addr == module_start
++		      && mod->high_addr == module_end)
++		    skip_this_module = true;
++	      }
+ 	  }
+       if (skip_this_module)
+ 	goto out;
+@@ -781,10 +798,6 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
+ 	}
+     }
+
+-  /* Our return value now says to skip the segments contained
+-     within the module.  */
+-  ndx = addr_segndx (dwfl, segment, module_end, true);
+-
+   /* Examine its .dynamic section to get more interesting details.
+      If it has DT_SONAME, we'll use that as the module name.
+      If it has a DT_DEBUG, then it's actually a PIE rather than a DSO.
+@@ -929,6 +942,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
+       ndx = -1;
+       goto out;
+     }
++  else
++    ndx++;
+
+   /* We have reported the module.  Now let the caller decide whether we
+      should read the whole thing in right now.  */

{pystack-1.2.0 → pystack-1.4.0}/pyproject.toml

@@ -3,7 +3,8 @@
 requires = [
      "setuptools",
      "wheel",
-     "Cython"
+     "Cython",
+     "pkgconfig"
 ]
 
 build-backend = 'setuptools.build_meta'
@@ -45,6 +46,7 @@ underlines = "-~"
 build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-i686-image = "manylinux2014"
+musllinux-x86_64-image = "musllinux_1_1"
 skip = "*-musllinux_aarch64"
 
 [tool.cibuildwheel.linux]
@@ -55,6 +57,7 @@ before-all = [
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
+  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
   "CFLAGS='-w' ./configure --enable-libdebuginfod=dummy --disable-debuginfod --prefix=/usr --libdir=/usr/lib64",
   "make install"
 ]
@@ -92,6 +95,7 @@ before-all = [
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
+  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
   "CFLAGS='-w -DFNM_EXTMATCH=0' ./configure --prefix=/usr --disable-nls --disable-libdebuginfod --disable-debuginfod --with-zstd",
   "make install"
 ]
@@ -112,3 +116,8 @@ omit = [
 
 [tool.coverage.report]
 show_missing = true
+
+[tool.pytest.ini_options]
+# pytest retains all temp files from the last 3 test suite runs by default.
+# Keep only ones for failed tests to avoid filling up a disk.
+tmp_path_retention_policy = "failed"

{pystack-1.2.0 → pystack-1.4.0}/setup.py

@@ -3,13 +3,14 @@ import pathlib
 import sys
 from sys import platform
 
+import pkgconfig
 import setuptools
 from Cython.Build import cythonize
 
 IS_LINUX = "linux" in platform
 
 if not IS_LINUX:
-    raise RuntimeError(f"memray does not support this platform ({platform})")
+    raise RuntimeError(f"pystack does not support this platform ({platform})")
 
 install_requires = []
 
@@ -52,6 +53,16 @@ if TEST_BUILD:
     }
     DEFINE_MACROS.extend([("CYTHON_TRACE", "1"), ("CYTHON_TRACE_NOGIL", "1")])
 
+library_flags = {"libraries": ["elf", "dw"]}
+
+try:
+    library_flags = pkgconfig.parse("libelf libdw")
+except EnvironmentError as e:
+    print("pkg-config not found.", e)
+    print("Falling back to static flags.")
+except pkgconfig.PackageNotFoundError as e:
+    print("Package Not Found", e)
+    print("Falling back to static flags.")
 
 PYSTACK_EXTENSION = setuptools.Extension(
     name="pystack._pystack",
@@ -69,12 +80,11 @@ PYSTACK_EXTENSION = setuptools.Extension(
         "src/pystack/_pystack/unwinder.cpp",
         "src/pystack/_pystack/version.cpp",
     ],
-    libraries=["elf", "dw"],
-    include_dirs=["src"],
     language="c++",
     extra_compile_args=["-std=c++17"],
     extra_link_args=["-std=c++17"],
     define_macros=DEFINE_MACROS,
+    **library_flags,
 )
 
 PYSTACK_EXTENSION.libraries.extend(["dl", "stdc++fs"])
@@ -105,6 +115,7 @@ setuptools.setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development :: Debuggers",
     ],

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/__main__.py

@@ -12,8 +12,11 @@ from typing import NoReturn
 from typing import Optional
 from typing import Set
 
+from pystack import __version__
 from pystack.errors import InvalidPythonProcess
+from pystack.process import decompress_gzip
 from pystack.process import is_elf
+from pystack.process import is_gzip
 
 from . import errors
 from . import print_thread
@@ -116,6 +119,9 @@ def generate_cli_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "-v", "--verbose", action="count", default=0, dest="global_verbose"
     )
+    parser.add_argument(
+        "--version", action="version", version=__version__, help="Show version"
+    )
     parser.add_argument(
         "--no-color",
         action="store_true",
@@ -172,12 +178,6 @@ def generate_cli_parser() -> argparse.ArgumentParser:
         default=False,
         help="Use all possible methods to obtain the Python stack info (may be slow)",
     )
-    remote_parser.add_argument(
-        "--self",
-        action="store_true",
-        default=False,
-        help="Introspect the same process that invoke this program",
-    )
     core_parser = subparsers.add_parser(
         "core",
         help="Analyze a core dump file given its location and the executable",
@@ -325,9 +325,32 @@ def process_core(parser: argparse.ArgumentParser, args: argparse.Namespace) -> N
     if not corefile.exists():
         parser.error(f"Core {corefile} does not exist")
 
+    if is_gzip(corefile):
+        corefile = decompress_gzip(corefile)
+
     if args.executable is None:
         corefile_analyzer = CoreFileAnalyzer(corefile)
         executable = pathlib.Path(corefile_analyzer.extract_executable())
+        if not executable.exists() or not is_elf(executable):
+            first_map = next(
+                (
+                    map
+                    for map in corefile_analyzer.extract_maps()
+                    if map.path is not None
+                ),
+                None,
+            )
+            if (
+                first_map is not None
+                and first_map.path is not None
+                and first_map.path.exists()
+                and is_elf(first_map.path)
+            ):
+                executable = first_map.path
+                LOGGER.info(
+                    "Setting executable automatically to the first map in the core: %s",
+                    executable,
+                )
         if not executable.exists():
             raise errors.DetectedExecutableNotFound(
                 f"Detected executable doesn't exist: {executable}"

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/corefile.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <fstream>

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/code.h

@@ -160,13 +160,41 @@ typedef struct
 } PyCodeObject;
 }  // namespace Python3_12
 
-typedef union {
-    Python2::PyCodeObject v2;
-    Python3_3::PyCodeObject v3_3;
-    Python3_6::PyCodeObject v3_6;
-    Python3_8::PyCodeObject v3_8;
-    Python3_11::PyCodeObject v3_11;
-    Python3_12::PyCodeObject v3_12;
+namespace Python3_13 {
+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;
+    int _co_firsttraceable;
+    void* co_extra;
+    char co_code_adaptive[1];
 } PyCodeObject;
+}  // namespace Python3_13
 
 }  // namespace pystack

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/dict.h

@@ -47,6 +47,11 @@ typedef struct
     PyObject** ma_values;
 } PyDictObject;
 
+typedef struct _dictvalues
+{
+    PyObject* values[1];
+} PyDictValuesObject;
+
 }  // namespace Python3
 namespace Python3_3 {
 typedef struct _dictkeysobject
@@ -77,8 +82,21 @@ typedef struct _dictkeysobject
     uint32_t dk_version;
     Py_ssize_t dk_usable;
     Py_ssize_t dk_nentries;
-    char dk_indices[]; /* char is required to avoid strict aliasing. */
+    char dk_indices[1]; /* char is required to avoid strict aliasing. */
 } PyDictKeysObject;
 }  // namespace Python3_11
 
+namespace Python3_13 {
+
+typedef struct _dictvalues
+{
+    uint8_t capacity;
+    uint8_t size;
+    uint8_t embedded;
+    uint8_t valid;
+    PyObject* values[1];
+} PyDictValuesObject;
+
+}  // namespace Python3_13
+
 }  // namespace pystack

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/frame.h

@@ -39,7 +39,7 @@ namespace Python3_7 {
 typedef struct _pyframeobject
 {
     PyObject_VAR_HEAD struct _pyframeobject* f_back;
-    PyCodeObject* f_code;
+    PyObject* f_code;
     PyObject* f_builtins;
     PyObject* f_globals;
     PyObject* f_locals;
@@ -64,7 +64,7 @@ typedef signed char PyFrameState;
 typedef struct _pyframeobject
 {
     PyObject_VAR_HEAD struct _pyframeobject* f_back;
-    PyCodeObject* f_code;
+    PyObject* f_code;
     PyObject* f_builtins;
     PyObject* f_globals;
     PyObject* f_locals;
@@ -126,12 +126,4 @@ typedef struct _interpreter_frame
 
 }  // namespace Python3_12
 
-typedef union {
-    Python2::PyFrameObject v2;
-    Python3_7::PyFrameObject v3_7;
-    Python3_10::PyFrameObject v3_10;
-    Python3_11::PyFrameObject v3_11;
-    Python3_12::PyFrameObject v3_12;
-} PyFrameObject;
-
 }  // namespace pystack

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/gc.h

@@ -83,8 +83,27 @@ struct _gc_runtime_state
 
 }  // namespace Python3_8
 
-typedef union {
-    struct Python3_7::_gc_runtime_state v3_7;
-    struct Python3_8::_gc_runtime_state v3_8;
-} GCRuntimeState;
+namespace Python3_13 {
+
+using Python3_8::gc_generation;
+
+struct _gc_runtime_state
+{
+    PyObject* trash_delete_later;
+    int trash_delete_nesting;
+    int enabled;
+    int debug;
+    struct gc_generation young;
+    struct gc_generation old[2];
+    struct 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;
+};
+
+}  // namespace Python3_13
 }  // namespace pystack

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/interpreter.h

@@ -247,13 +247,95 @@ typedef struct _is
 } PyInterpreterState;
 }  // namespace Python3_12
 
-typedef union {
-    Python2::PyInterpreterState v2;
-    Python3_5::PyInterpreterState v3_5;
-    Python3_7::PyInterpreterState v3_7;
-    Python3_8::PyInterpreterState v3_8;
-    Python3_9::PyInterpreterState v3_9;
-    Python3_11::PyInterpreterState v3_11;
-    Python3_12::PyInterpreterState v3_12;
+namespace Python3_13 {
+
+struct _pythreadstate; /* Forward */
+struct PyMutex
+{
+    uint8_t v;
+};
+typedef int (*_Py_pending_call_func)(void*);
+struct _pending_call
+{
+    _Py_pending_call_func func;
+    void* arg;
+    int flags;
+};
+struct _pending_calls
+{
+    void* handling_thread;
+    PyMutex mutex;
+    int32_t npending;
+    int32_t max;
+    int32_t maxloop;
+    struct _pending_call calls[300];
+    int first;
+    int next;
+};
+
+struct _ceval_state
+{
+    uintptr_t instrumentation_version;
+    int recursion_limit;
+    struct _gil_runtime_state* gil;
+    int own_gil;
+    struct _pending_calls pending;
+};
+
+struct _import_state
+{
+    PyObject* modules;
+    PyObject* modules_by_index;
+    PyObject* importlib;
+    int override_frozen_modules;
+    int override_multi_interp_extensions_check;
+    int dlopenflags;
+    PyObject* import_func;
+    struct
+    {
+        PyThread_type_lock mutex;
+        unsigned long thread;
+        int level;
+    } lock;
+    struct
+    {
+        int import_level;
+        int64_t accumulated;
+        int header;
+    } find_and_load;
+};
+
+typedef struct _is
+{
+    struct _ceval_state ceval;
+    struct _is* next;
+
+    int64_t id;
+    int64_t id_refcount;
+    int requires_idref;
+    PyThread_type_lock id_mutex;
+    long _whence;
+    int _initialized;
+    int _ready;
+    int finalizing;
+    uintptr_t last_restart_version;
+    struct pythreads
+    {
+        uint64_t next_unique_id;
+        _pythreadstate* head;
+        _pythreadstate* main;
+        Py_ssize_t count;
+        size_t stacksize;
+    } threads;
+    struct pyruntimestate* runtime;
+    void* _finalizing;
+    unsigned long _finalizing_id;
+    struct Python3_8::_gc_runtime_state gc;
+    // Dictionary of the sys module
+    PyObject* sysdict;
+    // Dictionary of the builtins module
+    PyObject* builtins;
+    struct _import_state imports;
 } PyInterpreterState;
+}  // namespace Python3_13
 }  // namespace pystack

{pystack-1.2.0 → pystack-1.4.0}/src/pystack/_pystack/cpython/object.h

@@ -205,12 +205,6 @@ typedef struct _typeobject
 } PyTypeObject;
 }  // namespace Python3_8
 
-typedef union {
-    Python2::PyTypeObject v2;
-    Python3_3::PyTypeObject v3_3;
-    Python3_8::PyTypeObject v3_8;
-} PyTypeObject;
-
 /* These flags are used to determine if a type is a subclass. */
 constexpr long Pystack_TPFLAGS_INT_SUBCLASS = 1ul << 23u;
 constexpr long Pystack_TPFLAGS_LONG_SUBCLASS = 1ul << 24u;