]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f77a911)
[3.14] gh-132775: Clean Up Cross-Interpreter Error Handling (gh-135492)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 14 Jun 2025 02:08:25 +0000 (04:08 +0200)
committerGitHub <noreply@github.com>
Sat, 14 Jun 2025 02:08:25 +0000 (02:08 +0000)
In this refactor we:

* move some code around
* make a couple of typedefs opaque
* decouple errors from session state
* improve tracebacks for propagated exceptions

This change helps simplify several upcoming changes.

(cherry picked from commit c7f4a80079, AKA gh-135369)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
Doc/data/python3.14.abi patch | blob | blame | history
Include/internal/pycore_crossinterp.h patch | blob | blame | history
Modules/_interpretersmodule.c patch | blob | blame | history
Python/crossinterp.c patch | blob | blame | history
Python/crossinterp_data_lookup.h patch | blob | blame | history
Python/crossinterp_exceptions.h patch | blob | blame | history

diff --git a/Doc/data/python3.14.abi b/Doc/data/python3.14.abi
index c5480aaf0e80f00ffd381d65a39ba886c4f9afb9..c692d1f4914ad9effa4196df496a20d867929c4c 100644 (file)
--- a/Doc/data/python3.14.abi
+++ b/Doc/data/python3.14.abi
@@ -892,6 +892,7 @@
     <elf-symbol name='PyUnicodeWriter_Discard' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='PyUnicodeWriter_Finish' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='PyUnicodeWriter_Format' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='PyUnicodeWriter_WriteASCII' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='PyUnicodeWriter_WriteChar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='PyUnicodeWriter_WriteRepr' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='PyUnicodeWriter_WriteStr' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
@@ -1510,21 +1511,26 @@
     <elf-symbol name='_PyXIData_ReleaseAndRawFree' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXIData_SetNotShareableError' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXIData_UnregisterClass' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
-    <elf-symbol name='_PyXI_ApplyError' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
-    <elf-symbol name='_PyXI_ClearExcInfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_ClearResult' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_EndInterpreter' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_Enter' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_ExcInfoAsObject' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_Exit' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_FormatExcInfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_FreeExcInfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_FreeFailure' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_FreeSession' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_GetFailureCode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_GetMainNamespace' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_GetPreserved' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
-    <elf-symbol name='_PyXI_InitExcInfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_InitFailure' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_InitFailureUTF8' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_NewExcInfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_NewFailure' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_NewInterpreter' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_NewSession' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_PyXI_Preserve' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
+    <elf-symbol name='_PyXI_UnwrapNotShareableError' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_Py_BreakPoint' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_Py_BuildValue_SizeT' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
     <elf-symbol name='_Py_CheckFunctionResult' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>\r
@@ -3213,8 +3219,10 @@
       <parameter type-id='type-id-178'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='getlogin' filepath='/usr/include/unistd.h' line='881' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <return type-id='type-id-17'/>\r
+    <function-decl name='getlogin_r' filepath='/usr/include/unistd.h' line='889' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+      <parameter type-id='type-id-17'/>\r
+      <parameter type-id='type-id-21'/>\r
+      <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='chroot' filepath='/usr/include/unistd.h' line='977' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-4'/>\r
@@ -4282,12 +4290,12 @@
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>\r
     <qualified-type-def type-id='type-id-7' const='yes' id='type-id-263'/>\r
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>\r
-    <function-decl name='PyObject_CallFunctionObjArgs' mangled-name='PyObject_CallFunctionObjArgs' filepath='./Include/abstract.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallFunctionObjArgs'>\r
+    <function-decl name='PyObject_CallFunctionObjArgs' mangled-name='PyObject_CallFunctionObjArgs' filepath='./Include/abstract.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallFunctionObjArgs'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter is-variadic='yes'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyObject_VectorcallMethod' mangled-name='PyObject_VectorcallMethod' filepath='./Include/abstract.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_VectorcallMethod'>\r
+    <function-decl name='PyObject_VectorcallMethod' mangled-name='PyObject_VectorcallMethod' filepath='./Include/abstract.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_VectorcallMethod'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-265'/>\r
       <parameter type-id='type-id-21'/>\r
@@ -5702,7 +5710,7 @@
       <parameter type-id='type-id-311'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_FromId' mangled-name='_PyUnicode_FromId' filepath='./Include/cpython/unicodeobject.h' line='769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_FromId'>\r
+    <function-decl name='_PyUnicode_FromId' mangled-name='_PyUnicode_FromId' filepath='./Include/cpython/unicodeobject.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_FromId'>\r
       <parameter type-id='type-id-311'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
@@ -6681,39 +6689,39 @@
     </array-type-def>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Objects/complexobject.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_PyUnicodeWriter' size-in-bits='448' is-struct='yes' naming-typedef-id='type-id-375' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='515' column='1' id='type-id-376'>\r
+    <class-decl name='_PyUnicodeWriter' size-in-bits='448' is-struct='yes' naming-typedef-id='type-id-375' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='519' column='1' id='type-id-376'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='buffer' type-id='type-id-6' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='516' column='1'/>\r
+        <var-decl name='buffer' type-id='type-id-6' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='520' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='data' type-id='type-id-35' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='517' column='1'/>\r
+        <var-decl name='data' type-id='type-id-35' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='521' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='kind' type-id='type-id-5' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='518' column='1'/>\r
+        <var-decl name='kind' type-id='type-id-5' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='522' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='160'>\r
-        <var-decl name='maxchar' type-id='type-id-305' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='519' column='1'/>\r
+        <var-decl name='maxchar' type-id='type-id-305' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='523' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='192'>\r
-        <var-decl name='size' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='520' column='1'/>\r
+        <var-decl name='size' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='524' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='256'>\r
-        <var-decl name='pos' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='521' column='1'/>\r
+        <var-decl name='pos' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='525' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='320'>\r
-        <var-decl name='min_length' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='524' column='1'/>\r
+        <var-decl name='min_length' type-id='type-id-7' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='528' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='384'>\r
-        <var-decl name='min_char' type-id='type-id-305' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='527' column='1'/>\r
+        <var-decl name='min_char' type-id='type-id-305' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='531' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='416'>\r
-        <var-decl name='overallocate' type-id='type-id-95' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='530' column='1'/>\r
+        <var-decl name='overallocate' type-id='type-id-95' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='534' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='424'>\r
-        <var-decl name='readonly' type-id='type-id-95' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='534' column='1'/>\r
+        <var-decl name='readonly' type-id='type-id-95' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='538' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyUnicodeWriter' type-id='type-id-376' filepath='./Include/cpython/unicodeobject.h' line='535' column='1' id='type-id-375'/>\r
+    <typedef-decl name='_PyUnicodeWriter' type-id='type-id-376' filepath='./Include/cpython/unicodeobject.h' line='539' column='1' id='type-id-375'/>\r
     <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-378'/>\r
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-379'/>\r
     <var-decl name='PyComplex_Type' type-id='type-id-271' mangled-name='PyComplex_Type' visibility='default' filepath='./Include/complexobject.h' line='11' column='1' elf-symbol-id='PyComplex_Type'/>\r
@@ -6722,15 +6730,15 @@
       <parameter type-id='type-id-172'/>\r
       <return type-id='type-id-304'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicodeWriter_Init' mangled-name='_PyUnicodeWriter_Init' filepath='./Include/cpython/unicodeobject.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Init'>\r
+    <function-decl name='_PyUnicodeWriter_Init' mangled-name='_PyUnicodeWriter_Init' filepath='./Include/cpython/unicodeobject.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Init'>\r
       <parameter type-id='type-id-379'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicodeWriter_Finish' mangled-name='_PyUnicodeWriter_Finish' filepath='./Include/cpython/unicodeobject.h' line='617' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Finish'>\r
+    <function-decl name='_PyUnicodeWriter_Finish' mangled-name='_PyUnicodeWriter_Finish' filepath='./Include/cpython/unicodeobject.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Finish'>\r
       <parameter type-id='type-id-379'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicodeWriter_Dealloc' mangled-name='_PyUnicodeWriter_Dealloc' filepath='./Include/cpython/unicodeobject.h' line='621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Dealloc'>\r
+    <function-decl name='_PyUnicodeWriter_Dealloc' mangled-name='_PyUnicodeWriter_Dealloc' filepath='./Include/cpython/unicodeobject.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_Dealloc'>\r
       <parameter type-id='type-id-379'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
@@ -8221,7 +8229,7 @@
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicodeWriter_WriteUTF8' mangled-name='PyUnicodeWriter_WriteUTF8' filepath='./Include/cpython/unicodeobject.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteUTF8'>\r
+    <function-decl name='PyUnicodeWriter_WriteASCII' mangled-name='PyUnicodeWriter_WriteASCII' filepath='./Include/cpython/unicodeobject.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteASCII'>\r
       <parameter type-id='type-id-415'/>\r
       <parameter type-id='type-id-4'/>\r
       <parameter type-id='type-id-7'/>\r
@@ -8558,7 +8566,7 @@
       <parameter type-id='type-id-8'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicodeWriter_WriteRepr' mangled-name='PyUnicodeWriter_WriteRepr' filepath='./Include/cpython/unicodeobject.h' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteRepr'>\r
+    <function-decl name='PyUnicodeWriter_WriteRepr' mangled-name='PyUnicodeWriter_WriteRepr' filepath='./Include/cpython/unicodeobject.h' line='497' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteRepr'>\r
       <parameter type-id='type-id-415'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-5'/>\r
@@ -8691,13 +8699,13 @@
     <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-460'/>\r
     <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-461'/>\r
     <class-decl name='PyLongWriter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-438'/>\r
-    <function-decl name='_PyUnicodeWriter_PrepareInternal' mangled-name='_PyUnicodeWriter_PrepareInternal' filepath='./Include/cpython/unicodeobject.h' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_PrepareInternal'>\r
+    <function-decl name='_PyUnicodeWriter_PrepareInternal' mangled-name='_PyUnicodeWriter_PrepareInternal' filepath='./Include/cpython/unicodeobject.h' line='563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_PrepareInternal'>\r
       <parameter type-id='type-id-379'/>\r
       <parameter type-id='type-id-7'/>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicodeWriter_WriteStr' mangled-name='_PyUnicodeWriter_WriteStr' filepath='./Include/cpython/unicodeobject.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_WriteStr'>\r
+    <function-decl name='_PyUnicodeWriter_WriteStr' mangled-name='_PyUnicodeWriter_WriteStr' filepath='./Include/cpython/unicodeobject.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_WriteStr'>\r
       <parameter type-id='type-id-379'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-5'/>\r
@@ -8773,214 +8781,214 @@
       <parameter type-id='type-id-5' name='is_signed' filepath='Objects/longobject.c' line='924' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_AsByteArray' mangled-name='_PyLong_AsByteArray' filepath='Objects/longobject.c' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_AsByteArray'>\r
-      <parameter type-id='type-id-259' name='v' filepath='Objects/longobject.c' line='1038' column='1'/>\r
-      <parameter type-id='type-id-461' name='bytes' filepath='Objects/longobject.c' line='1039' column='1'/>\r
-      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1039' column='1'/>\r
-      <parameter type-id='type-id-5' name='little_endian' filepath='Objects/longobject.c' line='1040' column='1'/>\r
-      <parameter type-id='type-id-5' name='is_signed' filepath='Objects/longobject.c' line='1040' column='1'/>\r
-      <parameter type-id='type-id-5' name='with_exceptions' filepath='Objects/longobject.c' line='1041' column='1'/>\r
+    <function-decl name='_PyLong_AsByteArray' mangled-name='_PyLong_AsByteArray' filepath='Objects/longobject.c' line='1031' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_AsByteArray'>\r
+      <parameter type-id='type-id-259' name='v' filepath='Objects/longobject.c' line='1031' column='1'/>\r
+      <parameter type-id='type-id-461' name='bytes' filepath='Objects/longobject.c' line='1032' column='1'/>\r
+      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1032' column='1'/>\r
+      <parameter type-id='type-id-5' name='little_endian' filepath='Objects/longobject.c' line='1033' column='1'/>\r
+      <parameter type-id='type-id-5' name='is_signed' filepath='Objects/longobject.c' line='1033' column='1'/>\r
+      <parameter type-id='type-id-5' name='with_exceptions' filepath='Objects/longobject.c' line='1034' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsNativeBytes' mangled-name='PyLong_AsNativeBytes' filepath='Objects/longobject.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsNativeBytes'>\r
-      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1205' column='1'/>\r
-      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1205' column='1'/>\r
-      <parameter type-id='type-id-7' name='n' filepath='Objects/longobject.c' line='1205' column='1'/>\r
-      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1205' column='1'/>\r
+    <function-decl name='PyLong_AsNativeBytes' mangled-name='PyLong_AsNativeBytes' filepath='Objects/longobject.c' line='1198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsNativeBytes'>\r
+      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1198' column='1'/>\r
+      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1198' column='1'/>\r
+      <parameter type-id='type-id-7' name='n' filepath='Objects/longobject.c' line='1198' column='1'/>\r
+      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1198' column='1'/>\r
       <return type-id='type-id-7'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromNativeBytes' mangled-name='PyLong_FromNativeBytes' filepath='Objects/longobject.c' line='1390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromNativeBytes'>\r
-      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1390' column='1'/>\r
-      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1390' column='1'/>\r
-      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1390' column='1'/>\r
+    <function-decl name='PyLong_FromNativeBytes' mangled-name='PyLong_FromNativeBytes' filepath='Objects/longobject.c' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromNativeBytes'>\r
+      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1383' column='1'/>\r
+      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1383' column='1'/>\r
+      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1383' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromUnsignedNativeBytes' mangled-name='PyLong_FromUnsignedNativeBytes' filepath='Objects/longobject.c' line='1412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUnsignedNativeBytes'>\r
-      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1412' column='1'/>\r
-      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1412' column='1'/>\r
-      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1412' column='1'/>\r
+    <function-decl name='PyLong_FromUnsignedNativeBytes' mangled-name='PyLong_FromUnsignedNativeBytes' filepath='Objects/longobject.c' line='1405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUnsignedNativeBytes'>\r
+      <parameter type-id='type-id-35' name='buffer' filepath='Objects/longobject.c' line='1405' column='1'/>\r
+      <parameter type-id='type-id-21' name='n' filepath='Objects/longobject.c' line='1405' column='1'/>\r
+      <parameter type-id='type-id-5' name='flags' filepath='Objects/longobject.c' line='1405' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsVoidPtr' mangled-name='PyLong_AsVoidPtr' filepath='Objects/longobject.c' line='1448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsVoidPtr'>\r
-      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1448' column='1'/>\r
+    <function-decl name='PyLong_AsVoidPtr' mangled-name='PyLong_AsVoidPtr' filepath='Objects/longobject.c' line='1441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsVoidPtr'>\r
+      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1441' column='1'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromLongLong' mangled-name='PyLong_FromLongLong' filepath='Objects/longobject.c' line='1489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromLongLong'>\r
-      <parameter type-id='type-id-463' name='ival' filepath='Objects/longobject.c' line='1489' column='1'/>\r
+    <function-decl name='PyLong_FromLongLong' mangled-name='PyLong_FromLongLong' filepath='Objects/longobject.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromLongLong'>\r
+      <parameter type-id='type-id-463' name='ival' filepath='Objects/longobject.c' line='1482' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsLongLong' mangled-name='PyLong_AsLongLong' filepath='Objects/longobject.c' line='1506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsLongLong'>\r
-      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1506' column='1'/>\r
+    <function-decl name='PyLong_AsLongLong' mangled-name='PyLong_AsLongLong' filepath='Objects/longobject.c' line='1499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsLongLong'>\r
+      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1499' column='1'/>\r
       <return type-id='type-id-463'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsUnsignedLongLong' mangled-name='PyLong_AsUnsignedLongLong' filepath='Objects/longobject.c' line='1551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUnsignedLongLong'>\r
-      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1551' column='1'/>\r
+    <function-decl name='PyLong_AsUnsignedLongLong' mangled-name='PyLong_AsUnsignedLongLong' filepath='Objects/longobject.c' line='1544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUnsignedLongLong'>\r
+      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1544' column='1'/>\r
       <return type-id='type-id-462'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsUnsignedLongLongMask' mangled-name='PyLong_AsUnsignedLongLongMask' filepath='Objects/longobject.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUnsignedLongLongMask'>\r
-      <parameter type-id='type-id-6' name='op' filepath='Objects/longobject.c' line='1627' column='1'/>\r
+    <function-decl name='PyLong_AsUnsignedLongLongMask' mangled-name='PyLong_AsUnsignedLongLongMask' filepath='Objects/longobject.c' line='1620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUnsignedLongLongMask'>\r
+      <parameter type-id='type-id-6' name='op' filepath='Objects/longobject.c' line='1620' column='1'/>\r
       <return type-id='type-id-462'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsLongLongAndOverflow' mangled-name='PyLong_AsLongLongAndOverflow' filepath='Objects/longobject.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsLongLongAndOverflow'>\r
-      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1661' column='1'/>\r
-      <parameter type-id='type-id-177' name='overflow' filepath='Objects/longobject.c' line='1661' column='1'/>\r
+    <function-decl name='PyLong_AsLongLongAndOverflow' mangled-name='PyLong_AsLongLongAndOverflow' filepath='Objects/longobject.c' line='1654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsLongLongAndOverflow'>\r
+      <parameter type-id='type-id-6' name='vv' filepath='Objects/longobject.c' line='1654' column='1'/>\r
+      <parameter type-id='type-id-177' name='overflow' filepath='Objects/longobject.c' line='1654' column='1'/>\r
       <return type-id='type-id-463'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UnsignedShort_Converter' mangled-name='_PyLong_UnsignedShort_Converter' filepath='Objects/longobject.c' line='1758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedShort_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1758' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1758' column='1'/>\r
+    <function-decl name='_PyLong_UnsignedShort_Converter' mangled-name='_PyLong_UnsignedShort_Converter' filepath='Objects/longobject.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedShort_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1751' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1751' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UnsignedInt_Converter' mangled-name='_PyLong_UnsignedInt_Converter' filepath='Objects/longobject.c' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedInt_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1759' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1759' column='1'/>\r
+    <function-decl name='_PyLong_UnsignedInt_Converter' mangled-name='_PyLong_UnsignedInt_Converter' filepath='Objects/longobject.c' line='1752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedInt_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1752' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1752' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UnsignedLong_Converter' mangled-name='_PyLong_UnsignedLong_Converter' filepath='Objects/longobject.c' line='1760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedLong_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1760' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1760' column='1'/>\r
+    <function-decl name='_PyLong_UnsignedLong_Converter' mangled-name='_PyLong_UnsignedLong_Converter' filepath='Objects/longobject.c' line='1753' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedLong_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1753' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1753' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UnsignedLongLong_Converter' mangled-name='_PyLong_UnsignedLongLong_Converter' filepath='Objects/longobject.c' line='1761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedLongLong_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1761' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1761' column='1'/>\r
+    <function-decl name='_PyLong_UnsignedLongLong_Converter' mangled-name='_PyLong_UnsignedLongLong_Converter' filepath='Objects/longobject.c' line='1754' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UnsignedLongLong_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1754' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1754' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Size_t_Converter' mangled-name='_PyLong_Size_t_Converter' filepath='Objects/longobject.c' line='1762' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Size_t_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1762' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1762' column='1'/>\r
+    <function-decl name='_PyLong_Size_t_Converter' mangled-name='_PyLong_Size_t_Converter' filepath='Objects/longobject.c' line='1755' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Size_t_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1755' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1755' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UInt8_Converter' mangled-name='_PyLong_UInt8_Converter' filepath='Objects/longobject.c' line='1763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt8_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1763' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1763' column='1'/>\r
+    <function-decl name='_PyLong_UInt8_Converter' mangled-name='_PyLong_UInt8_Converter' filepath='Objects/longobject.c' line='1756' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt8_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1756' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1756' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UInt16_Converter' mangled-name='_PyLong_UInt16_Converter' filepath='Objects/longobject.c' line='1764' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt16_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1764' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1764' column='1'/>\r
+    <function-decl name='_PyLong_UInt16_Converter' mangled-name='_PyLong_UInt16_Converter' filepath='Objects/longobject.c' line='1757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt16_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1757' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1757' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UInt32_Converter' mangled-name='_PyLong_UInt32_Converter' filepath='Objects/longobject.c' line='1765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt32_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1765' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1765' column='1'/>\r
+    <function-decl name='_PyLong_UInt32_Converter' mangled-name='_PyLong_UInt32_Converter' filepath='Objects/longobject.c' line='1758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt32_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1758' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1758' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_UInt64_Converter' mangled-name='_PyLong_UInt64_Converter' filepath='Objects/longobject.c' line='1766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt64_Converter'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1766' column='1'/>\r
-      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1766' column='1'/>\r
+    <function-decl name='_PyLong_UInt64_Converter' mangled-name='_PyLong_UInt64_Converter' filepath='Objects/longobject.c' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_UInt64_Converter'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='1759' column='1'/>\r
+      <parameter type-id='type-id-35' name='ptr' filepath='Objects/longobject.c' line='1759' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Frexp' mangled-name='_PyLong_Frexp' filepath='Objects/longobject.c' line='3386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Frexp'>\r
-      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3386' column='1'/>\r
-      <parameter type-id='type-id-458' name='e' filepath='Objects/longobject.c' line='3386' column='1'/>\r
+    <function-decl name='_PyLong_Frexp' mangled-name='_PyLong_Frexp' filepath='Objects/longobject.c' line='3379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Frexp'>\r
+      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3379' column='1'/>\r
+      <parameter type-id='type-id-458' name='e' filepath='Objects/longobject.c' line='3379' column='1'/>\r
       <return type-id='type-id-172'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_ExactDealloc' mangled-name='_PyLong_ExactDealloc' filepath='Objects/longobject.c' line='3566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_ExactDealloc'>\r
-      <parameter type-id='type-id-6' name='self' filepath='Objects/longobject.c' line='3566' column='1'/>\r
+    <function-decl name='_PyLong_ExactDealloc' mangled-name='_PyLong_ExactDealloc' filepath='Objects/longobject.c' line='3559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_ExactDealloc'>\r
+      <parameter type-id='type-id-6' name='self' filepath='Objects/longobject.c' line='3559' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Add' mangled-name='_PyLong_Add' filepath='Objects/longobject.c' line='3782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Add'>\r
-      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3782' column='1'/>\r
-      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='3782' column='1'/>\r
+    <function-decl name='_PyLong_Add' mangled-name='_PyLong_Add' filepath='Objects/longobject.c' line='3775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Add'>\r
+      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3775' column='1'/>\r
+      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='3775' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Subtract' mangled-name='_PyLong_Subtract' filepath='Objects/longobject.c' line='3825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Subtract'>\r
-      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3825' column='1'/>\r
-      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='3825' column='1'/>\r
+    <function-decl name='_PyLong_Subtract' mangled-name='_PyLong_Subtract' filepath='Objects/longobject.c' line='3818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Subtract'>\r
+      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='3818' column='1'/>\r
+      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='3818' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Multiply' mangled-name='_PyLong_Multiply' filepath='Objects/longobject.c' line='4272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Multiply'>\r
-      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='4272' column='1'/>\r
-      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='4272' column='1'/>\r
+    <function-decl name='_PyLong_Multiply' mangled-name='_PyLong_Multiply' filepath='Objects/longobject.c' line='4265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Multiply'>\r
+      <parameter type-id='type-id-259' name='a' filepath='Objects/longobject.c' line='4265' column='1'/>\r
+      <parameter type-id='type-id-259' name='b' filepath='Objects/longobject.c' line='4265' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_Rshift' mangled-name='_PyLong_Rshift' filepath='Objects/longobject.c' line='5349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Rshift'>\r
-      <parameter type-id='type-id-6' name='a' filepath='Objects/longobject.c' line='5349' column='1'/>\r
-      <parameter type-id='type-id-409' name='shiftby' filepath='Objects/longobject.c' line='5349' column='1'/>\r
+    <function-decl name='_PyLong_Rshift' mangled-name='_PyLong_Rshift' filepath='Objects/longobject.c' line='5342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_Rshift'>\r
+      <parameter type-id='type-id-6' name='a' filepath='Objects/longobject.c' line='5342' column='1'/>\r
+      <parameter type-id='type-id-409' name='shiftby' filepath='Objects/longobject.c' line='5342' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_GCD' mangled-name='_PyLong_GCD' filepath='Objects/longobject.c' line='5658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_GCD'>\r
-      <parameter type-id='type-id-6' name='aarg' filepath='Objects/longobject.c' line='5658' column='1'/>\r
-      <parameter type-id='type-id-6' name='barg' filepath='Objects/longobject.c' line='5658' column='1'/>\r
+    <function-decl name='_PyLong_GCD' mangled-name='_PyLong_GCD' filepath='Objects/longobject.c' line='5651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_GCD'>\r
+      <parameter type-id='type-id-6' name='aarg' filepath='Objects/longobject.c' line='5651' column='1'/>\r
+      <parameter type-id='type-id-6' name='barg' filepath='Objects/longobject.c' line='5651' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyLong_DivmodNear' mangled-name='_PyLong_DivmodNear' filepath='Objects/longobject.c' line='6024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_DivmodNear'>\r
-      <parameter type-id='type-id-6' name='a' filepath='Objects/longobject.c' line='6024' column='1'/>\r
-      <parameter type-id='type-id-6' name='b' filepath='Objects/longobject.c' line='6024' column='1'/>\r
+    <function-decl name='_PyLong_DivmodNear' mangled-name='_PyLong_DivmodNear' filepath='Objects/longobject.c' line='6017' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyLong_DivmodNear'>\r
+      <parameter type-id='type-id-6' name='a' filepath='Objects/longobject.c' line='6017' column='1'/>\r
+      <parameter type-id='type-id-6' name='b' filepath='Objects/longobject.c' line='6017' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_GetInfo' mangled-name='PyLong_GetInfo' filepath='Objects/longobject.c' line='6619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_GetInfo'>\r
+    <function-decl name='PyLong_GetInfo' mangled-name='PyLong_GetInfo' filepath='Objects/longobject.c' line='6612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_GetInfo'>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyUnstable_Long_IsCompact' mangled-name='PyUnstable_Long_IsCompact' filepath='Objects/longobject.c' line='6674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnstable_Long_IsCompact'>\r
-      <parameter type-id='type-id-451' name='op' filepath='Objects/longobject.c' line='6674' column='1'/>\r
+    <function-decl name='PyUnstable_Long_IsCompact' mangled-name='PyUnstable_Long_IsCompact' filepath='Objects/longobject.c' line='6667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnstable_Long_IsCompact'>\r
+      <parameter type-id='type-id-451' name='op' filepath='Objects/longobject.c' line='6667' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnstable_Long_CompactValue' mangled-name='PyUnstable_Long_CompactValue' filepath='Objects/longobject.c' line='6681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnstable_Long_CompactValue'>\r
-      <parameter type-id='type-id-451' name='op' filepath='Objects/longobject.c' line='6681' column='1'/>\r
+    <function-decl name='PyUnstable_Long_CompactValue' mangled-name='PyUnstable_Long_CompactValue' filepath='Objects/longobject.c' line='6674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnstable_Long_CompactValue'>\r
+      <parameter type-id='type-id-451' name='op' filepath='Objects/longobject.c' line='6674' column='1'/>\r
       <return type-id='type-id-7'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromInt32' mangled-name='PyLong_FromInt32' filepath='Objects/longobject.c' line='6686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromInt32'>\r
-      <parameter type-id='type-id-456' name='value' filepath='Objects/longobject.c' line='6686' column='1'/>\r
+    <function-decl name='PyLong_FromInt32' mangled-name='PyLong_FromInt32' filepath='Objects/longobject.c' line='6679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromInt32'>\r
+      <parameter type-id='type-id-456' name='value' filepath='Objects/longobject.c' line='6679' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromUInt32' mangled-name='PyLong_FromUInt32' filepath='Objects/longobject.c' line='6691' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUInt32'>\r
-      <parameter type-id='type-id-322' name='value' filepath='Objects/longobject.c' line='6691' column='1'/>\r
+    <function-decl name='PyLong_FromUInt32' mangled-name='PyLong_FromUInt32' filepath='Objects/longobject.c' line='6684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUInt32'>\r
+      <parameter type-id='type-id-322' name='value' filepath='Objects/longobject.c' line='6684' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromInt64' mangled-name='PyLong_FromInt64' filepath='Objects/longobject.c' line='6696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromInt64'>\r
-      <parameter type-id='type-id-409' name='value' filepath='Objects/longobject.c' line='6696' column='1'/>\r
+    <function-decl name='PyLong_FromInt64' mangled-name='PyLong_FromInt64' filepath='Objects/longobject.c' line='6689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromInt64'>\r
+      <parameter type-id='type-id-409' name='value' filepath='Objects/longobject.c' line='6689' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FromUInt64' mangled-name='PyLong_FromUInt64' filepath='Objects/longobject.c' line='6701' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUInt64'>\r
-      <parameter type-id='type-id-111' name='value' filepath='Objects/longobject.c' line='6701' column='1'/>\r
+    <function-decl name='PyLong_FromUInt64' mangled-name='PyLong_FromUInt64' filepath='Objects/longobject.c' line='6694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FromUInt64'>\r
+      <parameter type-id='type-id-111' name='value' filepath='Objects/longobject.c' line='6694' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsInt32' mangled-name='PyLong_AsInt32' filepath='Objects/longobject.c' line='6722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsInt32'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6722' column='1'/>\r
-      <parameter type-id='type-id-457' name='value' filepath='Objects/longobject.c' line='6722' column='1'/>\r
+    <function-decl name='PyLong_AsInt32' mangled-name='PyLong_AsInt32' filepath='Objects/longobject.c' line='6715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsInt32'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6715' column='1'/>\r
+      <parameter type-id='type-id-457' name='value' filepath='Objects/longobject.c' line='6715' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsInt64' mangled-name='PyLong_AsInt64' filepath='Objects/longobject.c' line='6727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsInt64'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6727' column='1'/>\r
-      <parameter type-id='type-id-458' name='value' filepath='Objects/longobject.c' line='6727' column='1'/>\r
+    <function-decl name='PyLong_AsInt64' mangled-name='PyLong_AsInt64' filepath='Objects/longobject.c' line='6720' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsInt64'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6720' column='1'/>\r
+      <parameter type-id='type-id-458' name='value' filepath='Objects/longobject.c' line='6720' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsUInt32' mangled-name='PyLong_AsUInt32' filepath='Objects/longobject.c' line='6750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUInt32'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6750' column='1'/>\r
-      <parameter type-id='type-id-459' name='value' filepath='Objects/longobject.c' line='6750' column='1'/>\r
+    <function-decl name='PyLong_AsUInt32' mangled-name='PyLong_AsUInt32' filepath='Objects/longobject.c' line='6743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUInt32'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6743' column='1'/>\r
+      <parameter type-id='type-id-459' name='value' filepath='Objects/longobject.c' line='6743' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_AsUInt64' mangled-name='PyLong_AsUInt64' filepath='Objects/longobject.c' line='6755' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUInt64'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6755' column='1'/>\r
-      <parameter type-id='type-id-460' name='value' filepath='Objects/longobject.c' line='6755' column='1'/>\r
+    <function-decl name='PyLong_AsUInt64' mangled-name='PyLong_AsUInt64' filepath='Objects/longobject.c' line='6748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_AsUInt64'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6748' column='1'/>\r
+      <parameter type-id='type-id-460' name='value' filepath='Objects/longobject.c' line='6748' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_GetNativeLayout' mangled-name='PyLong_GetNativeLayout' filepath='Objects/longobject.c' line='6770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_GetNativeLayout'>\r
+    <function-decl name='PyLong_GetNativeLayout' mangled-name='PyLong_GetNativeLayout' filepath='Objects/longobject.c' line='6763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_GetNativeLayout'>\r
       <return type-id='type-id-449'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_Export' mangled-name='PyLong_Export' filepath='Objects/longobject.c' line='6777' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_Export'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6777' column='1'/>\r
-      <parameter type-id='type-id-446' name='export_long' filepath='Objects/longobject.c' line='6777' column='1'/>\r
+    <function-decl name='PyLong_Export' mangled-name='PyLong_Export' filepath='Objects/longobject.c' line='6770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_Export'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Objects/longobject.c' line='6770' column='1'/>\r
+      <parameter type-id='type-id-446' name='export_long' filepath='Objects/longobject.c' line='6770' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyLong_FreeExport' mangled-name='PyLong_FreeExport' filepath='Objects/longobject.c' line='6820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FreeExport'>\r
-      <parameter type-id='type-id-446' name='export_long' filepath='Objects/longobject.c' line='6820' column='1'/>\r
+    <function-decl name='PyLong_FreeExport' mangled-name='PyLong_FreeExport' filepath='Objects/longobject.c' line='6813' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLong_FreeExport'>\r
+      <parameter type-id='type-id-446' name='export_long' filepath='Objects/longobject.c' line='6813' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='PyLongWriter_Create' mangled-name='PyLongWriter_Create' filepath='Objects/longobject.c' line='6833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Create'>\r
-      <parameter type-id='type-id-5' name='negative' filepath='Objects/longobject.c' line='6833' column='1'/>\r
-      <parameter type-id='type-id-7' name='ndigits' filepath='Objects/longobject.c' line='6833' column='1'/>\r
-      <parameter type-id='type-id-267' name='digits' filepath='Objects/longobject.c' line='6833' column='1'/>\r
+    <function-decl name='PyLongWriter_Create' mangled-name='PyLongWriter_Create' filepath='Objects/longobject.c' line='6826' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Create'>\r
+      <parameter type-id='type-id-5' name='negative' filepath='Objects/longobject.c' line='6826' column='1'/>\r
+      <parameter type-id='type-id-7' name='ndigits' filepath='Objects/longobject.c' line='6826' column='1'/>\r
+      <parameter type-id='type-id-267' name='digits' filepath='Objects/longobject.c' line='6826' column='1'/>\r
       <return type-id='type-id-447'/>\r
     </function-decl>\r
-    <function-decl name='PyLongWriter_Discard' mangled-name='PyLongWriter_Discard' filepath='Objects/longobject.c' line='6859' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Discard'>\r
-      <parameter type-id='type-id-447' name='writer' filepath='Objects/longobject.c' line='6859' column='1'/>\r
+    <function-decl name='PyLongWriter_Discard' mangled-name='PyLongWriter_Discard' filepath='Objects/longobject.c' line='6852' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Discard'>\r
+      <parameter type-id='type-id-447' name='writer' filepath='Objects/longobject.c' line='6852' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='PyLongWriter_Finish' mangled-name='PyLongWriter_Finish' filepath='Objects/longobject.c' line='6872' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Finish'>\r
-      <parameter type-id='type-id-447' name='writer' filepath='Objects/longobject.c' line='6872' column='1'/>\r
+    <function-decl name='PyLongWriter_Finish' mangled-name='PyLongWriter_Finish' filepath='Objects/longobject.c' line='6865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyLongWriter_Finish'>\r
+      <parameter type-id='type-id-447' name='writer' filepath='Objects/longobject.c' line='6865' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
   </abi-instr>\r
@@ -9408,7 +9416,7 @@
       <return type-id='type-id-6'/>\r
     </function-decl>\r
     <var-decl name='_Py_NoneStruct' type-id='type-id-390' mangled-name='_Py_NoneStruct' visibility='default' filepath='./Include/object.h' line='645' column='1' elf-symbol-id='_Py_NoneStruct'/>\r
-    <var-decl name='_Py_NotImplementedStruct' type-id='type-id-390' mangled-name='_Py_NotImplementedStruct' visibility='default' filepath='./Include/object.h' line='664' column='1' elf-symbol-id='_Py_NotImplementedStruct'/>\r
+    <var-decl name='_Py_NotImplementedStruct' type-id='type-id-390' mangled-name='_Py_NotImplementedStruct' visibility='default' filepath='./Include/object.h' line='669' column='1' elf-symbol-id='_Py_NotImplementedStruct'/>\r
     <function-decl name='PyThreadState_GetDict' mangled-name='PyThreadState_GetDict' filepath='./Include/pystate.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_GetDict'>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
@@ -10664,6 +10672,12 @@
     <typedef-decl name='PyType_Spec' type-id='type-id-586' filepath='./Include/object.h' line='385' column='1' id='type-id-16'/>\r
     <pointer-type-def type-id='type-id-584' size-in-bits='64' id='type-id-587'/>\r
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-588'/>\r
+    <function-decl name='PyUnicodeWriter_WriteUTF8' mangled-name='PyUnicodeWriter_WriteUTF8' filepath='./Include/cpython/unicodeobject.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteUTF8'>\r
+      <parameter type-id='type-id-415'/>\r
+      <parameter type-id='type-id-4'/>\r
+      <parameter type-id='type-id-7'/>\r
+      <return type-id='type-id-5'/>\r
+    </function-decl>\r
     <function-decl name='_PyType_HasSubclasses' filepath='./Include/internal/pycore_typeobject.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-1'/>\r
       <return type-id='type-id-5'/>\r
@@ -11168,43 +11182,43 @@
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsLowercase' mangled-name='_PyUnicode_IsLowercase' filepath='./Include/cpython/unicodeobject.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsLowercase'>\r
+    <function-decl name='_PyUnicode_IsLowercase' mangled-name='_PyUnicode_IsLowercase' filepath='./Include/cpython/unicodeobject.h' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsLowercase'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsUppercase' mangled-name='_PyUnicode_IsUppercase' filepath='./Include/cpython/unicodeobject.h' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsUppercase'>\r
+    <function-decl name='_PyUnicode_IsUppercase' mangled-name='_PyUnicode_IsUppercase' filepath='./Include/cpython/unicodeobject.h' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsUppercase'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsTitlecase' mangled-name='_PyUnicode_IsTitlecase' filepath='./Include/cpython/unicodeobject.h' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsTitlecase'>\r
+    <function-decl name='_PyUnicode_IsTitlecase' mangled-name='_PyUnicode_IsTitlecase' filepath='./Include/cpython/unicodeobject.h' line='671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsTitlecase'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsLinebreak' mangled-name='_PyUnicode_IsLinebreak' filepath='./Include/cpython/unicodeobject.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsLinebreak'>\r
+    <function-decl name='_PyUnicode_IsLinebreak' mangled-name='_PyUnicode_IsLinebreak' filepath='./Include/cpython/unicodeobject.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsLinebreak'>\r
       <parameter type-id='type-id-613'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_ToDecimalDigit' mangled-name='_PyUnicode_ToDecimalDigit' filepath='./Include/cpython/unicodeobject.h' line='691' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_ToDecimalDigit'>\r
+    <function-decl name='_PyUnicode_ToDecimalDigit' mangled-name='_PyUnicode_ToDecimalDigit' filepath='./Include/cpython/unicodeobject.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_ToDecimalDigit'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsDecimalDigit' mangled-name='_PyUnicode_IsDecimalDigit' filepath='./Include/cpython/unicodeobject.h' line='703' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsDecimalDigit'>\r
+    <function-decl name='_PyUnicode_IsDecimalDigit' mangled-name='_PyUnicode_IsDecimalDigit' filepath='./Include/cpython/unicodeobject.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsDecimalDigit'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsDigit' mangled-name='_PyUnicode_IsDigit' filepath='./Include/cpython/unicodeobject.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsDigit'>\r
+    <function-decl name='_PyUnicode_IsDigit' mangled-name='_PyUnicode_IsDigit' filepath='./Include/cpython/unicodeobject.h' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsDigit'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsNumeric' mangled-name='_PyUnicode_IsNumeric' filepath='./Include/cpython/unicodeobject.h' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsNumeric'>\r
+    <function-decl name='_PyUnicode_IsNumeric' mangled-name='_PyUnicode_IsNumeric' filepath='./Include/cpython/unicodeobject.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsNumeric'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsAlpha' mangled-name='_PyUnicode_IsAlpha' filepath='./Include/cpython/unicodeobject.h' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsAlpha'>\r
+    <function-decl name='_PyUnicode_IsAlpha' mangled-name='_PyUnicode_IsAlpha' filepath='./Include/cpython/unicodeobject.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsAlpha'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <var-decl name='_Py_ascii_whitespace' type-id='type-id-605' mangled-name='_Py_ascii_whitespace' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='724' column='1' elf-symbol-id='_Py_ascii_whitespace'/>\r
+    <var-decl name='_Py_ascii_whitespace' type-id='type-id-605' mangled-name='_Py_ascii_whitespace' visibility='default' filepath='./Include/cpython/unicodeobject.h' line='728' column='1' elf-symbol-id='_Py_ascii_whitespace'/>\r
     <function-decl name='_PyCodec_InitRegistry' filepath='./Include/internal/pycore_codecs.h' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-33'/>\r
       <return type-id='type-id-66'/>\r
@@ -11775,51 +11789,51 @@
       <parameter type-id='type-id-7' name='len' filepath='Objects/unicodeobject.c' line='14053' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicodeWriter_DecodeUTF8Stateful' mangled-name='PyUnicodeWriter_DecodeUTF8Stateful' filepath='Objects/unicodeobject.c' line='14132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_DecodeUTF8Stateful'>\r
-      <parameter type-id='type-id-415' name='writer' filepath='Objects/unicodeobject.c' line='14132' column='1'/>\r
-      <parameter type-id='type-id-4' name='string' filepath='Objects/unicodeobject.c' line='14133' column='1'/>\r
-      <parameter type-id='type-id-7' name='length' filepath='Objects/unicodeobject.c' line='14134' column='1'/>\r
-      <parameter type-id='type-id-4' name='errors' filepath='Objects/unicodeobject.c' line='14135' column='1'/>\r
-      <parameter type-id='type-id-8' name='consumed' filepath='Objects/unicodeobject.c' line='14136' column='1'/>\r
+    <function-decl name='PyUnicodeWriter_DecodeUTF8Stateful' mangled-name='PyUnicodeWriter_DecodeUTF8Stateful' filepath='Objects/unicodeobject.c' line='14146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_DecodeUTF8Stateful'>\r
+      <parameter type-id='type-id-415' name='writer' filepath='Objects/unicodeobject.c' line='14146' column='1'/>\r
+      <parameter type-id='type-id-4' name='string' filepath='Objects/unicodeobject.c' line='14147' column='1'/>\r
+      <parameter type-id='type-id-7' name='length' filepath='Objects/unicodeobject.c' line='14148' column='1'/>\r
+      <parameter type-id='type-id-4' name='errors' filepath='Objects/unicodeobject.c' line='14149' column='1'/>\r
+      <parameter type-id='type-id-8' name='consumed' filepath='Objects/unicodeobject.c' line='14150' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicodeWriter_WriteLatin1String' mangled-name='_PyUnicodeWriter_WriteLatin1String' filepath='Objects/unicodeobject.c' line='14157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_WriteLatin1String'>\r
-      <parameter type-id='type-id-379' name='writer' filepath='Objects/unicodeobject.c' line='14157' column='1'/>\r
-      <parameter type-id='type-id-4' name='str' filepath='Objects/unicodeobject.c' line='14158' column='1'/>\r
-      <parameter type-id='type-id-7' name='len' filepath='Objects/unicodeobject.c' line='14158' column='1'/>\r
+    <function-decl name='_PyUnicodeWriter_WriteLatin1String' mangled-name='_PyUnicodeWriter_WriteLatin1String' filepath='Objects/unicodeobject.c' line='14171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicodeWriter_WriteLatin1String'>\r
+      <parameter type-id='type-id-379' name='writer' filepath='Objects/unicodeobject.c' line='14171' column='1'/>\r
+      <parameter type-id='type-id-4' name='str' filepath='Objects/unicodeobject.c' line='14172' column='1'/>\r
+      <parameter type-id='type-id-7' name='len' filepath='Objects/unicodeobject.c' line='14172' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_Format' mangled-name='PyUnicode_Format' filepath='Objects/unicodeobject.c' line='15479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_Format'>\r
-      <parameter type-id='type-id-6' name='format' filepath='Objects/unicodeobject.c' line='15479' column='1'/>\r
-      <parameter type-id='type-id-6' name='args' filepath='Objects/unicodeobject.c' line='15479' column='1'/>\r
+    <function-decl name='PyUnicode_Format' mangled-name='PyUnicode_Format' filepath='Objects/unicodeobject.c' line='15493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_Format'>\r
+      <parameter type-id='type-id-6' name='format' filepath='Objects/unicodeobject.c' line='15493' column='1'/>\r
+      <parameter type-id='type-id-6' name='args' filepath='Objects/unicodeobject.c' line='15493' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_ExactDealloc' mangled-name='_PyUnicode_ExactDealloc' filepath='Objects/unicodeobject.c' line='15733' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_ExactDealloc'>\r
-      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='15733' column='1'/>\r
+    <function-decl name='_PyUnicode_ExactDealloc' mangled-name='_PyUnicode_ExactDealloc' filepath='Objects/unicodeobject.c' line='15747' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_ExactDealloc'>\r
+      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='15747' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_InternInPlace' mangled-name='_PyUnicode_InternInPlace' filepath='Objects/unicodeobject.c' line='16087' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_InternInPlace'>\r
-      <parameter type-id='type-id-33' name='interp' filepath='Objects/unicodeobject.c' line='16087' column='1'/>\r
-      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16087' column='1'/>\r
+    <function-decl name='_PyUnicode_InternInPlace' mangled-name='_PyUnicode_InternInPlace' filepath='Objects/unicodeobject.c' line='16101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_InternInPlace'>\r
+      <parameter type-id='type-id-33' name='interp' filepath='Objects/unicodeobject.c' line='16101' column='1'/>\r
+      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16101' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_InternInPlace' mangled-name='PyUnicode_InternInPlace' filepath='Objects/unicodeobject.c' line='16094' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_InternInPlace'>\r
-      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16094' column='1'/>\r
+    <function-decl name='PyUnicode_InternInPlace' mangled-name='PyUnicode_InternInPlace' filepath='Objects/unicodeobject.c' line='16108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_InternInPlace'>\r
+      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16108' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_InternImmortal' mangled-name='PyUnicode_InternImmortal' filepath='Objects/unicodeobject.c' line='16103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_InternImmortal'>\r
-      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16103' column='1'/>\r
+    <function-decl name='PyUnicode_InternImmortal' mangled-name='PyUnicode_InternImmortal' filepath='Objects/unicodeobject.c' line='16117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_InternImmortal'>\r
+      <parameter type-id='type-id-241' name='p' filepath='Objects/unicodeobject.c' line='16117' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='PyInit__string' mangled-name='PyInit__string' filepath='Objects/unicodeobject.c' line='16690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInit__string'>\r
+    <function-decl name='PyInit__string' mangled-name='PyInit__string' filepath='Objects/unicodeobject.c' line='16704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInit__string'>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_KIND' mangled-name='PyUnicode_KIND' filepath='Objects/unicodeobject.c' line='16697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_KIND'>\r
-      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='16697' column='1'/>\r
+    <function-decl name='PyUnicode_KIND' mangled-name='PyUnicode_KIND' filepath='Objects/unicodeobject.c' line='16711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_KIND'>\r
+      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='16711' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_DATA' mangled-name='PyUnicode_DATA' filepath='Objects/unicodeobject.c' line='16707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_DATA'>\r
-      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='16707' column='1'/>\r
+    <function-decl name='PyUnicode_DATA' mangled-name='PyUnicode_DATA' filepath='Objects/unicodeobject.c' line='16721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_DATA'>\r
+      <parameter type-id='type-id-6' name='op' filepath='Objects/unicodeobject.c' line='16721' column='1'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='./Include/cpython/initconfig.h' line='11' column='1' id='type-id-607'>\r
@@ -12742,12 +12756,12 @@
       <parameter type-id='type-id-415'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicodeWriter_WriteStr' mangled-name='PyUnicodeWriter_WriteStr' filepath='./Include/cpython/unicodeobject.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteStr'>\r
+    <function-decl name='PyUnicodeWriter_WriteStr' mangled-name='PyUnicodeWriter_WriteStr' filepath='./Include/cpython/unicodeobject.h' line='494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicodeWriter_WriteStr'>\r
       <parameter type-id='type-id-415'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsWhitespace' mangled-name='_PyUnicode_IsWhitespace' filepath='./Include/cpython/unicodeobject.h' line='671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsWhitespace'>\r
+    <function-decl name='_PyUnicode_IsWhitespace' mangled-name='_PyUnicode_IsWhitespace' filepath='./Include/cpython/unicodeobject.h' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsWhitespace'>\r
       <parameter type-id='type-id-613'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
@@ -13010,7 +13024,7 @@
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-17'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_new_identifier' filepath='Parser/pegen.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_new_identifier' filepath='Parser/pegen.h' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-6'/>\r
@@ -13040,7 +13054,7 @@
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyUnicode_IsPrintable' mangled-name='_PyUnicode_IsPrintable' filepath='./Include/cpython/unicodeobject.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsPrintable'>\r
+    <function-decl name='_PyUnicode_IsPrintable' mangled-name='_PyUnicode_IsPrintable' filepath='./Include/cpython/unicodeobject.h' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyUnicode_IsPrintable'>\r
       <parameter type-id='type-id-305'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
@@ -13293,13 +13307,13 @@
       </data-member>\r
     </class-decl>\r
     <typedef-decl name='ResultTokenWithMetadata' type-id='type-id-779' filepath='Parser/pegen.h' line='136' column='1' id='type-id-778'/>\r
-    <enum-decl name='TARGETS_TYPE' naming-typedef-id='type-id-780' filepath='Parser/pegen.h' line='170' column='1' id='type-id-781'>\r
+    <enum-decl name='TARGETS_TYPE' naming-typedef-id='type-id-780' filepath='Parser/pegen.h' line='171' column='1' id='type-id-781'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='STAR_TARGETS' value='0'/>\r
       <enumerator name='DEL_TARGETS' value='1'/>\r
       <enumerator name='FOR_TARGETS' value='2'/>\r
     </enum-decl>\r
-    <typedef-decl name='TARGETS_TYPE' type-id='type-id-781' filepath='Parser/pegen.h' line='174' column='1' id='type-id-780'/>\r
+    <typedef-decl name='TARGETS_TYPE' type-id='type-id-781' filepath='Parser/pegen.h' line='175' column='1' id='type-id-780'/>\r
     <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-782'/>\r
     <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-783'/>\r
     <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-784'/>\r
@@ -13927,138 +13941,138 @@
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_lookahead_with_name' filepath='Parser/pegen.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_lookahead' filepath='Parser/pegen.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+      <parameter type-id='type-id-5'/>\r
+      <parameter type-id='type-id-798'/>\r
+      <parameter type-id='type-id-748'/>\r
+      <return type-id='type-id-5'/>\r
+    </function-decl>\r
+    <function-decl name='_PyPegen_lookahead_for_expr' filepath='Parser/pegen.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-794'/>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_lookahead_with_int' filepath='Parser/pegen.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_lookahead_with_int' filepath='Parser/pegen.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-792'/>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_lookahead_with_string' filepath='Parser/pegen.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_lookahead_with_string' filepath='Parser/pegen.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-796'/>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_lookahead' filepath='Parser/pegen.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-5'/>\r
-      <parameter type-id='type-id-798'/>\r
-      <parameter type-id='type-id-748'/>\r
-      <return type-id='type-id-5'/>\r
-    </function-decl>\r
-    <function-decl name='_PyPegen_expect_token' filepath='Parser/pegen.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_expect_token' filepath='Parser/pegen.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-749'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_expect_forced_token' filepath='Parser/pegen.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_expect_forced_token' filepath='Parser/pegen.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-749'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_expect_soft_keyword' filepath='Parser/pegen.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_expect_soft_keyword' filepath='Parser/pegen.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_soft_keyword_token' filepath='Parser/pegen.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_soft_keyword_token' filepath='Parser/pegen.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_last_nonnwhitespace_token' filepath='Parser/pegen.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_last_nonnwhitespace_token' filepath='Parser/pegen.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-749'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_name_token' filepath='Parser/pegen.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_name_token' filepath='Parser/pegen.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_number_token' filepath='Parser/pegen.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_number_token' filepath='Parser/pegen.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_string_token' filepath='Parser/pegen.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_string_token' filepath='Parser/pegen.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_Pypegen_stack_overflow' filepath='Parser/pegen.h' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_Pypegen_stack_overflow' filepath='Parser/pegen.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_invalid_target' filepath='Parser/pegen.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_invalid_target' filepath='Parser/pegen.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-780'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_expr_name' filepath='Parser/pegen.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_expr_name' filepath='Parser/pegen.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-4'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_dummy_name' filepath='Parser/pegen.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_dummy_name' filepath='Parser/pegen.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter is-variadic='yes'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_last_item' filepath='Parser/pegen.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_last_item' filepath='Parser/pegen.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_first_item' filepath='Parser/pegen.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_first_item' filepath='Parser/pegen.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_new_type_comment' filepath='Parser/pegen.h' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_new_type_comment' filepath='Parser/pegen.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_add_type_comment_to_arg' filepath='Parser/pegen.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_add_type_comment_to_arg' filepath='Parser/pegen.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-747'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-747'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_singleton_seq' filepath='Parser/pegen.h' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_singleton_seq' filepath='Parser/pegen.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-771'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_insert_in_front' filepath='Parser/pegen.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_insert_in_front' filepath='Parser/pegen.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-771'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_append_to_end' filepath='Parser/pegen.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_append_to_end' filepath='Parser/pegen.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-771'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_flatten' filepath='Parser/pegen.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_flatten' filepath='Parser/pegen.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-771'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_join_names_with_dot' filepath='Parser/pegen.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_join_names_with_dot' filepath='Parser/pegen.h' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_count_dots' filepath='Parser/pegen.h' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_count_dots' filepath='Parser/pegen.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_alias_for_star' filepath='Parser/pegen.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_alias_for_star' filepath='Parser/pegen.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-5'/>\r
@@ -14067,86 +14081,86 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-623'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_map_names_to_ids' filepath='Parser/pegen.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_map_names_to_ids' filepath='Parser/pegen.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-682'/>\r
       <return type-id='type-id-714'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_cmpop_expr_pair' filepath='Parser/pegen.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_cmpop_expr_pair' filepath='Parser/pegen.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-760'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-783'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_cmpops' filepath='Parser/pegen.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_cmpops' filepath='Parser/pegen.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-744'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_exprs' filepath='Parser/pegen.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_exprs' filepath='Parser/pegen.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-682'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_set_expr_context' filepath='Parser/pegen.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_set_expr_context' filepath='Parser/pegen.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-746'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_key_value_pair' filepath='Parser/pegen.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_key_value_pair' filepath='Parser/pegen.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-785'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_keys' filepath='Parser/pegen.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_keys' filepath='Parser/pegen.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-682'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_values' filepath='Parser/pegen.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_values' filepath='Parser/pegen.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-682'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_key_pattern_pair' filepath='Parser/pegen.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_key_pattern_pair' filepath='Parser/pegen.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-630'/>\r
       <return type-id='type-id-784'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_pattern_keys' filepath='Parser/pegen.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_pattern_keys' filepath='Parser/pegen.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-682'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_patterns' filepath='Parser/pegen.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_patterns' filepath='Parser/pegen.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-732'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_name_default_pair' filepath='Parser/pegen.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_name_default_pair' filepath='Parser/pegen.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-747'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-787'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_slash_with_default' filepath='Parser/pegen.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_slash_with_default' filepath='Parser/pegen.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-745'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-789'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_star_etc' filepath='Parser/pegen.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_star_etc' filepath='Parser/pegen.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-747'/>\r
       <parameter type-id='type-id-771'/>\r
       <parameter type-id='type-id-747'/>\r
       <return type-id='type-id-790'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_make_arguments' filepath='Parser/pegen.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_make_arguments' filepath='Parser/pegen.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-745'/>\r
       <parameter type-id='type-id-789'/>\r
@@ -14155,25 +14169,25 @@
       <parameter type-id='type-id-790'/>\r
       <return type-id='type-id-705'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_empty_arguments' filepath='Parser/pegen.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_empty_arguments' filepath='Parser/pegen.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-705'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_template_str' filepath='Parser/pegen.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_template_str' filepath='Parser/pegen.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_joined_str' filepath='Parser/pegen.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_joined_str' filepath='Parser/pegen.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_interpolation' filepath='Parser/pegen.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_interpolation' filepath='Parser/pegen.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-749'/>\r
@@ -14187,7 +14201,7 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_formatted_value' filepath='Parser/pegen.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_formatted_value' filepath='Parser/pegen.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-749'/>\r
@@ -14201,40 +14215,40 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_augoperator' filepath='Parser/pegen.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_augoperator' filepath='Parser/pegen.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-709'/>\r
       <return type-id='type-id-782'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_function_def_decorators' filepath='Parser/pegen.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_function_def_decorators' filepath='Parser/pegen.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-632'/>\r
       <return type-id='type-id-632'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_class_def_decorators' filepath='Parser/pegen.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_class_def_decorators' filepath='Parser/pegen.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-632'/>\r
       <return type-id='type-id-632'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_keyword_or_starred' filepath='Parser/pegen.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_keyword_or_starred' filepath='Parser/pegen.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-786'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_extract_starred_exprs' filepath='Parser/pegen.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_extract_starred_exprs' filepath='Parser/pegen.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-682'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_seq_delete_starred_exprs' filepath='Parser/pegen.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_seq_delete_starred_exprs' filepath='Parser/pegen.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-708'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_collect_call_seqs' filepath='Parser/pegen.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_collect_call_seqs' filepath='Parser/pegen.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-771'/>\r
@@ -14245,22 +14259,22 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_constant_from_token' filepath='Parser/pegen.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_constant_from_token' filepath='Parser/pegen.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_decoded_constant_from_token' filepath='Parser/pegen.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_decoded_constant_from_token' filepath='Parser/pegen.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_constant_from_string' filepath='Parser/pegen.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_constant_from_string' filepath='Parser/pegen.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_concatenate_strings' filepath='Parser/pegen.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_concatenate_strings' filepath='Parser/pegen.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-682'/>\r
       <parameter type-id='type-id-5'/>\r
@@ -14270,39 +14284,39 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_ensure_imaginary' filepath='Parser/pegen.h' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_ensure_imaginary' filepath='Parser/pegen.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_ensure_real' filepath='Parser/pegen.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_ensure_real' filepath='Parser/pegen.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_join_sequences' filepath='Parser/pegen.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_join_sequences' filepath='Parser/pegen.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-771'/>\r
       <parameter type-id='type-id-771'/>\r
       <return type-id='type-id-771'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_check_barry_as_flufl' filepath='Parser/pegen.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_check_barry_as_flufl' filepath='Parser/pegen.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_check_legacy_stmt' filepath='Parser/pegen.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_check_legacy_stmt' filepath='Parser/pegen.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_check_fstring_conversion' filepath='Parser/pegen.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_check_fstring_conversion' filepath='Parser/pegen.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-788'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_setup_full_format_spec' filepath='Parser/pegen.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_setup_full_format_spec' filepath='Parser/pegen.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <parameter type-id='type-id-682'/>\r
@@ -14313,27 +14327,27 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-788'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_make_module' filepath='Parser/pegen.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_make_module' filepath='Parser/pegen.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-679'/>\r
       <return type-id='type-id-647'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_arguments_parsing_error' filepath='Parser/pegen.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_arguments_parsing_error' filepath='Parser/pegen.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_get_last_comprehension_item' filepath='Parser/pegen.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_get_last_comprehension_item' filepath='Parser/pegen.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-802'/>\r
       <return type-id='type-id-681'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_nonparen_genexp_in_call' filepath='Parser/pegen.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_nonparen_genexp_in_call' filepath='Parser/pegen.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-681'/>\r
       <parameter type-id='type-id-801'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_checked_future_import' filepath='Parser/pegen.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_checked_future_import' filepath='Parser/pegen.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-704'/>\r
       <parameter type-id='type-id-713'/>\r
@@ -14345,12 +14359,12 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-632'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_register_stmts' filepath='Parser/pegen.h' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_register_stmts' filepath='Parser/pegen.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-679'/>\r
       <return type-id='type-id-679'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_interactive_exit' filepath='Parser/pegen.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_interactive_exit' filepath='Parser/pegen.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-679'/>\r
     </function-decl>\r
@@ -14390,7 +14404,7 @@
       <parameter is-variadic='yes'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_run_parser_from_file_pointer' filepath='Parser/pegen.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_run_parser_from_file_pointer' filepath='Parser/pegen.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-61'/>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-6'/>\r
@@ -14403,7 +14417,7 @@
       <parameter type-id='type-id-743'/>\r
       <return type-id='type-id-647'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_run_parser_from_string' filepath='Parser/pegen.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_run_parser_from_string' filepath='Parser/pegen.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-4'/>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-6'/>\r
@@ -22601,13 +22615,13 @@
     <typedef-decl name='newfunc' type-id='type-id-1404' filepath='./Include/object.h' line='366' column='1' id='type-id-1027'/>\r
     <typedef-decl name='allocfunc' type-id='type-id-1405' filepath='./Include/object.h' line='367' column='1' id='type-id-1026'/>\r
     <typedef-decl name='vectorcallfunc' type-id='type-id-1406' filepath='./Include/object.h' line='370' column='1' id='type-id-313'/>\r
-    <enum-decl name='PySendResult' naming-typedef-id='type-id-269' filepath='./Include/object.h' line='685' column='1' id='type-id-1407'>\r
+    <enum-decl name='PySendResult' naming-typedef-id='type-id-269' filepath='./Include/object.h' line='690' column='1' id='type-id-1407'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='PYGEN_RETURN' value='0'/>\r
       <enumerator name='PYGEN_ERROR' value='-1'/>\r
       <enumerator name='PYGEN_NEXT' value='1'/>\r
     </enum-decl>\r
-    <typedef-decl name='PySendResult' type-id='type-id-1407' filepath='./Include/object.h' line='689' column='1' id='type-id-269'/>\r
+    <typedef-decl name='PySendResult' type-id='type-id-1407' filepath='./Include/object.h' line='694' column='1' id='type-id-269'/>\r
     <class-decl name='Py_buffer' size-in-bits='640' is-struct='yes' naming-typedef-id='type-id-260' visibility='default' filepath='./Include/pybuffer.h' line='20' column='1' id='type-id-1408'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='buf' type-id='type-id-35' visibility='default' filepath='./Include/pybuffer.h' line='21' column='1'/>\r
@@ -23656,7 +23670,7 @@
     <class-decl name='_Py_AuditHookEntry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-870'/>\r
     <class-decl name='_arena' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-872'/>\r
     <class-decl name='code_arena_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-873'/>\r
-    <function-decl name='PyObject_Vectorcall' mangled-name='PyObject_Vectorcall' filepath='./Include/abstract.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_Vectorcall'>\r
+    <function-decl name='PyObject_Vectorcall' mangled-name='PyObject_Vectorcall' filepath='./Include/abstract.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_Vectorcall'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-265'/>\r
       <parameter type-id='type-id-21'/>\r
@@ -23691,7 +23705,7 @@
       <parameter type-id='type-id-1'/>\r
       <return type-id='type-id-4'/>\r
     </function-decl>\r
-    <function-decl name='PyUnicode_AsUTF8' mangled-name='PyUnicode_AsUTF8' filepath='./Include/cpython/unicodeobject.h' line='640' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_AsUTF8'>\r
+    <function-decl name='PyUnicode_AsUTF8' mangled-name='PyUnicode_AsUTF8' filepath='./Include/cpython/unicodeobject.h' line='644' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnicode_AsUTF8'>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-4'/>\r
     </function-decl>\r
@@ -23897,19 +23911,19 @@
       <parameter type-id='type-id-751'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_Pypegen_raise_decode_error' filepath='Parser/pegen.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_Pypegen_raise_decode_error' filepath='Parser/pegen.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_raise_tokenizer_init_error' filepath='Parser/pegen.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_raise_tokenizer_init_error' filepath='Parser/pegen.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_Pypegen_tokenizer_error' filepath='Parser/pegen.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_Pypegen_tokenizer_error' filepath='Parser/pegen.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_raise_error' filepath='Parser/pegen.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_raise_error' filepath='Parser/pegen.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-5'/>\r
@@ -23917,7 +23931,7 @@
       <parameter is-variadic='yes'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_raise_error_known_location' filepath='Parser/pegen.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_raise_error_known_location' filepath='Parser/pegen.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-7'/>\r
@@ -23928,12 +23942,12 @@
       <parameter type-id='type-id-306'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
-    <function-decl name='_Pypegen_set_syntax_error' filepath='Parser/pegen.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_Pypegen_set_syntax_error' filepath='Parser/pegen.h' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <parameter type-id='type-id-749'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_parse' filepath='Parser/pegen.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_parse' filepath='Parser/pegen.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
@@ -24274,11 +24288,11 @@
       <parameter type-id='type-id-306'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_fill_token' filepath='Parser/pegen.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_fill_token' filepath='Parser/pegen.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-748'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_byte_offset_to_character_offset' filepath='Parser/pegen.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_byte_offset_to_character_offset' filepath='Parser/pegen.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-7'/>\r
       <return type-id='type-id-7'/>\r
@@ -24364,11 +24378,11 @@
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1545'/>\r
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-62'/>\r
     <pointer-type-def type-id='type-id-1546' size-in-bits='64' id='type-id-1547'/>\r
-    <function-decl name='PyObject_CallNoArgs' mangled-name='PyObject_CallNoArgs' filepath='./Include/abstract.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallNoArgs'>\r
+    <function-decl name='PyObject_CallNoArgs' mangled-name='PyObject_CallNoArgs' filepath='./Include/abstract.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallNoArgs'>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='PyObject_CallFunction' mangled-name='PyObject_CallFunction' filepath='./Include/abstract.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallFunction'>\r
+    <function-decl name='PyObject_CallFunction' mangled-name='PyObject_CallFunction' filepath='./Include/abstract.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyObject_CallFunction'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-4'/>\r
       <parameter is-variadic='yes'/>\r
@@ -24578,13 +24592,13 @@
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_byte_offset_to_character_offset_line' filepath='Python/../Parser/pegen.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_byte_offset_to_character_offset_line' filepath='Python/../Parser/pegen.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-7'/>\r
       <parameter type-id='type-id-7'/>\r
       <return type-id='type-id-7'/>\r
     </function-decl>\r
-    <function-decl name='_PyPegen_byte_offset_to_character_offset_raw' filepath='Python/../Parser/pegen.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>\r
+    <function-decl name='_PyPegen_byte_offset_to_character_offset_raw' filepath='Python/../Parser/pegen.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-4'/>\r
       <parameter type-id='type-id-7'/>\r
       <return type-id='type-id-7'/>\r
@@ -26944,92 +26958,74 @@
       <enumerator name='_PyXI_ERR_NOT_SHAREABLE' value='-9'/>\r
     </enum-decl>\r
     <typedef-decl name='_PyXI_errcode' type-id='type-id-1673' filepath='./Include/internal/pycore_crossinterp.h' line='323' column='1' id='type-id-1674'/>\r
-    <class-decl name='_sharedexception' size-in-bits='512' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='326' column='1' id='type-id-1675'>\r
+    <typedef-decl name='_PyXI_failure' type-id='type-id-1675' filepath='./Include/internal/pycore_crossinterp.h' line='325' column='1' id='type-id-1676'/>\r
+    <typedef-decl name='_PyXI_session' type-id='type-id-1677' filepath='./Include/internal/pycore_crossinterp.h' line='351' column='1' id='type-id-1678'/>\r
+    <class-decl name='_PyXI_session_result' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1679' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='356' column='1' id='type-id-1680'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='interp' type-id='type-id-33' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='328' column='1'/>\r
+        <var-decl name='preserved' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='357' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='code' type-id='type-id-1674' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='330' column='1'/>\r
+        <var-decl name='excinfo' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='358' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='uncaught' type-id='type-id-1672' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='334' column='1'/>\r
+        <var-decl name='errcode' type-id='type-id-1674' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='359' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyXI_error' type-id='type-id-1675' filepath='./Include/internal/pycore_crossinterp.h' line='335' column='1' id='type-id-1676'/>\r
-    <typedef-decl name='_PyXI_session' type-id='type-id-1677' filepath='./Include/internal/pycore_crossinterp.h' line='350' column='1' id='type-id-1678'/>\r
-    <class-decl name='_PyXI_session_result' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1679' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='355' column='1' id='type-id-1680'>\r
+    <typedef-decl name='_PyXI_session_result' type-id='type-id-1680' filepath='./Include/internal/pycore_crossinterp.h' line='360' column='1' id='type-id-1679'/>\r
+    <class-decl name='xi_failure' size-in-bits='192' is-struct='yes' visibility='default' filepath='Python/crossinterp.c' line='1749' column='1' id='type-id-1675'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='preserved' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='356' column='1'/>\r
+        <var-decl name='code' type-id='type-id-1674' visibility='default' filepath='Python/crossinterp.c' line='1751' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='excinfo' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='357' column='1'/>\r
+        <var-decl name='msg' type-id='type-id-4' visibility='default' filepath='Python/crossinterp.c' line='1753' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='errcode' type-id='type-id-1674' visibility='default' filepath='./Include/internal/pycore_crossinterp.h' line='358' column='1'/>\r
+        <var-decl name='msg_owned' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='1754' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyXI_session_result' type-id='type-id-1680' filepath='./Include/internal/pycore_crossinterp.h' line='359' column='1' id='type-id-1679'/>\r
-    <class-decl name='xi_session_error' size-in-bits='704' is-struct='yes' visibility='default' filepath='Python/crossinterp.c' line='2247' column='1' id='type-id-1681'>\r
+    <class-decl name='xi_session' size-in-bits='384' is-struct='yes' visibility='default' filepath='Python/crossinterp.c' line='2463' column='1' id='type-id-1677'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='override' type-id='type-id-1682' visibility='default' filepath='Python/crossinterp.c' line='2250' column='1'/>\r
-      </data-member>\r
-      <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='info' type-id='type-id-1683' visibility='default' filepath='Python/crossinterp.c' line='2252' column='1'/>\r
-      </data-member>\r
-      <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='_info' type-id='type-id-1676' visibility='default' filepath='Python/crossinterp.c' line='2255' column='1'/>\r
-      </data-member>\r
-      <data-member access='public' layout-offset-in-bits='640'>\r
-        <var-decl name='_override' type-id='type-id-1674' visibility='default' filepath='Python/crossinterp.c' line='2256' column='1'/>\r
-      </data-member>\r
-    </class-decl>\r
-    <class-decl name='xi_session' size-in-bits='1088' is-struct='yes' visibility='default' filepath='Python/crossinterp.c' line='2259' column='1' id='type-id-1677'>\r
-      <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='status' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2262' column='1'/>\r
+        <var-decl name='status' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2466' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='32'>\r
-        <var-decl name='switched' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2263' column='1'/>\r
+        <var-decl name='switched' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2467' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='prev_tstate' type-id='type-id-31' visibility='default' filepath='Python/crossinterp.c' line='2269' column='1'/>\r
+        <var-decl name='prev_tstate' type-id='type-id-31' visibility='default' filepath='Python/crossinterp.c' line='2473' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='init_tstate' type-id='type-id-31' visibility='default' filepath='Python/crossinterp.c' line='2272' column='1'/>\r
+        <var-decl name='init_tstate' type-id='type-id-31' visibility='default' filepath='Python/crossinterp.c' line='2476' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='192'>\r
-        <var-decl name='own_init_tstate' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2274' column='1'/>\r
+        <var-decl name='own_init_tstate' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2478' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='224'>\r
-        <var-decl name='running' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2281' column='1'/>\r
+        <var-decl name='running' type-id='type-id-5' visibility='default' filepath='Python/crossinterp.c' line='2485' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='256'>\r
-        <var-decl name='main_ns' type-id='type-id-6' visibility='default' filepath='Python/crossinterp.c' line='2285' column='1'/>\r
+        <var-decl name='main_ns' type-id='type-id-6' visibility='default' filepath='Python/crossinterp.c' line='2489' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='320'>\r
-        <var-decl name='_preserved' type-id='type-id-6' visibility='default' filepath='Python/crossinterp.c' line='2290' column='1'/>\r
-      </data-member>\r
-      <data-member access='public' layout-offset-in-bits='384'>\r
-        <var-decl name='error' type-id='type-id-1681' visibility='default' filepath='Python/crossinterp.c' line='2292' column='1'/>\r
-      </data-member>\r
-    </class-decl>\r
-    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1684'/>\r
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1685'/>\r
-    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1686'/>\r
-    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1682'/>\r
-    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1683'/>\r
-    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-1687'/>\r
-    <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1688'/>\r
-    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1689'/>\r
-    <qualified-type-def type-id='type-id-1665' const='yes' id='type-id-1690'/>\r
-    <pointer-type-def type-id='type-id-1690' size-in-bits='64' id='type-id-1691'/>\r
+        <var-decl name='_preserved' type-id='type-id-6' visibility='default' filepath='Python/crossinterp.c' line='2494' column='1'/>\r
+      </data-member>\r
+    </class-decl>\r
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1681'/>\r
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1682'/>\r
+    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1683'/>\r
+    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-1684'/>\r
+    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1685'/>\r
+    <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1686'/>\r
+    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1687'/>\r
+    <qualified-type-def type-id='type-id-1665' const='yes' id='type-id-1688'/>\r
+    <pointer-type-def type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>\r
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-170'/>\r
     <function-decl name='PyStatus_Exception' mangled-name='PyStatus_Exception' filepath='./Include/cpython/initconfig.h' line='27' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyStatus_Exception'>\r
       <parameter type-id='type-id-66'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='Py_NewInterpreterFromConfig' mangled-name='Py_NewInterpreterFromConfig' filepath='./Include/cpython/pylifecycle.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_NewInterpreterFromConfig'>\r
-      <parameter type-id='type-id-1685'/>\r
-      <parameter type-id='type-id-1691'/>\r
+      <parameter type-id='type-id-1682'/>\r
+      <parameter type-id='type-id-1689'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='Py_CompileStringExFlags' mangled-name='Py_CompileStringExFlags' filepath='./Include/cpython/pythonrun.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_CompileStringExFlags'>\r
@@ -27241,79 +27237,97 @@
       <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp.c' line='1040' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_InitExcInfo' mangled-name='_PyXI_InitExcInfo' filepath='Python/crossinterp.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_InitExcInfo'>\r
-      <parameter type-id='type-id-1687' name='info' filepath='Python/crossinterp.c' line='1634' column='1'/>\r
-      <parameter type-id='type-id-6' name='exc' filepath='Python/crossinterp.c' line='1634' column='1'/>\r
-      <return type-id='type-id-5'/>\r
+    <function-decl name='_PyXI_NewExcInfo' mangled-name='_PyXI_NewExcInfo' filepath='Python/crossinterp.c' line='1645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewExcInfo'>\r
+      <parameter type-id='type-id-6' name='exc' filepath='Python/crossinterp.c' line='1645' column='1'/>\r
+      <return type-id='type-id-1684'/>\r
+    </function-decl>\r
+    <function-decl name='_PyXI_FreeExcInfo' mangled-name='_PyXI_FreeExcInfo' filepath='Python/crossinterp.c' line='1672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FreeExcInfo'>\r
+      <parameter type-id='type-id-1684' name='info' filepath='Python/crossinterp.c' line='1672' column='1'/>\r
+      <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_FormatExcInfo' mangled-name='_PyXI_FormatExcInfo' filepath='Python/crossinterp.c' line='1656' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FormatExcInfo'>\r
-      <parameter type-id='type-id-1687' name='info' filepath='Python/crossinterp.c' line='1656' column='1'/>\r
+    <function-decl name='_PyXI_FormatExcInfo' mangled-name='_PyXI_FormatExcInfo' filepath='Python/crossinterp.c' line='1679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FormatExcInfo'>\r
+      <parameter type-id='type-id-1684' name='info' filepath='Python/crossinterp.c' line='1679' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_ExcInfoAsObject' mangled-name='_PyXI_ExcInfoAsObject' filepath='Python/crossinterp.c' line='1662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ExcInfoAsObject'>\r
-      <parameter type-id='type-id-1687' name='info' filepath='Python/crossinterp.c' line='1662' column='1'/>\r
+    <function-decl name='_PyXI_ExcInfoAsObject' mangled-name='_PyXI_ExcInfoAsObject' filepath='Python/crossinterp.c' line='1685' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ExcInfoAsObject'>\r
+      <parameter type-id='type-id-1684' name='info' filepath='Python/crossinterp.c' line='1685' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_ClearExcInfo' mangled-name='_PyXI_ClearExcInfo' filepath='Python/crossinterp.c' line='1668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ClearExcInfo'>\r
-      <parameter type-id='type-id-1687' name='info' filepath='Python/crossinterp.c' line='1668' column='1'/>\r
+    <function-decl name='_PyXI_NewFailure' mangled-name='_PyXI_NewFailure' filepath='Python/crossinterp.c' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewFailure'>\r
+      <return type-id='type-id-1685'/>\r
+    </function-decl>\r
+    <function-decl name='_PyXI_FreeFailure' mangled-name='_PyXI_FreeFailure' filepath='Python/crossinterp.c' line='1788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FreeFailure'>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp.c' line='1788' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_ApplyError' mangled-name='_PyXI_ApplyError' filepath='Python/crossinterp.c' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ApplyError'>\r
-      <parameter type-id='type-id-1683' name='error' filepath='Python/crossinterp.c' line='1771' column='1'/>\r
-      <return type-id='type-id-6'/>\r
+    <function-decl name='_PyXI_GetFailureCode' mangled-name='_PyXI_GetFailureCode' filepath='Python/crossinterp.c' line='1795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_GetFailureCode'>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp.c' line='1795' column='1'/>\r
+      <return type-id='type-id-1674'/>\r
+    </function-decl>\r
+    <function-decl name='_PyXI_InitFailureUTF8' mangled-name='_PyXI_InitFailureUTF8' filepath='Python/crossinterp.c' line='1804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_InitFailureUTF8'>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp.c' line='1804' column='1'/>\r
+      <parameter type-id='type-id-1674' name='code' filepath='Python/crossinterp.c' line='1805' column='1'/>\r
+      <parameter type-id='type-id-4' name='msg' filepath='Python/crossinterp.c' line='1805' column='1'/>\r
+      <return type-id='type-id-3'/>\r
+    </function-decl>\r
+    <function-decl name='_PyXI_InitFailure' mangled-name='_PyXI_InitFailure' filepath='Python/crossinterp.c' line='1815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_InitFailure'>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp.c' line='1815' column='1'/>\r
+      <parameter type-id='type-id-1674' name='code' filepath='Python/crossinterp.c' line='1815' column='1'/>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp.c' line='1815' column='1'/>\r
+      <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_NewSession' mangled-name='_PyXI_NewSession' filepath='Python/crossinterp.c' line='2296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewSession'>\r
-      <return type-id='type-id-1688'/>\r
+    <function-decl name='_PyXI_NewSession' mangled-name='_PyXI_NewSession' filepath='Python/crossinterp.c' line='2498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewSession'>\r
+      <return type-id='type-id-1686'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_FreeSession' mangled-name='_PyXI_FreeSession' filepath='Python/crossinterp.c' line='2307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FreeSession'>\r
-      <parameter type-id='type-id-1688' name='session' filepath='Python/crossinterp.c' line='2307' column='1'/>\r
+    <function-decl name='_PyXI_FreeSession' mangled-name='_PyXI_FreeSession' filepath='Python/crossinterp.c' line='2509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_FreeSession'>\r
+      <parameter type-id='type-id-1686' name='session' filepath='Python/crossinterp.c' line='2509' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_Enter' mangled-name='_PyXI_Enter' filepath='Python/crossinterp.c' line='2436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Enter'>\r
-      <parameter type-id='type-id-1688' name='session' filepath='Python/crossinterp.c' line='2436' column='1'/>\r
-      <parameter type-id='type-id-33' name='interp' filepath='Python/crossinterp.c' line='2437' column='1'/>\r
-      <parameter type-id='type-id-6' name='nsupdates' filepath='Python/crossinterp.c' line='2437' column='1'/>\r
-      <parameter type-id='type-id-1689' name='result' filepath='Python/crossinterp.c' line='2438' column='1'/>\r
+    <function-decl name='_PyXI_Enter' mangled-name='_PyXI_Enter' filepath='Python/crossinterp.c' line='2618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Enter'>\r
+      <parameter type-id='type-id-1686' name='session' filepath='Python/crossinterp.c' line='2618' column='1'/>\r
+      <parameter type-id='type-id-33' name='interp' filepath='Python/crossinterp.c' line='2619' column='1'/>\r
+      <parameter type-id='type-id-6' name='nsupdates' filepath='Python/crossinterp.c' line='2619' column='1'/>\r
+      <parameter type-id='type-id-1687' name='result' filepath='Python/crossinterp.c' line='2620' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_Exit' mangled-name='_PyXI_Exit' filepath='Python/crossinterp.c' line='2544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Exit'>\r
-      <parameter type-id='type-id-1688' name='session' filepath='Python/crossinterp.c' line='2544' column='1'/>\r
-      <parameter type-id='type-id-1674' name='errcode' filepath='Python/crossinterp.c' line='2544' column='1'/>\r
-      <parameter type-id='type-id-1689' name='result' filepath='Python/crossinterp.c' line='2545' column='1'/>\r
+    <function-decl name='_PyXI_Exit' mangled-name='_PyXI_Exit' filepath='Python/crossinterp.c' line='2730' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Exit'>\r
+      <parameter type-id='type-id-1686' name='session' filepath='Python/crossinterp.c' line='2730' column='1'/>\r
+      <parameter type-id='type-id-1685' name='override' filepath='Python/crossinterp.c' line='2730' column='1'/>\r
+      <parameter type-id='type-id-1687' name='result' filepath='Python/crossinterp.c' line='2731' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_GetMainNamespace' mangled-name='_PyXI_GetMainNamespace' filepath='Python/crossinterp.c' line='2739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_GetMainNamespace'>\r
-      <parameter type-id='type-id-1688' name='session' filepath='Python/crossinterp.c' line='2739' column='1'/>\r
-      <parameter type-id='type-id-1682' name='p_errcode' filepath='Python/crossinterp.c' line='2739' column='1'/>\r
+    <function-decl name='_PyXI_GetMainNamespace' mangled-name='_PyXI_GetMainNamespace' filepath='Python/crossinterp.c' line='2908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_GetMainNamespace'>\r
+      <parameter type-id='type-id-1686' name='session' filepath='Python/crossinterp.c' line='2908' column='1'/>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp.c' line='2908' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_Preserve' mangled-name='_PyXI_Preserve' filepath='Python/crossinterp.c' line='2837' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Preserve'>\r
-      <parameter type-id='type-id-1688' name='session' filepath='Python/crossinterp.c' line='2837' column='1'/>\r
-      <parameter type-id='type-id-4' name='name' filepath='Python/crossinterp.c' line='2837' column='1'/>\r
-      <parameter type-id='type-id-6' name='value' filepath='Python/crossinterp.c' line='2837' column='1'/>\r
-      <parameter type-id='type-id-1682' name='p_errcode' filepath='Python/crossinterp.c' line='2838' column='1'/>\r
+    <function-decl name='_PyXI_Preserve' mangled-name='_PyXI_Preserve' filepath='Python/crossinterp.c' line='3009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_Preserve'>\r
+      <parameter type-id='type-id-1686' name='session' filepath='Python/crossinterp.c' line='3009' column='1'/>\r
+      <parameter type-id='type-id-4' name='name' filepath='Python/crossinterp.c' line='3009' column='1'/>\r
+      <parameter type-id='type-id-6' name='value' filepath='Python/crossinterp.c' line='3009' column='1'/>\r
+      <parameter type-id='type-id-1685' name='p_failure' filepath='Python/crossinterp.c' line='3010' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_GetPreserved' mangled-name='_PyXI_GetPreserved' filepath='Python/crossinterp.c' line='2866' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_GetPreserved'>\r
-      <parameter type-id='type-id-1689' name='result' filepath='Python/crossinterp.c' line='2866' column='1'/>\r
-      <parameter type-id='type-id-4' name='name' filepath='Python/crossinterp.c' line='2866' column='1'/>\r
+    <function-decl name='_PyXI_GetPreserved' mangled-name='_PyXI_GetPreserved' filepath='Python/crossinterp.c' line='3041' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_GetPreserved'>\r
+      <parameter type-id='type-id-1687' name='result' filepath='Python/crossinterp.c' line='3041' column='1'/>\r
+      <parameter type-id='type-id-4' name='name' filepath='Python/crossinterp.c' line='3041' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_ClearResult' mangled-name='_PyXI_ClearResult' filepath='Python/crossinterp.c' line='2876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ClearResult'>\r
-      <parameter type-id='type-id-1689' name='result' filepath='Python/crossinterp.c' line='2876' column='1'/>\r
+    <function-decl name='_PyXI_ClearResult' mangled-name='_PyXI_ClearResult' filepath='Python/crossinterp.c' line='3051' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_ClearResult'>\r
+      <parameter type-id='type-id-1687' name='result' filepath='Python/crossinterp.c' line='3051' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_NewInterpreter' mangled-name='_PyXI_NewInterpreter' filepath='Python/crossinterp.c' line='3023' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewInterpreter'>\r
-      <parameter type-id='type-id-1684' name='config' filepath='Python/crossinterp.c' line='3023' column='1'/>\r
-      <parameter type-id='type-id-170' name='maybe_whence' filepath='Python/crossinterp.c' line='3023' column='1'/>\r
-      <parameter type-id='type-id-1685' name='p_tstate' filepath='Python/crossinterp.c' line='3024' column='1'/>\r
-      <parameter type-id='type-id-1685' name='p_save_tstate' filepath='Python/crossinterp.c' line='3024' column='1'/>\r
+    <function-decl name='_PyXI_NewInterpreter' mangled-name='_PyXI_NewInterpreter' filepath='Python/crossinterp.c' line='3198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_NewInterpreter'>\r
+      <parameter type-id='type-id-1681' name='config' filepath='Python/crossinterp.c' line='3198' column='1'/>\r
+      <parameter type-id='type-id-170' name='maybe_whence' filepath='Python/crossinterp.c' line='3198' column='1'/>\r
+      <parameter type-id='type-id-1682' name='p_tstate' filepath='Python/crossinterp.c' line='3199' column='1'/>\r
+      <parameter type-id='type-id-1682' name='p_save_tstate' filepath='Python/crossinterp.c' line='3199' column='1'/>\r
       <return type-id='type-id-33'/>\r
     </function-decl>\r
-    <function-decl name='_PyXI_EndInterpreter' mangled-name='_PyXI_EndInterpreter' filepath='Python/crossinterp.c' line='3070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_EndInterpreter'>\r
-      <parameter type-id='type-id-33' name='interp' filepath='Python/crossinterp.c' line='3070' column='1'/>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp.c' line='3071' column='1'/>\r
-      <parameter type-id='type-id-1685' name='p_save_tstate' filepath='Python/crossinterp.c' line='3071' column='1'/>\r
+    <function-decl name='_PyXI_EndInterpreter' mangled-name='_PyXI_EndInterpreter' filepath='Python/crossinterp.c' line='3245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_EndInterpreter'>\r
+      <parameter type-id='type-id-33' name='interp' filepath='Python/crossinterp.c' line='3245' column='1'/>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp.c' line='3246' column='1'/>\r
+      <parameter type-id='type-id-1682' name='p_save_tstate' filepath='Python/crossinterp.c' line='3246' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyXIData_GetNotShareableErrorType' mangled-name='_PyXIData_GetNotShareableErrorType' filepath='Python/crossinterp_data_lookup.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_GetNotShareableErrorType'>\r
@@ -27331,67 +27345,72 @@
       <parameter is-variadic='yes'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-decl name='_PyXIData_Lookup' mangled-name='_PyXIData_Lookup' filepath='Python/crossinterp_data_lookup.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_Lookup'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='93' column='1'/>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='93' column='1'/>\r
+    <function-decl name='_PyXI_UnwrapNotShareableError' mangled-name='_PyXI_UnwrapNotShareableError' filepath='Python/crossinterp_data_lookup.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXI_UnwrapNotShareableError'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='92' column='1'/>\r
+      <parameter type-id='type-id-1685' name='failure' filepath='Python/crossinterp_data_lookup.h' line='92' column='1'/>\r
+      <return type-id='type-id-5'/>\r
+    </function-decl>\r
+    <function-decl name='_PyXIData_Lookup' mangled-name='_PyXIData_Lookup' filepath='Python/crossinterp_data_lookup.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_Lookup'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='120' column='1'/>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='120' column='1'/>\r
       <return type-id='type-id-1129'/>\r
     </function-decl>\r
-    <function-decl name='_PyXIData_RegisterClass' mangled-name='_PyXIData_RegisterClass' filepath='Python/crossinterp_data_lookup.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_RegisterClass'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='289' column='1'/>\r
-      <parameter type-id='type-id-1' name='cls' filepath='Python/crossinterp_data_lookup.h' line='290' column='1'/>\r
-      <parameter type-id='type-id-1129' name='getdata' filepath='Python/crossinterp_data_lookup.h' line='290' column='1'/>\r
+    <function-decl name='_PyXIData_RegisterClass' mangled-name='_PyXIData_RegisterClass' filepath='Python/crossinterp_data_lookup.h' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_RegisterClass'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='316' column='1'/>\r
+      <parameter type-id='type-id-1' name='cls' filepath='Python/crossinterp_data_lookup.h' line='317' column='1'/>\r
+      <parameter type-id='type-id-1129' name='getdata' filepath='Python/crossinterp_data_lookup.h' line='317' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyXIData_UnregisterClass' mangled-name='_PyXIData_UnregisterClass' filepath='Python/crossinterp_data_lookup.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_UnregisterClass'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='325' column='1'/>\r
-      <parameter type-id='type-id-1' name='cls' filepath='Python/crossinterp_data_lookup.h' line='325' column='1'/>\r
+    <function-decl name='_PyXIData_UnregisterClass' mangled-name='_PyXIData_UnregisterClass' filepath='Python/crossinterp_data_lookup.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyXIData_UnregisterClass'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='352' column='1'/>\r
+      <parameter type-id='type-id-1' name='cls' filepath='Python/crossinterp_data_lookup.h' line='352' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyBytes_GetData' mangled-name='_PyBytes_GetData' filepath='Python/crossinterp_data_lookup.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetData'>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='357' column='1'/>\r
-      <parameter type-id='type-id-1686' name='data' filepath='Python/crossinterp_data_lookup.h' line='357' column='1'/>\r
+    <function-decl name='_PyBytes_GetData' mangled-name='_PyBytes_GetData' filepath='Python/crossinterp_data_lookup.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetData'>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='384' column='1'/>\r
+      <parameter type-id='type-id-1683' name='data' filepath='Python/crossinterp_data_lookup.h' line='384' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyBytes_FromData' mangled-name='_PyBytes_FromData' filepath='Python/crossinterp_data_lookup.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_FromData'>\r
-      <parameter type-id='type-id-1686' name='data' filepath='Python/crossinterp_data_lookup.h' line='376' column='1'/>\r
+    <function-decl name='_PyBytes_FromData' mangled-name='_PyBytes_FromData' filepath='Python/crossinterp_data_lookup.h' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_FromData'>\r
+      <parameter type-id='type-id-1683' name='data' filepath='Python/crossinterp_data_lookup.h' line='403' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyBytes_FromXIData' mangled-name='_PyBytes_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_FromXIData'>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='382' column='1'/>\r
+    <function-decl name='_PyBytes_FromXIData' mangled-name='_PyBytes_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_FromXIData'>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='409' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyBytes_GetXIData' mangled-name='_PyBytes_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetXIData'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='411' column='1'/>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='411' column='1'/>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='411' column='1'/>\r
+    <function-decl name='_PyBytes_GetXIData' mangled-name='_PyBytes_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetXIData'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='438' column='1'/>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='438' column='1'/>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='438' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyBytes_GetXIDataWrapped' mangled-name='_PyBytes_GetXIDataWrapped' filepath='Python/crossinterp_data_lookup.h' line='422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetXIDataWrapped'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='422' column='1'/>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='423' column='1'/>\r
-      <parameter type-id='type-id-21' name='size' filepath='Python/crossinterp_data_lookup.h' line='423' column='1'/>\r
-      <parameter type-id='type-id-1122' name='newfunc' filepath='Python/crossinterp_data_lookup.h' line='423' column='1'/>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='424' column='1'/>\r
-      <return type-id='type-id-1686'/>\r
+    <function-decl name='_PyBytes_GetXIDataWrapped' mangled-name='_PyBytes_GetXIDataWrapped' filepath='Python/crossinterp_data_lookup.h' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyBytes_GetXIDataWrapped'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='449' column='1'/>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='450' column='1'/>\r
+      <parameter type-id='type-id-21' name='size' filepath='Python/crossinterp_data_lookup.h' line='450' column='1'/>\r
+      <parameter type-id='type-id-1122' name='newfunc' filepath='Python/crossinterp_data_lookup.h' line='450' column='1'/>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='451' column='1'/>\r
+      <return type-id='type-id-1683'/>\r
     </function-decl>\r
-    <function-decl name='_PyCode_FromXIData' mangled-name='_PyCode_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_FromXIData'>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='666' column='1'/>\r
+    <function-decl name='_PyCode_FromXIData' mangled-name='_PyCode_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_FromXIData'>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='693' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyCode_GetXIData' mangled-name='_PyCode_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_GetXIData'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='672' column='1'/>\r
-      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='672' column='1'/>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='672' column='1'/>\r
+    <function-decl name='_PyCode_GetXIData' mangled-name='_PyCode_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_GetXIData'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='699' column='1'/>\r
+      <parameter type-id='type-id-6' name='obj' filepath='Python/crossinterp_data_lookup.h' line='699' column='1'/>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='699' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyFunction_FromXIData' mangled-name='_PyFunction_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFunction_FromXIData'>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='689' column='1'/>\r
+    <function-decl name='_PyFunction_FromXIData' mangled-name='_PyFunction_FromXIData' filepath='Python/crossinterp_data_lookup.h' line='716' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFunction_FromXIData'>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='716' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-decl name='_PyFunction_GetXIData' mangled-name='_PyFunction_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFunction_GetXIData'>\r
-      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='719' column='1'/>\r
-      <parameter type-id='type-id-6' name='func' filepath='Python/crossinterp_data_lookup.h' line='719' column='1'/>\r
-      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='720' column='1'/>\r
+    <function-decl name='_PyFunction_GetXIData' mangled-name='_PyFunction_GetXIData' filepath='Python/crossinterp_data_lookup.h' line='746' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFunction_GetXIData'>\r
+      <parameter type-id='type-id-31' name='tstate' filepath='Python/crossinterp_data_lookup.h' line='746' column='1'/>\r
+      <parameter type-id='type-id-6' name='func' filepath='Python/crossinterp_data_lookup.h' line='746' column='1'/>\r
+      <parameter type-id='type-id-1502' name='xidata' filepath='Python/crossinterp_data_lookup.h' line='747' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
   </abi-instr>\r
@@ -27529,15 +27548,15 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/fileutils.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-1692' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='13' column='1' id='type-id-1693'>\r
+    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-1690' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='13' column='1' id='type-id-1691'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='__count' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='15' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='32'>\r
-        <var-decl name='__value' type-id='type-id-1694' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='20' column='1'/>\r
+        <var-decl name='__value' type-id='type-id-1692' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='20' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='16' column='1' id='type-id-1694'>\r
+    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='16' column='1' id='type-id-1692'>\r
       <data-member access='public'>\r
         <var-decl name='__wch' type-id='type-id-105' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='18' column='1'/>\r
       </data-member>\r
@@ -27545,11 +27564,11 @@
         <var-decl name='__wchb' type-id='type-id-864' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='19' column='1'/>\r
       </data-member>\r
     </union-decl>\r
-    <typedef-decl name='__mbstate_t' type-id='type-id-1693' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='21' column='1' id='type-id-1692'/>\r
-    <typedef-decl name='mbstate_t' type-id='type-id-1692' filepath='/usr/include/x86_64-linux-gnu/bits/types/mbstate_t.h' line='6' column='1' id='type-id-1695'/>\r
-    <pointer-type-def type-id='type-id-1695' size-in-bits='64' id='type-id-1696'/>\r
-    <qualified-type-def type-id='type-id-1696' restrict='yes' id='type-id-1697'/>\r
-    <qualified-type-def type-id='type-id-64' restrict='yes' id='type-id-1698'/>\r
+    <typedef-decl name='__mbstate_t' type-id='type-id-1691' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='21' column='1' id='type-id-1690'/>\r
+    <typedef-decl name='mbstate_t' type-id='type-id-1690' filepath='/usr/include/x86_64-linux-gnu/bits/types/mbstate_t.h' line='6' column='1' id='type-id-1693'/>\r
+    <pointer-type-def type-id='type-id-1693' size-in-bits='64' id='type-id-1694'/>\r
+    <qualified-type-def type-id='type-id-1694' restrict='yes' id='type-id-1695'/>\r
+    <qualified-type-def type-id='type-id-64' restrict='yes' id='type-id-1696'/>\r
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='941' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-19'/>\r
       <parameter type-id='type-id-180'/>\r
@@ -27593,7 +27612,7 @@
       <parameter type-id='type-id-19'/>\r
       <parameter type-id='type-id-180'/>\r
       <parameter type-id='type-id-21'/>\r
-      <parameter type-id='type-id-1697'/>\r
+      <parameter type-id='type-id-1695'/>\r
       <return type-id='type-id-21'/>\r
     </function-decl>\r
     <function-decl name='ioctl' filepath='/usr/include/x86_64-linux-gnu/sys/ioctl.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -27650,21 +27669,21 @@
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='PyCompile_OpcodeStackEffectWithJump' mangled-name='PyCompile_OpcodeStackEffectWithJump' filepath='Python/flowgraph.c' line='3999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCompile_OpcodeStackEffectWithJump'>\r
-      <parameter type-id='type-id-5' name='opcode' filepath='Python/flowgraph.c' line='3999' column='1'/>\r
-      <parameter type-id='type-id-5' name='oparg' filepath='Python/flowgraph.c' line='3999' column='1'/>\r
-      <parameter type-id='type-id-5' name='jump' filepath='Python/flowgraph.c' line='3999' column='1'/>\r
+    <function-decl name='PyCompile_OpcodeStackEffectWithJump' mangled-name='PyCompile_OpcodeStackEffectWithJump' filepath='Python/flowgraph.c' line='4019' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCompile_OpcodeStackEffectWithJump'>\r
+      <parameter type-id='type-id-5' name='opcode' filepath='Python/flowgraph.c' line='4019' column='1'/>\r
+      <parameter type-id='type-id-5' name='oparg' filepath='Python/flowgraph.c' line='4019' column='1'/>\r
+      <parameter type-id='type-id-5' name='jump' filepath='Python/flowgraph.c' line='4019' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyCompile_OptimizeCfg' mangled-name='_PyCompile_OptimizeCfg' filepath='Python/flowgraph.c' line='4039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCompile_OptimizeCfg'>\r
-      <parameter type-id='type-id-6' name='seq' filepath='Python/flowgraph.c' line='4039' column='1'/>\r
-      <parameter type-id='type-id-6' name='consts' filepath='Python/flowgraph.c' line='4039' column='1'/>\r
-      <parameter type-id='type-id-5' name='nlocals' filepath='Python/flowgraph.c' line='4039' column='1'/>\r
+    <function-decl name='_PyCompile_OptimizeCfg' mangled-name='_PyCompile_OptimizeCfg' filepath='Python/flowgraph.c' line='4059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCompile_OptimizeCfg'>\r
+      <parameter type-id='type-id-6' name='seq' filepath='Python/flowgraph.c' line='4059' column='1'/>\r
+      <parameter type-id='type-id-6' name='consts' filepath='Python/flowgraph.c' line='4059' column='1'/>\r
+      <parameter type-id='type-id-5' name='nlocals' filepath='Python/flowgraph.c' line='4059' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/formatter_unicode.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='51' column='1' id='type-id-1699'>\r
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='51' column='1' id='type-id-1697'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='decimal_point' type-id='type-id-17' visibility='default' filepath='/usr/include/locale.h' line='55' column='1'/>\r
       </data-member>\r
@@ -27738,9 +27757,9 @@
         <var-decl name='int_n_sign_posn' type-id='type-id-58' visibility='default' filepath='/usr/include/locale.h' line='109' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>\r
+    <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>\r
     <function-decl name='_Py_GetLocaleconvNumeric' filepath='./Include/internal/pycore_fileutils.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1700'/>\r
+      <parameter type-id='type-id-1698'/>\r
       <parameter type-id='type-id-241'/>\r
       <parameter type-id='type-id-241'/>\r
       <return type-id='type-id-5'/>\r
@@ -27780,17 +27799,17 @@
       <return type-id='type-id-7'/>\r
     </function-decl>\r
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <return type-id='type-id-1700'/>\r
+      <return type-id='type-id-1698'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/frame.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-1701' size-in-bits='384' id='type-id-1702'>\r
+    <array-type-def dimensions='1' type-id='type-id-1699' size-in-bits='384' id='type-id-1700'>\r
       <subrange length='6' type-id='type-id-2' id='type-id-477'/>\r
     </array-type-def>\r
-    <qualified-type-def type-id='type-id-271' const='yes' id='type-id-1703'/>\r
-    <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>\r
-    <qualified-type-def type-id='type-id-1704' const='yes' id='type-id-1701'/>\r
-    <var-decl name='PyUnstable_ExecutableKinds' type-id='type-id-1702' mangled-name='PyUnstable_ExecutableKinds' visibility='default' filepath='./Include/cpython/pyframe.h' line='45' column='1' elf-symbol-id='PyUnstable_ExecutableKinds'/>\r
+    <qualified-type-def type-id='type-id-271' const='yes' id='type-id-1701'/>\r
+    <pointer-type-def type-id='type-id-1701' size-in-bits='64' id='type-id-1702'/>\r
+    <qualified-type-def type-id='type-id-1702' const='yes' id='type-id-1699'/>\r
+    <var-decl name='PyUnstable_ExecutableKinds' type-id='type-id-1700' mangled-name='PyUnstable_ExecutableKinds' visibility='default' filepath='./Include/cpython/pyframe.h' line='45' column='1' elf-symbol-id='PyUnstable_ExecutableKinds'/>\r
     <function-decl name='_PyFrame_New_NoTrack' filepath='./Include/internal/pycore_frame.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-345'/>\r
       <return type-id='type-id-413'/>\r
@@ -27811,7 +27830,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/frozen.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_frozen' size-in-bits='192' is-struct='yes' visibility='default' filepath='./Include/cpython/import.h' line='13' column='1' id='type-id-1705'>\r
+    <class-decl name='_frozen' size-in-bits='192' is-struct='yes' visibility='default' filepath='./Include/cpython/import.h' line='13' column='1' id='type-id-1703'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='name' type-id='type-id-4' visibility='default' filepath='./Include/cpython/import.h' line='14' column='1'/>\r
       </data-member>\r
@@ -27825,7 +27844,7 @@
         <var-decl name='is_package' type-id='type-id-5' visibility='default' filepath='./Include/cpython/import.h' line='17' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='_module_alias' size-in-bits='128' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_import.h' line='105' column='1' id='type-id-1706'>\r
+    <class-decl name='_module_alias' size-in-bits='128' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_import.h' line='105' column='1' id='type-id-1704'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='name' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_import.h' line='106' column='1'/>\r
       </data-member>\r
@@ -27833,15 +27852,15 @@
         <var-decl name='orig' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_import.h' line='107' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <qualified-type-def type-id='type-id-1705' const='yes' id='type-id-1707'/>\r
+    <qualified-type-def type-id='type-id-1703' const='yes' id='type-id-1705'/>\r
+    <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>\r
+    <qualified-type-def type-id='type-id-1704' const='yes' id='type-id-1707'/>\r
     <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>\r
-    <qualified-type-def type-id='type-id-1706' const='yes' id='type-id-1709'/>\r
-    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>\r
-    <var-decl name='PyImport_FrozenModules' type-id='type-id-1708' mangled-name='PyImport_FrozenModules' visibility='default' filepath='./Include/cpython/import.h' line='23' column='1' elf-symbol-id='PyImport_FrozenModules'/>\r
-    <var-decl name='_PyImport_FrozenBootstrap' type-id='type-id-1708' mangled-name='_PyImport_FrozenBootstrap' visibility='default' filepath='./Include/internal/pycore_import.h' line='111' column='1' elf-symbol-id='_PyImport_FrozenBootstrap'/>\r
-    <var-decl name='_PyImport_FrozenStdlib' type-id='type-id-1708' mangled-name='_PyImport_FrozenStdlib' visibility='default' filepath='./Include/internal/pycore_import.h' line='112' column='1' elf-symbol-id='_PyImport_FrozenStdlib'/>\r
-    <var-decl name='_PyImport_FrozenTest' type-id='type-id-1708' mangled-name='_PyImport_FrozenTest' visibility='default' filepath='./Include/internal/pycore_import.h' line='113' column='1' elf-symbol-id='_PyImport_FrozenTest'/>\r
-    <var-decl name='_PyImport_FrozenAliases' type-id='type-id-1710' visibility='default' filepath='./Include/internal/pycore_import.h' line='115' column='1'/>\r
+    <var-decl name='PyImport_FrozenModules' type-id='type-id-1706' mangled-name='PyImport_FrozenModules' visibility='default' filepath='./Include/cpython/import.h' line='23' column='1' elf-symbol-id='PyImport_FrozenModules'/>\r
+    <var-decl name='_PyImport_FrozenBootstrap' type-id='type-id-1706' mangled-name='_PyImport_FrozenBootstrap' visibility='default' filepath='./Include/internal/pycore_import.h' line='111' column='1' elf-symbol-id='_PyImport_FrozenBootstrap'/>\r
+    <var-decl name='_PyImport_FrozenStdlib' type-id='type-id-1706' mangled-name='_PyImport_FrozenStdlib' visibility='default' filepath='./Include/internal/pycore_import.h' line='112' column='1' elf-symbol-id='_PyImport_FrozenStdlib'/>\r
+    <var-decl name='_PyImport_FrozenTest' type-id='type-id-1706' mangled-name='_PyImport_FrozenTest' visibility='default' filepath='./Include/internal/pycore_import.h' line='113' column='1' elf-symbol-id='_PyImport_FrozenTest'/>\r
+    <var-decl name='_PyImport_FrozenAliases' type-id='type-id-1708' visibility='default' filepath='./Include/internal/pycore_import.h' line='115' column='1'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/frozenmain.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
     <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-65'/>\r
@@ -27901,7 +27920,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/gc.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <typedef-decl name='gcvisitobjects_t' type-id='type-id-396' filepath='./Include/cpython/objimpl.h' line='103' column='1' id='type-id-1711'/>\r
+    <typedef-decl name='gcvisitobjects_t' type-id='type-id-396' filepath='./Include/cpython/objimpl.h' line='103' column='1' id='type-id-1709'/>\r
     <function-decl name='_PyGC_ClearAllFreeLists' filepath='./Include/internal/pycore_gc.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-33'/>\r
       <return type-id='type-id-3'/>\r
@@ -27936,15 +27955,15 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyUnstable_GC_VisitObjects' mangled-name='PyUnstable_GC_VisitObjects' filepath='Python/gc.c' line='2419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyUnstable_GC_VisitObjects'>\r
-      <parameter type-id='type-id-1711' name='callback' filepath='Python/gc.c' line='2419' column='1'/>\r
+      <parameter type-id='type-id-1709' name='callback' filepath='Python/gc.c' line='2419' column='1'/>\r
       <parameter type-id='type-id-35' name='arg' filepath='Python/gc.c' line='2419' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/gc_gil.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1712'/>\r
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1710'/>\r
     <function-decl name='_PyObject_ClearFreeLists' filepath='./Include/internal/pycore_freelist.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1712'/>\r
+      <parameter type-id='type-id-1710'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
@@ -28034,8 +28053,8 @@
     <var-decl name='_PyOS_optarg' type-id='type-id-18' visibility='default' filepath='./Include/internal/pycore_getopt.h' line='10' column='1'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/getversion.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-1713'/>\r
-    <var-decl name='Py_Version' type-id='type-id-1713' mangled-name='Py_Version' visibility='default' filepath='./Include/pylifecycle.h' line='64' column='1' elf-symbol-id='Py_Version'/>\r
+    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-1711'/>\r
+    <var-decl name='Py_Version' type-id='type-id-1711' mangled-name='Py_Version' visibility='default' filepath='./Include/pylifecycle.h' line='64' column='1' elf-symbol-id='Py_Version'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/hamt.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
     <var-decl name='_PyHamt_Type' type-id='type-id-271' visibility='default' filepath='./Include/internal/pycore_hamt.h' line='24' column='1'/>\r
@@ -28047,8 +28066,8 @@
     <var-decl name='_PyHamtItems_Type' type-id='type-id-271' visibility='default' filepath='./Include/internal/pycore_hamt.h' line='30' column='1'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/hashtable.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <typedef-decl name='_Py_hashtable_foreach_func' type-id='type-id-1714' filepath='./Include/internal/pycore_hashtable.h' line='97' column='1' id='type-id-1715'/>\r
-    <pointer-type-def type-id='type-id-1716' size-in-bits='64' id='type-id-1714'/>\r
+    <typedef-decl name='_Py_hashtable_foreach_func' type-id='type-id-1712' filepath='./Include/internal/pycore_hashtable.h' line='97' column='1' id='type-id-1713'/>\r
+    <pointer-type-def type-id='type-id-1714' size-in-bits='64' id='type-id-1712'/>\r
     <function-decl name='_Py_hashtable_hash_ptr' mangled-name='_Py_hashtable_hash_ptr' filepath='Python/hashtable.c' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_hashtable_hash_ptr'>\r
       <parameter type-id='type-id-35' name='key' filepath='Python/hashtable.c' line='93' column='1'/>\r
       <return type-id='type-id-1218'/>\r
@@ -28069,7 +28088,7 @@
     </function-decl>\r
     <function-decl name='_Py_hashtable_foreach' mangled-name='_Py_hashtable_foreach' filepath='Python/hashtable.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_hashtable_foreach'>\r
       <parameter type-id='type-id-618' name='ht' filepath='Python/hashtable.c' line='268' column='1'/>\r
-      <parameter type-id='type-id-1715' name='func' filepath='Python/hashtable.c' line='269' column='1'/>\r
+      <parameter type-id='type-id-1713' name='func' filepath='Python/hashtable.c' line='269' column='1'/>\r
       <parameter type-id='type-id-35' name='user_data' filepath='Python/hashtable.c' line='270' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
@@ -28082,7 +28101,7 @@
       <parameter type-id='type-id-618' name='ht' filepath='Python/hashtable.c' line='392' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-type size-in-bits='64' id='type-id-1716'>\r
+    <function-type size-in-bits='64' id='type-id-1714'>\r
       <parameter type-id='type-id-618'/>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-35'/>\r
@@ -28091,22 +28110,22 @@
     </function-type>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/import.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <enum-decl name='ext_module_kind' filepath='./Include/internal/pycore_importdl.h' line='18' column='1' id='type-id-1717'>\r
+    <enum-decl name='ext_module_kind' filepath='./Include/internal/pycore_importdl.h' line='18' column='1' id='type-id-1715'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='_Py_ext_module_kind_UNKNOWN' value='0'/>\r
       <enumerator name='_Py_ext_module_kind_SINGLEPHASE' value='1'/>\r
       <enumerator name='_Py_ext_module_kind_MULTIPHASE' value='2'/>\r
       <enumerator name='_Py_ext_module_kind_INVALID' value='3'/>\r
     </enum-decl>\r
-    <typedef-decl name='_Py_ext_module_kind' type-id='type-id-1717' filepath='./Include/internal/pycore_importdl.h' line='23' column='1' id='type-id-1718'/>\r
-    <enum-decl name='ext_module_origin' filepath='./Include/internal/pycore_importdl.h' line='25' column='1' id='type-id-1719'>\r
+    <typedef-decl name='_Py_ext_module_kind' type-id='type-id-1715' filepath='./Include/internal/pycore_importdl.h' line='23' column='1' id='type-id-1716'/>\r
+    <enum-decl name='ext_module_origin' filepath='./Include/internal/pycore_importdl.h' line='25' column='1' id='type-id-1717'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='_Py_ext_module_origin_CORE' value='1'/>\r
       <enumerator name='_Py_ext_module_origin_BUILTIN' value='2'/>\r
       <enumerator name='_Py_ext_module_origin_DYNAMIC' value='3'/>\r
     </enum-decl>\r
-    <typedef-decl name='_Py_ext_module_origin' type-id='type-id-1719' filepath='./Include/internal/pycore_importdl.h' line='29' column='1' id='type-id-1720'/>\r
-    <class-decl name='_Py_ext_module_loader_info' size-in-bits='512' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='32' column='1' id='type-id-1721'>\r
+    <typedef-decl name='_Py_ext_module_origin' type-id='type-id-1717' filepath='./Include/internal/pycore_importdl.h' line='29' column='1' id='type-id-1718'/>\r
+    <class-decl name='_Py_ext_module_loader_info' size-in-bits='512' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='32' column='1' id='type-id-1719'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='filename' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='33' column='1'/>\r
       </data-member>\r
@@ -28123,7 +28142,7 @@
         <var-decl name='path' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='41' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='320'>\r
-        <var-decl name='origin' type-id='type-id-1720' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='42' column='1'/>\r
+        <var-decl name='origin' type-id='type-id-1718' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='42' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='384'>\r
         <var-decl name='hook_prefix' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='43' column='1'/>\r
@@ -28132,7 +28151,7 @@
         <var-decl name='newcontext' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='44' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='_Py_ext_module_loader_result' size-in-bits='384' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='66' column='1' id='type-id-1722'>\r
+    <class-decl name='_Py_ext_module_loader_result' size-in-bits='384' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='66' column='1' id='type-id-1720'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='def' type-id='type-id-473' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='67' column='1'/>\r
       </data-member>\r
@@ -28140,24 +28159,24 @@
         <var-decl name='module' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='68' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='kind' type-id='type-id-1718' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='69' column='1'/>\r
+        <var-decl name='kind' type-id='type-id-1716' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='69' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='192'>\r
-        <var-decl name='err' type-id='type-id-1723' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='70' column='1'/>\r
+        <var-decl name='err' type-id='type-id-1721' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='70' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='256'>\r
-        <var-decl name='_err' type-id='type-id-1724' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='82' column='1'/>\r
+        <var-decl name='_err' type-id='type-id-1722' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='82' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='_Py_ext_module_loader_result_error' size-in-bits='128' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='71' column='1' id='type-id-1724'>\r
+    <class-decl name='_Py_ext_module_loader_result_error' size-in-bits='128' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='71' column='1' id='type-id-1722'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='kind' type-id='type-id-1725' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='80' column='1'/>\r
+        <var-decl name='kind' type-id='type-id-1723' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='80' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
         <var-decl name='exc' type-id='type-id-6' visibility='default' filepath='./Include/internal/pycore_importdl.h' line='81' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <enum-decl name='_Py_ext_module_loader_result_error_kind' filepath='./Include/internal/pycore_importdl.h' line='72' column='1' id='type-id-1725'>\r
+    <enum-decl name='_Py_ext_module_loader_result_error_kind' filepath='./Include/internal/pycore_importdl.h' line='72' column='1' id='type-id-1723'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='_Py_ext_module_loader_result_EXCEPTION' value='0'/>\r
       <enumerator name='_Py_ext_module_loader_result_ERR_MISSING' value='1'/>\r
@@ -28167,9 +28186,9 @@
       <enumerator name='_Py_ext_module_loader_result_ERR_NOT_MODULE' value='5'/>\r
       <enumerator name='_Py_ext_module_loader_result_ERR_MISSING_DEF' value='6'/>\r
     </enum-decl>\r
-    <typedef-decl name='PyModInitFunction' type-id='type-id-466' filepath='./Include/internal/pycore_importdl.h' line='91' column='1' id='type-id-1726'/>\r
-    <typedef-decl name='PyThread_ident_t' type-id='type-id-462' filepath='./Include/internal/pycore_pythread.h' line='119' column='1' id='type-id-1727'/>\r
-    <enum-decl name='_PyTime_round_t' naming-typedef-id='type-id-173' filepath='./Include/internal/pycore_time.h' line='68' column='1' id='type-id-1728'>\r
+    <typedef-decl name='PyModInitFunction' type-id='type-id-466' filepath='./Include/internal/pycore_importdl.h' line='91' column='1' id='type-id-1724'/>\r
+    <typedef-decl name='PyThread_ident_t' type-id='type-id-462' filepath='./Include/internal/pycore_pythread.h' line='119' column='1' id='type-id-1725'/>\r
+    <enum-decl name='_PyTime_round_t' naming-typedef-id='type-id-173' filepath='./Include/internal/pycore_time.h' line='68' column='1' id='type-id-1726'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='_PyTime_ROUND_FLOOR' value='0'/>\r
       <enumerator name='_PyTime_ROUND_CEILING' value='1'/>\r
@@ -28177,48 +28196,48 @@
       <enumerator name='_PyTime_ROUND_UP' value='3'/>\r
       <enumerator name='_PyTime_ROUND_TIMEOUT' value='3'/>\r
     </enum-decl>\r
-    <typedef-decl name='_PyTime_round_t' type-id='type-id-1728' filepath='./Include/internal/pycore_time.h' line='92' column='1' id='type-id-173'/>\r
+    <typedef-decl name='_PyTime_round_t' type-id='type-id-1726' filepath='./Include/internal/pycore_time.h' line='92' column='1' id='type-id-173'/>\r
     <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-174'/>\r
-    <pointer-type-def type-id='type-id-1721' size-in-bits='64' id='type-id-1729'/>\r
-    <pointer-type-def type-id='type-id-1722' size-in-bits='64' id='type-id-1730'/>\r
-    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-1723'/>\r
+    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1727'/>\r
+    <pointer-type-def type-id='type-id-1720' size-in-bits='64' id='type-id-1728'/>\r
+    <pointer-type-def type-id='type-id-1722' size-in-bits='64' id='type-id-1721'/>\r
     <var-decl name='PyImport_Inittab' type-id='type-id-1257' mangled-name='PyImport_Inittab' visibility='default' filepath='./Include/cpython/import.h' line='10' column='1' elf-symbol-id='PyImport_Inittab'/>\r
     <function-decl name='PyTime_PerfCounterRaw' mangled-name='PyTime_PerfCounterRaw' filepath='./Include/cpython/pytime.h' line='20' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyTime_PerfCounterRaw'>\r
       <parameter type-id='type-id-174'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_Py_ext_module_loader_info_clear' filepath='./Include/internal/pycore_importdl.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1729'/>\r
+      <parameter type-id='type-id-1727'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_Py_ext_module_loader_info_init_for_builtin' filepath='./Include/internal/pycore_importdl.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1729'/>\r
+      <parameter type-id='type-id-1727'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_Py_ext_module_loader_info_init_from_spec' filepath='./Include/internal/pycore_importdl.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1729'/>\r
+      <parameter type-id='type-id-1727'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_Py_ext_module_loader_result_clear' filepath='./Include/internal/pycore_importdl.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1730'/>\r
+      <parameter type-id='type-id-1728'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_Py_ext_module_loader_result_apply_error' filepath='./Include/internal/pycore_importdl.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1730'/>\r
+      <parameter type-id='type-id-1728'/>\r
       <parameter type-id='type-id-4'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyImport_GetModInitFunc' filepath='./Include/internal/pycore_importdl.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1729'/>\r
+      <parameter type-id='type-id-1727'/>\r
       <parameter type-id='type-id-61'/>\r
-      <return type-id='type-id-1726'/>\r
+      <return type-id='type-id-1724'/>\r
     </function-decl>\r
     <function-decl name='_PyImport_RunModInitFunc' filepath='./Include/internal/pycore_importdl.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1726'/>\r
-      <parameter type-id='type-id-1729'/>\r
-      <parameter type-id='type-id-1730'/>\r
+      <parameter type-id='type-id-1724'/>\r
+      <parameter type-id='type-id-1727'/>\r
+      <parameter type-id='type-id-1728'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyRecursiveMutex_IsLockedByCurrentThread' mangled-name='_PyRecursiveMutex_IsLockedByCurrentThread' filepath='./Include/internal/pycore_lock.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyRecursiveMutex_IsLockedByCurrentThread'>\r
@@ -28249,7 +28268,7 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyThread_get_thread_ident_ex' mangled-name='PyThread_get_thread_ident_ex' filepath='./Include/internal/pycore_pythread.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_get_thread_ident_ex'>\r
-      <return type-id='type-id-1727'/>\r
+      <return type-id='type-id-1725'/>\r
     </function-decl>\r
     <function-decl name='_PySys_ClearAttrString' filepath='./Include/internal/pycore_sysmodule.h' line='21' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-33'/>\r
@@ -28386,7 +28405,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/initconfig.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <typedef-decl name='PyInitConfig' type-id='type-id-1731' filepath='./Include/cpython/initconfig.h' line='288' column='1' id='type-id-1732'/>\r
+    <typedef-decl name='PyInitConfig' type-id='type-id-1729' filepath='./Include/cpython/initconfig.h' line='288' column='1' id='type-id-1730'/>\r
     <class-decl name='_PyArgv' size-in-bits='256' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='68' column='1' id='type-id-247'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='argc' type-id='type-id-7' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='69' column='1'/>\r
@@ -28398,11 +28417,11 @@
         <var-decl name='bytes_argv' type-id='type-id-129' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='71' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='192'>\r
-        <var-decl name='wchar_argv' type-id='type-id-1733' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='72' column='1'/>\r
+        <var-decl name='wchar_argv' type-id='type-id-1731' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='72' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyArgv' type-id='type-id-247' filepath='./Include/internal/pycore_initconfig.h' line='73' column='1' id='type-id-1734'/>\r
-    <class-decl name='_PyPreCmdline' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-1735' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='101' column='1' id='type-id-1736'>\r
+    <typedef-decl name='_PyArgv' type-id='type-id-247' filepath='./Include/internal/pycore_initconfig.h' line='73' column='1' id='type-id-1732'/>\r
+    <class-decl name='_PyPreCmdline' size-in-bits='384' is-struct='yes' naming-typedef-id='type-id-1733' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='101' column='1' id='type-id-1734'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='argv' type-id='type-id-978' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='102' column='1'/>\r
       </data-member>\r
@@ -28422,8 +28441,8 @@
         <var-decl name='warn_default_encoding' type-id='type-id-5' visibility='default' filepath='./Include/internal/pycore_initconfig.h' line='107' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyPreCmdline' type-id='type-id-1736' filepath='./Include/internal/pycore_initconfig.h' line='108' column='1' id='type-id-1735'/>\r
-    <class-decl name='PyInitConfig' size-in-bits='4416' is-struct='yes' visibility='default' filepath='Python/initconfig.c' line='3692' column='1' id='type-id-1731'>\r
+    <typedef-decl name='_PyPreCmdline' type-id='type-id-1734' filepath='./Include/internal/pycore_initconfig.h' line='108' column='1' id='type-id-1733'/>\r
+    <class-decl name='PyInitConfig' size-in-bits='4416' is-struct='yes' visibility='default' filepath='Python/initconfig.c' line='3692' column='1' id='type-id-1729'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='preconfig' type-id='type-id-981' visibility='default' filepath='Python/initconfig.c' line='3693' column='1'/>\r
       </data-member>\r
@@ -28443,27 +28462,27 @@
         <var-decl name='err_msg' type-id='type-id-17' visibility='default' filepath='Python/initconfig.c' line='3698' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-1737'/>\r
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-1738'/>\r
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1739'/>\r
-    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1740'/>\r
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-1741'/>\r
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1742'/>\r
-    <pointer-type-def type-id='type-id-1742' size-in-bits='64' id='type-id-250'/>\r
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1743'/>\r
-    <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-239'/>\r
-    <qualified-type-def type-id='type-id-1734' const='yes' id='type-id-1744'/>\r
+    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-1735'/>\r
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-1736'/>\r
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1737'/>\r
+    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-1738'/>\r
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-1739'/>\r
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1740'/>\r
+    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-250'/>\r
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1741'/>\r
+    <pointer-type-def type-id='type-id-1741' size-in-bits='64' id='type-id-239'/>\r
+    <qualified-type-def type-id='type-id-1732' const='yes' id='type-id-1742'/>\r
+    <pointer-type-def type-id='type-id-1742' size-in-bits='64' id='type-id-1743'/>\r
+    <qualified-type-def type-id='type-id-1733' const='yes' id='type-id-1744'/>\r
     <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-1745'/>\r
-    <qualified-type-def type-id='type-id-1735' const='yes' id='type-id-1746'/>\r
-    <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>\r
     <qualified-type-def type-id='type-id-18' restrict='yes' id='type-id-20'/>\r
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-1748'/>\r
-    <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1733'/>\r
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-1746'/>\r
+    <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1731'/>\r
     <qualified-type-def type-id='type-id-63' restrict='yes' id='type-id-19'/>\r
-    <qualified-type-def type-id='type-id-244' restrict='yes' id='type-id-1749'/>\r
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-1750'/>\r
+    <qualified-type-def type-id='type-id-244' restrict='yes' id='type-id-1747'/>\r
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-1748'/>\r
     <function-decl name='PyPreConfig_InitIsolatedConfig' mangled-name='PyPreConfig_InitIsolatedConfig' filepath='./Include/cpython/initconfig.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyPreConfig_InitIsolatedConfig'>\r
-      <parameter type-id='type-id-1738'/>\r
+      <parameter type-id='type-id-1736'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <var-decl name='Py_DebugFlag' type-id='type-id-5' mangled-name='Py_DebugFlag' visibility='default' filepath='./Include/cpython/pydebug.h' line='8' column='1' elf-symbol-id='Py_DebugFlag'/>\r
@@ -28531,13 +28550,13 @@
     </function-decl>\r
     <function-decl name='_PyOS_GetOpt' filepath='./Include/internal/pycore_getopt.h' line='20' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-7'/>\r
-      <parameter type-id='type-id-1733'/>\r
+      <parameter type-id='type-id-1731'/>\r
       <parameter type-id='type-id-177'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyArgv_AsWstrList' filepath='./Include/internal/pycore_initconfig.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1745'/>\r
-      <parameter type-id='type-id-1739'/>\r
+      <parameter type-id='type-id-1743'/>\r
+      <parameter type-id='type-id-1737'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_Py_str_to_int' filepath='./Include/internal/pycore_initconfig.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -28562,21 +28581,21 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyPreCmdline_Clear' filepath='./Include/internal/pycore_initconfig.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1740'/>\r
+      <parameter type-id='type-id-1738'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyPreCmdline_SetConfig' filepath='./Include/internal/pycore_initconfig.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1747'/>\r
+      <parameter type-id='type-id-1745'/>\r
       <parameter type-id='type-id-65'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyPreCmdline_Read' filepath='./Include/internal/pycore_initconfig.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1740'/>\r
+      <parameter type-id='type-id-1738'/>\r
       <parameter type-id='type-id-250'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_InitFromPreConfig' filepath='./Include/internal/pycore_initconfig.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1738'/>\r
+      <parameter type-id='type-id-1736'/>\r
       <parameter type-id='type-id-250'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
@@ -28585,7 +28604,7 @@
       <return type-id='type-id-6'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_GetConfig' filepath='./Include/internal/pycore_initconfig.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1738'/>\r
+      <parameter type-id='type-id-1736'/>\r
       <parameter type-id='type-id-240'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
@@ -28599,7 +28618,7 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PySys_ReadPreinitWarnOptions' filepath='./Include/internal/pycore_pylifecycle.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1739'/>\r
+      <parameter type-id='type-id-1737'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PySys_ReadPreinitXOptions' filepath='./Include/internal/pycore_pylifecycle.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -28608,7 +28627,7 @@
     </function-decl>\r
     <function-decl name='_Py_PreInitializeFromConfig' filepath='./Include/internal/pycore_pylifecycle.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-240'/>\r
-      <parameter type-id='type-id-1745'/>\r
+      <parameter type-id='type-id-1743'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyMem_RawStrdup' filepath='./Include/internal/pycore_pymem.h' line='20' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -28676,12 +28695,12 @@
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-19'/>\r
       <parameter type-id='type-id-20'/>\r
-      <parameter type-id='type-id-1749'/>\r
+      <parameter type-id='type-id-1747'/>\r
       <return type-id='type-id-63'/>\r
     </function-decl>\r
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-20'/>\r
-      <parameter type-id='type-id-1749'/>\r
+      <parameter type-id='type-id-1747'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-184'/>\r
     </function-decl>\r
@@ -28698,19 +28717,19 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyWideStringList_Insert' mangled-name='PyWideStringList_Insert' filepath='Python/initconfig.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyWideStringList_Insert'>\r
-      <parameter type-id='type-id-1739' name='list' filepath='Python/initconfig.c' line='732' column='1'/>\r
+      <parameter type-id='type-id-1737' name='list' filepath='Python/initconfig.c' line='732' column='1'/>\r
       <parameter type-id='type-id-7' name='index' filepath='Python/initconfig.c' line='733' column='1'/>\r
       <parameter type-id='type-id-18' name='item' filepath='Python/initconfig.c' line='733' column='1'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='PyWideStringList_Append' mangled-name='PyWideStringList_Append' filepath='Python/initconfig.c' line='773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyWideStringList_Append'>\r
-      <parameter type-id='type-id-1739' name='list' filepath='Python/initconfig.c' line='773' column='1'/>\r
+      <parameter type-id='type-id-1737' name='list' filepath='Python/initconfig.c' line='773' column='1'/>\r
       <parameter type-id='type-id-18' name='item' filepath='Python/initconfig.c' line='773' column='1'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='Py_GetArgcArgv' mangled-name='Py_GetArgcArgv' filepath='Python/initconfig.c' line='870' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_GetArgcArgv'>\r
       <parameter type-id='type-id-177' name='argc' filepath='Python/initconfig.c' line='870' column='1'/>\r
-      <parameter type-id='type-id-1750' name='argv' filepath='Python/initconfig.c' line='870' column='1'/>\r
+      <parameter type-id='type-id-1748' name='argv' filepath='Python/initconfig.c' line='870' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyConfig_InitCompatConfig' mangled-name='_PyConfig_InitCompatConfig' filepath='Python/initconfig.c' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyConfig_InitCompatConfig'>\r
@@ -28745,12 +28764,12 @@
     <function-decl name='PyConfig_SetArgv' mangled-name='PyConfig_SetArgv' filepath='Python/initconfig.c' line='3431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetArgv'>\r
       <parameter type-id='type-id-65' name='config' filepath='Python/initconfig.c' line='3431' column='1'/>\r
       <parameter type-id='type-id-7' name='argc' filepath='Python/initconfig.c' line='3431' column='1'/>\r
-      <parameter type-id='type-id-1733' name='argv' filepath='Python/initconfig.c' line='3431' column='1'/>\r
+      <parameter type-id='type-id-1731' name='argv' filepath='Python/initconfig.c' line='3431' column='1'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='PyConfig_SetWideStringList' mangled-name='PyConfig_SetWideStringList' filepath='Python/initconfig.c' line='3443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetWideStringList'>\r
       <parameter type-id='type-id-65' name='config' filepath='Python/initconfig.c' line='3443' column='1'/>\r
-      <parameter type-id='type-id-1739' name='list' filepath='Python/initconfig.c' line='3443' column='1'/>\r
+      <parameter type-id='type-id-1737' name='list' filepath='Python/initconfig.c' line='3443' column='1'/>\r
       <parameter type-id='type-id-7' name='length' filepath='Python/initconfig.c' line='3444' column='1'/>\r
       <parameter type-id='type-id-244' name='items' filepath='Python/initconfig.c' line='3444' column='1'/>\r
       <return type-id='type-id-66'/>\r
@@ -28763,44 +28782,44 @@
       <return type-id='type-id-6'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_Create' mangled-name='PyInitConfig_Create' filepath='Python/initconfig.c' line='3709' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_Create'>\r
-      <return type-id='type-id-1737'/>\r
+      <return type-id='type-id-1735'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_Free' mangled-name='PyInitConfig_Free' filepath='Python/initconfig.c' line='3723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_Free'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3723' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3723' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_GetError' mangled-name='PyInitConfig_GetError' filepath='Python/initconfig.c' line='3734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_GetError'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3734' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3734' column='1'/>\r
       <parameter type-id='type-id-266' name='perr_msg' filepath='Python/initconfig.c' line='3734' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_GetExitCode' mangled-name='PyInitConfig_GetExitCode' filepath='Python/initconfig.c' line='3765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_GetExitCode'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3765' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3765' column='1'/>\r
       <parameter type-id='type-id-177' name='exitcode' filepath='Python/initconfig.c' line='3765' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_HasOption' mangled-name='PyInitConfig_HasOption' filepath='Python/initconfig.c' line='3797' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_HasOption'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3797' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3797' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='3797' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_GetInt' mangled-name='PyInitConfig_GetInt' filepath='Python/initconfig.c' line='3828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_GetInt'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3828' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3828' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='3828' column='1'/>\r
       <parameter type-id='type-id-458' name='value' filepath='Python/initconfig.c' line='3828' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_GetStr' mangled-name='PyInitConfig_GetStr' filepath='Python/initconfig.c' line='3898' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_GetStr'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3898' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3898' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='3898' column='1'/>\r
       <parameter type-id='type-id-251' name='value' filepath='Python/initconfig.c' line='3898' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_GetStrList' mangled-name='PyInitConfig_GetStrList' filepath='Python/initconfig.c' line='3928' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_GetStrList'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3928' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3928' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='3928' column='1'/>\r
       <parameter type-id='type-id-62' name='length' filepath='Python/initconfig.c' line='3928' column='1'/>\r
-      <parameter type-id='type-id-1741' name='items' filepath='Python/initconfig.c' line='3928' column='1'/>\r
+      <parameter type-id='type-id-1739' name='items' filepath='Python/initconfig.c' line='3928' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_FreeStrList' mangled-name='PyInitConfig_FreeStrList' filepath='Python/initconfig.c' line='3962' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_FreeStrList'>\r
@@ -28809,32 +28828,32 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_SetInt' mangled-name='PyInitConfig_SetInt' filepath='Python/initconfig.c' line='3972' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_SetInt'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='3972' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='3972' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='3972' column='1'/>\r
       <parameter type-id='type-id-409' name='value' filepath='Python/initconfig.c' line='3972' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_SetStr' mangled-name='PyInitConfig_SetStr' filepath='Python/initconfig.c' line='4068' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_SetStr'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='4068' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='4068' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='4068' column='1'/>\r
       <parameter type-id='type-id-4' name='value' filepath='Python/initconfig.c' line='4068' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_SetStrList' mangled-name='PyInitConfig_SetStrList' filepath='Python/initconfig.c' line='4125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_SetStrList'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='4125' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='4125' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='4125' column='1'/>\r
       <parameter type-id='type-id-21' name='length' filepath='Python/initconfig.c' line='4126' column='1'/>\r
       <parameter type-id='type-id-129' name='items' filepath='Python/initconfig.c' line='4126' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyInitConfig_AddModule' mangled-name='PyInitConfig_AddModule' filepath='Python/initconfig.c' line='4151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInitConfig_AddModule'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='4151' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='4151' column='1'/>\r
       <parameter type-id='type-id-4' name='name' filepath='Python/initconfig.c' line='4151' column='1'/>\r
       <parameter type-id='type-id-466' name='initfunc' filepath='Python/initconfig.c' line='4152' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='Py_InitializeFromInitConfig' mangled-name='Py_InitializeFromInitConfig' filepath='Python/initconfig.c' line='4177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_InitializeFromInitConfig'>\r
-      <parameter type-id='type-id-1737' name='config' filepath='Python/initconfig.c' line='4177' column='1'/>\r
+      <parameter type-id='type-id-1735' name='config' filepath='Python/initconfig.c' line='4177' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyConfig_Get' mangled-name='PyConfig_Get' filepath='Python/initconfig.c' line='4412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_Get'>\r
@@ -28859,7 +28878,7 @@
     <var-decl name='_PyInstructionSequence_Type' type-id='type-id-271' visibility='default' filepath='./Include/internal/pycore_instruction_sequence.h' line='77' column='1'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/instrumentation.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_PyMonitoringState' size-in-bits='16' is-struct='yes' visibility='default' filepath='./Include/cpython/monitoring.h' line='39' column='1' id='type-id-1751'>\r
+    <class-decl name='_PyMonitoringState' size-in-bits='16' is-struct='yes' visibility='default' filepath='./Include/cpython/monitoring.h' line='39' column='1' id='type-id-1749'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='active' type-id='type-id-309' visibility='default' filepath='./Include/cpython/monitoring.h' line='40' column='1'/>\r
       </data-member>\r
@@ -28867,12 +28886,12 @@
         <var-decl name='opaque' type-id='type-id-309' visibility='default' filepath='./Include/cpython/monitoring.h' line='41' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='PyMonitoringState' type-id='type-id-1751' filepath='./Include/cpython/monitoring.h' line='42' column='1' id='type-id-1752'/>\r
-    <pointer-type-def type-id='type-id-1752' size-in-bits='64' id='type-id-1753'/>\r
+    <typedef-decl name='PyMonitoringState' type-id='type-id-1749' filepath='./Include/cpython/monitoring.h' line='42' column='1' id='type-id-1750'/>\r
+    <pointer-type-def type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>\r
     <var-decl name='_PyInstrumentation_MISSING' type-id='type-id-390' visibility='default' filepath='./Include/internal/pycore_instruments.h' line='68' column='1'/>\r
     <var-decl name='_PyInstrumentation_DISABLE' type-id='type-id-390' visibility='default' filepath='./Include/internal/pycore_instruments.h' line='69' column='1'/>\r
     <function-decl name='PyMonitoring_EnterScope' mangled-name='PyMonitoring_EnterScope' filepath='Python/instrumentation.c' line='2643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyMonitoring_EnterScope'>\r
-      <parameter type-id='type-id-1753' name='state_array' filepath='Python/instrumentation.c' line='2643' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state_array' filepath='Python/instrumentation.c' line='2643' column='1'/>\r
       <parameter type-id='type-id-460' name='version' filepath='Python/instrumentation.c' line='2643' column='1'/>\r
       <parameter type-id='type-id-326' name='event_types' filepath='Python/instrumentation.c' line='2644' column='1'/>\r
       <parameter type-id='type-id-7' name='length' filepath='Python/instrumentation.c' line='2644' column='1'/>\r
@@ -28882,33 +28901,33 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyStartEvent' mangled-name='_PyMonitoring_FirePyStartEvent' filepath='Python/instrumentation.c' line='2667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyStartEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2667' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2667' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2667' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2667' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyResumeEvent' mangled-name='_PyMonitoring_FirePyResumeEvent' filepath='Python/instrumentation.c' line='2676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyResumeEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2676' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2676' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2676' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2676' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyReturnEvent' mangled-name='_PyMonitoring_FirePyReturnEvent' filepath='Python/instrumentation.c' line='2687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyReturnEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2687' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2687' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2687' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2687' column='1'/>\r
       <parameter type-id='type-id-6' name='retval' filepath='Python/instrumentation.c' line='2688' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyYieldEvent' mangled-name='_PyMonitoring_FirePyYieldEvent' filepath='Python/instrumentation.c' line='2697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyYieldEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2697' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2697' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2697' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2697' column='1'/>\r
       <parameter type-id='type-id-6' name='retval' filepath='Python/instrumentation.c' line='2698' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireCallEvent' mangled-name='_PyMonitoring_FireCallEvent' filepath='Python/instrumentation.c' line='2707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireCallEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2707' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2707' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2707' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2707' column='1'/>\r
       <parameter type-id='type-id-6' name='callable' filepath='Python/instrumentation.c' line='2708' column='1'/>\r
@@ -28916,85 +28935,85 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireLineEvent' mangled-name='_PyMonitoring_FireLineEvent' filepath='Python/instrumentation.c' line='2717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireLineEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2717' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2717' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2717' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2717' column='1'/>\r
       <parameter type-id='type-id-5' name='lineno' filepath='Python/instrumentation.c' line='2718' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireJumpEvent' mangled-name='_PyMonitoring_FireJumpEvent' filepath='Python/instrumentation.c' line='2733' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireJumpEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2733' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2733' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2733' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2733' column='1'/>\r
       <parameter type-id='type-id-6' name='target_offset' filepath='Python/instrumentation.c' line='2734' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireBranchEvent' mangled-name='_PyMonitoring_FireBranchEvent' filepath='Python/instrumentation.c' line='2743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireBranchEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2743' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2743' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2743' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2743' column='1'/>\r
       <parameter type-id='type-id-6' name='target_offset' filepath='Python/instrumentation.c' line='2744' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireBranchRightEvent' mangled-name='_PyMonitoring_FireBranchRightEvent' filepath='Python/instrumentation.c' line='2753' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireBranchRightEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2753' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2753' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2753' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2753' column='1'/>\r
       <parameter type-id='type-id-6' name='target_offset' filepath='Python/instrumentation.c' line='2754' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireBranchLeftEvent' mangled-name='_PyMonitoring_FireBranchLeftEvent' filepath='Python/instrumentation.c' line='2763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireBranchLeftEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2763' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2763' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2763' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2763' column='1'/>\r
       <parameter type-id='type-id-6' name='target_offset' filepath='Python/instrumentation.c' line='2764' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireCReturnEvent' mangled-name='_PyMonitoring_FireCReturnEvent' filepath='Python/instrumentation.c' line='2773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireCReturnEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2773' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2773' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2773' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2773' column='1'/>\r
       <parameter type-id='type-id-6' name='retval' filepath='Python/instrumentation.c' line='2774' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyThrowEvent' mangled-name='_PyMonitoring_FirePyThrowEvent' filepath='Python/instrumentation.c' line='2808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyThrowEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2808' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2808' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2808' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2808' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireRaiseEvent' mangled-name='_PyMonitoring_FireRaiseEvent' filepath='Python/instrumentation.c' line='2822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireRaiseEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2822' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2822' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2822' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2822' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireCRaiseEvent' mangled-name='_PyMonitoring_FireCRaiseEvent' filepath='Python/instrumentation.c' line='2836' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireCRaiseEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2836' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2836' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2836' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2836' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireReraiseEvent' mangled-name='_PyMonitoring_FireReraiseEvent' filepath='Python/instrumentation.c' line='2850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireReraiseEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2850' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2850' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2850' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2850' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireExceptionHandledEvent' mangled-name='_PyMonitoring_FireExceptionHandledEvent' filepath='Python/instrumentation.c' line='2864' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireExceptionHandledEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2864' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2864' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2864' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2864' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FirePyUnwindEvent' mangled-name='_PyMonitoring_FirePyUnwindEvent' filepath='Python/instrumentation.c' line='2878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FirePyUnwindEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2878' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2878' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2878' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2878' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_FireStopIterationEvent' mangled-name='_PyMonitoring_FireStopIterationEvent' filepath='Python/instrumentation.c' line='2892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyMonitoring_FireStopIterationEvent'>\r
-      <parameter type-id='type-id-1753' name='state' filepath='Python/instrumentation.c' line='2892' column='1'/>\r
+      <parameter type-id='type-id-1751' name='state' filepath='Python/instrumentation.c' line='2892' column='1'/>\r
       <parameter type-id='type-id-6' name='codelike' filepath='Python/instrumentation.c' line='2892' column='1'/>\r
       <parameter type-id='type-id-456' name='offset' filepath='Python/instrumentation.c' line='2892' column='1'/>\r
       <parameter type-id='type-id-6' name='value' filepath='Python/instrumentation.c' line='2892' column='1'/>\r
@@ -29003,62 +29022,62 @@
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/interpconfig.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
     <function-decl name='_PyInterpreterConfig_AsDict' mangled-name='_PyInterpreterConfig_AsDict' filepath='Python/interpconfig.c' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyInterpreterConfig_AsDict'>\r
-      <parameter type-id='type-id-1684' name='config' filepath='Python/interpconfig.c' line='55' column='1'/>\r
+      <parameter type-id='type-id-1681' name='config' filepath='Python/interpconfig.c' line='55' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
     <function-decl name='_PyInterpreterConfig_InitFromDict' mangled-name='_PyInterpreterConfig_InitFromDict' filepath='Python/interpconfig.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyInterpreterConfig_InitFromDict'>\r
-      <parameter type-id='type-id-1684' name='config' filepath='Python/interpconfig.c' line='224' column='1'/>\r
+      <parameter type-id='type-id-1681' name='config' filepath='Python/interpconfig.c' line='224' column='1'/>\r
       <parameter type-id='type-id-6' name='dict' filepath='Python/interpconfig.c' line='224' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyInterpreterConfig_UpdateFromDict' mangled-name='_PyInterpreterConfig_UpdateFromDict' filepath='Python/interpconfig.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyInterpreterConfig_UpdateFromDict'>\r
-      <parameter type-id='type-id-1684' name='config' filepath='Python/interpconfig.c' line='237' column='1'/>\r
+      <parameter type-id='type-id-1681' name='config' filepath='Python/interpconfig.c' line='237' column='1'/>\r
       <parameter type-id='type-id-6' name='dict' filepath='Python/interpconfig.c' line='237' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyInterpreterConfig_InitFromState' mangled-name='_PyInterpreterConfig_InitFromState' filepath='Python/interpconfig.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyInterpreterConfig_InitFromState'>\r
-      <parameter type-id='type-id-1684' name='config' filepath='Python/interpconfig.c' line='250' column='1'/>\r
+      <parameter type-id='type-id-1681' name='config' filepath='Python/interpconfig.c' line='250' column='1'/>\r
       <parameter type-id='type-id-33' name='interp' filepath='Python/interpconfig.c' line='251' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/intrinsics.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-1754' size-in-bits='1536' id='type-id-1755'>\r
+    <array-type-def dimensions='1' type-id='type-id-1752' size-in-bits='1536' id='type-id-1753'>\r
       <subrange length='12' type-id='type-id-2' id='type-id-913'/>\r
     </array-type-def>\r
-    <array-type-def dimensions='1' type-id='type-id-1754' size-in-bits='infinite' id='type-id-1756'>\r
+    <array-type-def dimensions='1' type-id='type-id-1752' size-in-bits='infinite' id='type-id-1754'>\r
       <subrange length='infinite' id='type-id-230'/>\r
     </array-type-def>\r
-    <array-type-def dimensions='1' type-id='type-id-1757' size-in-bits='768' id='type-id-1758'>\r
+    <array-type-def dimensions='1' type-id='type-id-1755' size-in-bits='768' id='type-id-1756'>\r
       <subrange length='6' type-id='type-id-2' id='type-id-477'/>\r
     </array-type-def>\r
-    <array-type-def dimensions='1' type-id='type-id-1757' size-in-bits='infinite' id='type-id-1759'>\r
+    <array-type-def dimensions='1' type-id='type-id-1755' size-in-bits='infinite' id='type-id-1757'>\r
       <subrange length='infinite' id='type-id-230'/>\r
     </array-type-def>\r
-    <typedef-decl name='intrinsic_func1' type-id='type-id-1760' filepath='./Include/internal/pycore_intrinsics.h' line='35' column='1' id='type-id-1761'/>\r
-    <typedef-decl name='intrinsic_func2' type-id='type-id-1762' filepath='./Include/internal/pycore_intrinsics.h' line='36' column='1' id='type-id-1763'/>\r
-    <class-decl name='intrinsic_func1_info' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-1764' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='38' column='1' id='type-id-1765'>\r
+    <typedef-decl name='intrinsic_func1' type-id='type-id-1758' filepath='./Include/internal/pycore_intrinsics.h' line='35' column='1' id='type-id-1759'/>\r
+    <typedef-decl name='intrinsic_func2' type-id='type-id-1760' filepath='./Include/internal/pycore_intrinsics.h' line='36' column='1' id='type-id-1761'/>\r
+    <class-decl name='intrinsic_func1_info' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-1762' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='38' column='1' id='type-id-1763'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='func' type-id='type-id-1761' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='39' column='1'/>\r
+        <var-decl name='func' type-id='type-id-1759' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='39' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
         <var-decl name='name' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='40' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='intrinsic_func1_info' type-id='type-id-1765' filepath='./Include/internal/pycore_intrinsics.h' line='41' column='1' id='type-id-1764'/>\r
-    <class-decl name='intrinsic_func2_info' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-1766' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='43' column='1' id='type-id-1767'>\r
+    <typedef-decl name='intrinsic_func1_info' type-id='type-id-1763' filepath='./Include/internal/pycore_intrinsics.h' line='41' column='1' id='type-id-1762'/>\r
+    <class-decl name='intrinsic_func2_info' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-1764' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='43' column='1' id='type-id-1765'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='func' type-id='type-id-1763' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='44' column='1'/>\r
+        <var-decl name='func' type-id='type-id-1761' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='44' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
         <var-decl name='name' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='45' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='intrinsic_func2_info' type-id='type-id-1767' filepath='./Include/internal/pycore_intrinsics.h' line='46' column='1' id='type-id-1766'/>\r
-    <pointer-type-def type-id='type-id-1768' size-in-bits='64' id='type-id-1760'/>\r
-    <pointer-type-def type-id='type-id-1769' size-in-bits='64' id='type-id-1762'/>\r
-    <qualified-type-def type-id='type-id-1764' const='yes' id='type-id-1754'/>\r
-    <qualified-type-def type-id='type-id-1766' const='yes' id='type-id-1757'/>\r
+    <typedef-decl name='intrinsic_func2_info' type-id='type-id-1765' filepath='./Include/internal/pycore_intrinsics.h' line='46' column='1' id='type-id-1764'/>\r
+    <pointer-type-def type-id='type-id-1766' size-in-bits='64' id='type-id-1758'/>\r
+    <pointer-type-def type-id='type-id-1767' size-in-bits='64' id='type-id-1760'/>\r
+    <qualified-type-def type-id='type-id-1762' const='yes' id='type-id-1752'/>\r
+    <qualified-type-def type-id='type-id-1764' const='yes' id='type-id-1755'/>\r
     <function-decl name='_Py_set_function_type_params' filepath='./Include/internal/pycore_function.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-31'/>\r
       <parameter type-id='type-id-6'/>\r
@@ -29070,8 +29089,8 @@
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <var-decl name='_PyIntrinsics_UnaryFunctions' type-id='type-id-1756' mangled-name='_PyIntrinsics_UnaryFunctions' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='48' column='1' elf-symbol-id='_PyIntrinsics_UnaryFunctions'/>\r
-    <var-decl name='_PyIntrinsics_BinaryFunctions' type-id='type-id-1759' mangled-name='_PyIntrinsics_BinaryFunctions' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='49' column='1' elf-symbol-id='_PyIntrinsics_BinaryFunctions'/>\r
+    <var-decl name='_PyIntrinsics_UnaryFunctions' type-id='type-id-1754' mangled-name='_PyIntrinsics_UnaryFunctions' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='48' column='1' elf-symbol-id='_PyIntrinsics_UnaryFunctions'/>\r
+    <var-decl name='_PyIntrinsics_BinaryFunctions' type-id='type-id-1757' mangled-name='_PyIntrinsics_BinaryFunctions' visibility='default' filepath='./Include/internal/pycore_intrinsics.h' line='49' column='1' elf-symbol-id='_PyIntrinsics_BinaryFunctions'/>\r
     <function-decl name='_PyExc_PrepReraiseStar' filepath='./Include/internal/pycore_pyerrors.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-6'/>\r
@@ -29117,12 +29136,12 @@
       <parameter type-id='type-id-5' name='index' filepath='Python/intrinsics.c' line='281' column='1'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
-    <function-type size-in-bits='64' id='type-id-1768'>\r
+    <function-type size-in-bits='64' id='type-id-1766'>\r
       <parameter type-id='type-id-31'/>\r
       <parameter type-id='type-id-6'/>\r
       <return type-id='type-id-6'/>\r
     </function-type>\r
-    <function-type size-in-bits='64' id='type-id-1769'>\r
+    <function-type size-in-bits='64' id='type-id-1767'>\r
       <parameter type-id='type-id-31'/>\r
       <parameter type-id='type-id-6'/>\r
       <parameter type-id='type-id-6'/>\r
@@ -29130,8 +29149,8 @@
     </function-type>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/legacy_tracing.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <typedef-decl name='_PyMonitoringEventSet' type-id='type-id-322' filepath='./Include/internal/pycore_instruments.h' line='15' column='1' id='type-id-1770'/>\r
-    <pointer-type-def type-id='type-id-1770' size-in-bits='64' id='type-id-1771'/>\r
+    <typedef-decl name='_PyMonitoringEventSet' type-id='type-id-322' filepath='./Include/internal/pycore_instruments.h' line='15' column='1' id='type-id-1768'/>\r
+    <pointer-type-def type-id='type-id-1768' size-in-bits='64' id='type-id-1769'/>\r
     <function-decl name='_PyMonitoring_RegisterCallback' filepath='./Include/internal/pycore_instruments.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-5'/>\r
@@ -29140,53 +29159,53 @@
     </function-decl>\r
     <function-decl name='_PyMonitoring_SetEvents' filepath='./Include/internal/pycore_instruments.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
-      <parameter type-id='type-id-1770'/>\r
+      <parameter type-id='type-id-1768'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_SetLocalEvents' filepath='./Include/internal/pycore_instruments.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-345'/>\r
       <parameter type-id='type-id-5'/>\r
-      <parameter type-id='type-id-1770'/>\r
+      <parameter type-id='type-id-1768'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMonitoring_GetLocalEvents' filepath='./Include/internal/pycore_instruments.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-345'/>\r
       <parameter type-id='type-id-5'/>\r
-      <parameter type-id='type-id-1771'/>\r
+      <parameter type-id='type-id-1769'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/lock.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-58' size-in-bits='256' id='type-id-1772'>\r
+    <array-type-def dimensions='1' type-id='type-id-58' size-in-bits='256' id='type-id-1770'>\r
       <subrange length='32' type-id='type-id-2' id='type-id-73'/>\r
     </array-type-def>\r
-    <class-decl name='_PySeqLock' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-1773' visibility='default' filepath='./Include/internal/pycore_lock.h' line='215' column='1' id='type-id-1774'>\r
+    <class-decl name='_PySeqLock' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-1771' visibility='default' filepath='./Include/internal/pycore_lock.h' line='215' column='1' id='type-id-1772'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='sequence' type-id='type-id-322' visibility='default' filepath='./Include/internal/pycore_lock.h' line='216' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PySeqLock' type-id='type-id-1774' filepath='./Include/internal/pycore_lock.h' line='217' column='1' id='type-id-1773'/>\r
-    <typedef-decl name='_Py_unpark_fn_t' type-id='type-id-1775' filepath='./Include/internal/pycore_parking_lot.h' line='74' column='1' id='type-id-1776'/>\r
-    <class-decl name='_PySemaphore' size-in-bits='256' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_semaphore.h' line='36' column='1' id='type-id-1777'>\r
+    <typedef-decl name='_PySeqLock' type-id='type-id-1772' filepath='./Include/internal/pycore_lock.h' line='217' column='1' id='type-id-1771'/>\r
+    <typedef-decl name='_Py_unpark_fn_t' type-id='type-id-1773' filepath='./Include/internal/pycore_parking_lot.h' line='74' column='1' id='type-id-1774'/>\r
+    <class-decl name='_PySemaphore' size-in-bits='256' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_semaphore.h' line='36' column='1' id='type-id-1775'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='platform_sem' type-id='type-id-1778' visibility='default' filepath='./Include/internal/pycore_semaphore.h' line='40' column='1'/>\r
+        <var-decl name='platform_sem' type-id='type-id-1776' visibility='default' filepath='./Include/internal/pycore_semaphore.h' line='40' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PySemaphore' type-id='type-id-1777' filepath='./Include/internal/pycore_semaphore.h' line='46' column='1' id='type-id-1779'/>\r
-    <union-decl name='sem_t' size-in-bits='256' naming-typedef-id='type-id-1778' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='35' column='1' id='type-id-1780'>\r
+    <typedef-decl name='_PySemaphore' type-id='type-id-1775' filepath='./Include/internal/pycore_semaphore.h' line='46' column='1' id='type-id-1777'/>\r
+    <union-decl name='sem_t' size-in-bits='256' naming-typedef-id='type-id-1776' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='35' column='1' id='type-id-1778'>\r
       <data-member access='public'>\r
-        <var-decl name='__size' type-id='type-id-1772' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='37' column='1'/>\r
+        <var-decl name='__size' type-id='type-id-1770' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='37' column='1'/>\r
       </data-member>\r
       <data-member access='public'>\r
         <var-decl name='__align' type-id='type-id-184' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='38' column='1'/>\r
       </data-member>\r
     </union-decl>\r
-    <typedef-decl name='sem_t' type-id='type-id-1780' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='39' column='1' id='type-id-1778'/>\r
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1781'/>\r
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-1782'/>\r
-    <pointer-type-def type-id='type-id-1779' size-in-bits='64' id='type-id-1783'/>\r
-    <pointer-type-def type-id='type-id-1773' size-in-bits='64' id='type-id-1784'/>\r
-    <pointer-type-def type-id='type-id-1776' size-in-bits='64' id='type-id-1785'/>\r
+    <typedef-decl name='sem_t' type-id='type-id-1778' filepath='/usr/include/x86_64-linux-gnu/bits/semaphore.h' line='39' column='1' id='type-id-1776'/>\r
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1779'/>\r
+    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-1780'/>\r
+    <pointer-type-def type-id='type-id-1777' size-in-bits='64' id='type-id-1781'/>\r
+    <pointer-type-def type-id='type-id-1771' size-in-bits='64' id='type-id-1782'/>\r
+    <pointer-type-def type-id='type-id-1774' size-in-bits='64' id='type-id-1783'/>\r
     <function-decl name='PyTime_MonotonicRaw' mangled-name='PyTime_MonotonicRaw' filepath='./Include/cpython/pytime.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyTime_MonotonicRaw'>\r
       <parameter type-id='type-id-174'/>\r
       <return type-id='type-id-5'/>\r
@@ -29202,7 +29221,7 @@
     </function-decl>\r
     <function-decl name='_PyParkingLot_Unpark' mangled-name='_PyParkingLot_Unpark' filepath='./Include/internal/pycore_parking_lot.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyParkingLot_Unpark'>\r
       <parameter type-id='type-id-35'/>\r
-      <parameter type-id='type-id-1785'/>\r
+      <parameter type-id='type-id-1783'/>\r
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
@@ -29211,21 +29230,21 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySemaphore_Wait' mangled-name='_PySemaphore_Wait' filepath='./Include/internal/pycore_semaphore.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySemaphore_Wait'>\r
-      <parameter type-id='type-id-1783'/>\r
+      <parameter type-id='type-id-1781'/>\r
       <parameter type-id='type-id-28'/>\r
       <parameter type-id='type-id-5'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PySemaphore_Wakeup' mangled-name='_PySemaphore_Wakeup' filepath='./Include/internal/pycore_semaphore.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySemaphore_Wakeup'>\r
-      <parameter type-id='type-id-1783'/>\r
+      <parameter type-id='type-id-1781'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySemaphore_Init' mangled-name='_PySemaphore_Init' filepath='./Include/internal/pycore_semaphore.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySemaphore_Init'>\r
-      <parameter type-id='type-id-1783'/>\r
+      <parameter type-id='type-id-1781'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySemaphore_Destroy' mangled-name='_PySemaphore_Destroy' filepath='./Include/internal/pycore_semaphore.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySemaphore_Destroy'>\r
-      <parameter type-id='type-id-1783'/>\r
+      <parameter type-id='type-id-1781'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyTime_Add' filepath='./Include/internal/pycore_time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -29241,65 +29260,65 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyEvent_IsSet' mangled-name='_PyEvent_IsSet' filepath='Python/lock.c' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEvent_IsSet'>\r
-      <parameter type-id='type-id-1781' name='evt' filepath='Python/lock.c' line='247' column='1'/>\r
+      <parameter type-id='type-id-1779' name='evt' filepath='Python/lock.c' line='247' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyEvent_Notify' mangled-name='_PyEvent_Notify' filepath='Python/lock.c' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEvent_Notify'>\r
-      <parameter type-id='type-id-1781' name='evt' filepath='Python/lock.c' line='254' column='1'/>\r
+      <parameter type-id='type-id-1779' name='evt' filepath='Python/lock.c' line='254' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyEvent_Wait' mangled-name='PyEvent_Wait' filepath='Python/lock.c' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEvent_Wait'>\r
-      <parameter type-id='type-id-1781' name='evt' filepath='Python/lock.c' line='272' column='1'/>\r
+      <parameter type-id='type-id-1779' name='evt' filepath='Python/lock.c' line='272' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyEvent_WaitTimed' mangled-name='PyEvent_WaitTimed' filepath='Python/lock.c' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEvent_WaitTimed'>\r
-      <parameter type-id='type-id-1781' name='evt' filepath='Python/lock.c' line='279' column='1'/>\r
+      <parameter type-id='type-id-1779' name='evt' filepath='Python/lock.c' line='279' column='1'/>\r
       <parameter type-id='type-id-28' name='timeout_ns' filepath='Python/lock.c' line='279' column='1'/>\r
       <parameter type-id='type-id-5' name='detach' filepath='Python/lock.c' line='279' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyRWMutex_RLock' mangled-name='_PyRWMutex_RLock' filepath='Python/lock.c' line='455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyRWMutex_RLock'>\r
-      <parameter type-id='type-id-1782' name='rwmutex' filepath='Python/lock.c' line='455' column='1'/>\r
+      <parameter type-id='type-id-1780' name='rwmutex' filepath='Python/lock.c' line='455' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyRWMutex_RUnlock' mangled-name='_PyRWMutex_RUnlock' filepath='Python/lock.c' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyRWMutex_RUnlock'>\r
-      <parameter type-id='type-id-1782' name='rwmutex' filepath='Python/lock.c' line='486' column='1'/>\r
+      <parameter type-id='type-id-1780' name='rwmutex' filepath='Python/lock.c' line='486' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyRWMutex_Lock' mangled-name='_PyRWMutex_Lock' filepath='Python/lock.c' line='499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyRWMutex_Lock'>\r
-      <parameter type-id='type-id-1782' name='rwmutex' filepath='Python/lock.c' line='499' column='1'/>\r
+      <parameter type-id='type-id-1780' name='rwmutex' filepath='Python/lock.c' line='499' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyRWMutex_Unlock' mangled-name='_PyRWMutex_Unlock' filepath='Python/lock.c' line='520' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyRWMutex_Unlock'>\r
-      <parameter type-id='type-id-1782' name='rwmutex' filepath='Python/lock.c' line='520' column='1'/>\r
+      <parameter type-id='type-id-1780' name='rwmutex' filepath='Python/lock.c' line='520' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_LockWrite' mangled-name='_PySeqLock_LockWrite' filepath='Python/lock.c' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_LockWrite'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='534' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='534' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_AbandonWrite' mangled-name='_PySeqLock_AbandonWrite' filepath='Python/lock.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_AbandonWrite'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='555' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='555' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_UnlockWrite' mangled-name='_PySeqLock_UnlockWrite' filepath='Python/lock.c' line='562' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_UnlockWrite'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='562' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='562' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_BeginRead' mangled-name='_PySeqLock_BeginRead' filepath='Python/lock.c' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_BeginRead'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='569' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='569' column='1'/>\r
       <return type-id='type-id-322'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_EndRead' mangled-name='_PySeqLock_EndRead' filepath='Python/lock.c' line='580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_EndRead'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='580' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='580' column='1'/>\r
       <parameter type-id='type-id-322' name='previous' filepath='Python/lock.c' line='580' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PySeqLock_AfterFork' mangled-name='_PySeqLock_AfterFork' filepath='Python/lock.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySeqLock_AfterFork'>\r
-      <parameter type-id='type-id-1784' name='seqlock' filepath='Python/lock.c' line='595' column='1'/>\r
+      <parameter type-id='type-id-1782' name='seqlock' filepath='Python/lock.c' line='595' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-type size-in-bits='64' id='type-id-1775'>\r
+    <function-type size-in-bits='64' id='type-id-1773'>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-5'/>\r
@@ -29307,18 +29326,18 @@
     </function-type>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/marshal.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-546' size-in-bits='192' id='type-id-1786'>\r
+    <array-type-def dimensions='1' type-id='type-id-546' size-in-bits='192' id='type-id-1784'>\r
       <subrange length='3' type-id='type-id-2' id='type-id-885'/>\r
     </array-type-def>\r
-    <class-decl name='stat' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='26' column='1' id='type-id-1787'>\r
+    <class-decl name='stat' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='26' column='1' id='type-id-1785'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='st_dev' type-id='type-id-187' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='31' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
-        <var-decl name='st_ino' type-id='type-id-1788' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='36' column='1'/>\r
+        <var-decl name='st_ino' type-id='type-id-1786' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='36' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
-        <var-decl name='st_nlink' type-id='type-id-1789' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='44' column='1'/>\r
+        <var-decl name='st_nlink' type-id='type-id-1787' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='44' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='192'>\r
         <var-decl name='st_mode' type-id='type-id-117' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='45' column='1'/>\r
@@ -29339,10 +29358,10 @@
         <var-decl name='st_size' type-id='type-id-1435' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='57' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='448'>\r
-        <var-decl name='st_blksize' type-id='type-id-1790' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='61' column='1'/>\r
+        <var-decl name='st_blksize' type-id='type-id-1788' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='61' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='512'>\r
-        <var-decl name='st_blocks' type-id='type-id-1791' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='63' column='1'/>\r
+        <var-decl name='st_blocks' type-id='type-id-1789' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='63' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='576'>\r
         <var-decl name='st_atim' type-id='type-id-110' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='74' column='1'/>\r
@@ -29354,16 +29373,16 @@
         <var-decl name='st_ctim' type-id='type-id-110' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='76' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='960'>\r
-        <var-decl name='__glibc_reserved' type-id='type-id-1786' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='89' column='1'/>\r
+        <var-decl name='__glibc_reserved' type-id='type-id-1784' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/struct_stat.h' line='89' column='1'/>\r
       </data-member>\r
     </class-decl>\r
     <typedef-decl name='__gid_t' type-id='type-id-105' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='147' column='1' id='type-id-115'/>\r
-    <typedef-decl name='__ino_t' type-id='type-id-2' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='148' column='1' id='type-id-1788'/>\r
+    <typedef-decl name='__ino_t' type-id='type-id-2' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='148' column='1' id='type-id-1786'/>\r
     <typedef-decl name='__mode_t' type-id='type-id-105' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='150' column='1' id='type-id-117'/>\r
-    <typedef-decl name='__nlink_t' type-id='type-id-2' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='151' column='1' id='type-id-1789'/>\r
-    <typedef-decl name='__blksize_t' type-id='type-id-184' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='175' column='1' id='type-id-1790'/>\r
-    <typedef-decl name='__blkcnt_t' type-id='type-id-184' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='180' column='1' id='type-id-1791'/>\r
-    <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-64'/>\r
+    <typedef-decl name='__nlink_t' type-id='type-id-2' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='151' column='1' id='type-id-1787'/>\r
+    <typedef-decl name='__blksize_t' type-id='type-id-184' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='175' column='1' id='type-id-1788'/>\r
+    <typedef-decl name='__blkcnt_t' type-id='type-id-184' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='180' column='1' id='type-id-1789'/>\r
+    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-64'/>\r
     <function-decl name='_Py_fstat_noraise' mangled-name='_Py_fstat_noraise' filepath='./Include/internal/pycore_fileutils.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_fstat_noraise'>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-64'/>\r
@@ -29465,21 +29484,21 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/parking_lot.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_PyRawMutex' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-1792' visibility='default' filepath='./Include/internal/pycore_lock.h' line='104' column='1' id='type-id-1793'>\r
+    <class-decl name='_PyRawMutex' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-1790' visibility='default' filepath='./Include/internal/pycore_lock.h' line='104' column='1' id='type-id-1791'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='v' type-id='type-id-369' visibility='default' filepath='./Include/internal/pycore_lock.h' line='105' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyRawMutex' type-id='type-id-1793' filepath='./Include/internal/pycore_lock.h' line='106' column='1' id='type-id-1792'/>\r
-    <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-1794'/>\r
-    <pointer-type-def type-id='type-id-1778' size-in-bits='64' id='type-id-1795'/>\r
-    <qualified-type-def type-id='type-id-1795' restrict='yes' id='type-id-1796'/>\r
+    <typedef-decl name='_PyRawMutex' type-id='type-id-1791' filepath='./Include/internal/pycore_lock.h' line='106' column='1' id='type-id-1790'/>\r
+    <pointer-type-def type-id='type-id-1790' size-in-bits='64' id='type-id-1792'/>\r
+    <pointer-type-def type-id='type-id-1776' size-in-bits='64' id='type-id-1793'/>\r
+    <qualified-type-def type-id='type-id-1793' restrict='yes' id='type-id-1794'/>\r
     <function-decl name='_PyRawMutex_LockSlow' filepath='./Include/internal/pycore_lock.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1794'/>\r
+      <parameter type-id='type-id-1792'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyRawMutex_UnlockSlow' filepath='./Include/internal/pycore_lock.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1794'/>\r
+      <parameter type-id='type-id-1792'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyTime_AsTimespec_clamp' mangled-name='_PyTime_AsTimespec_clamp' filepath='./Include/internal/pycore_time.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyTime_AsTimespec_clamp'>\r
@@ -29488,30 +29507,30 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='sem_init' filepath='/usr/include/semaphore.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1795'/>\r
+      <parameter type-id='type-id-1793'/>\r
       <parameter type-id='type-id-5'/>\r
       <parameter type-id='type-id-105'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='sem_destroy' filepath='/usr/include/semaphore.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1795'/>\r
+      <parameter type-id='type-id-1793'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='sem_wait' filepath='/usr/include/semaphore.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1795'/>\r
+      <parameter type-id='type-id-1793'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='sem_clockwait' filepath='/usr/include/semaphore.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1796'/>\r
+      <parameter type-id='type-id-1794'/>\r
       <parameter type-id='type-id-226'/>\r
       <parameter type-id='type-id-208'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='sem_post' filepath='/usr/include/semaphore.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1795'/>\r
+      <parameter type-id='type-id-1793'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
-    <function-decl name='_PyParkingLot_AfterFork' mangled-name='_PyParkingLot_AfterFork' filepath='Python/parking_lot.c' line='405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyParkingLot_AfterFork'>\r
+    <function-decl name='_PyParkingLot_AfterFork' mangled-name='_PyParkingLot_AfterFork' filepath='Python/parking_lot.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyParkingLot_AfterFork'>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
   </abi-instr>\r
@@ -29574,16 +29593,16 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/perf_jit_trampoline.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <qualified-type-def type-id='type-id-221' restrict='yes' id='type-id-1797'/>\r
-    <var-decl name='_Py_perfmap_jit_callbacks' type-id='type-id-1798' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='111' column='1'/>\r
+    <qualified-type-def type-id='type-id-221' restrict='yes' id='type-id-1795'/>\r
+    <var-decl name='_Py_perfmap_jit_callbacks' type-id='type-id-1796' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='111' column='1'/>\r
     <function-decl name='gettimeofday' filepath='/usr/include/x86_64-linux-gnu/sys/time.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1797'/>\r
+      <parameter type-id='type-id-1795'/>\r
       <parameter type-id='type-id-231'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/perf_trampoline.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <var-decl name='_Py_perfmap_callbacks' type-id='type-id-1798' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='110' column='1'/>\r
+    <var-decl name='_Py_perfmap_callbacks' type-id='type-id-1796' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='110' column='1'/>\r
     <function-decl name='getppid' filepath='/usr/include/unistd.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <return type-id='type-id-178'/>\r
     </function-decl>\r
@@ -29597,7 +29616,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/preconfig.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <enum-decl name='PyMemAllocatorName' naming-typedef-id='type-id-1799' filepath='./Include/cpython/pymem.h' line='16' column='1' id='type-id-1800'>\r
+    <enum-decl name='PyMemAllocatorName' naming-typedef-id='type-id-1797' filepath='./Include/cpython/pymem.h' line='16' column='1' id='type-id-1798'>\r
       <underlying-type type-id='type-id-37'/>\r
       <enumerator name='PYMEM_ALLOCATOR_NOT_SET' value='0'/>\r
       <enumerator name='PYMEM_ALLOCATOR_DEFAULT' value='1'/>\r
@@ -29609,23 +29628,23 @@
       <enumerator name='PYMEM_ALLOCATOR_MIMALLOC' value='7'/>\r
       <enumerator name='PYMEM_ALLOCATOR_MIMALLOC_DEBUG' value='8'/>\r
     </enum-decl>\r
-    <typedef-decl name='PyMemAllocatorName' type-id='type-id-1800' filepath='./Include/cpython/pymem.h' line='30' column='1' id='type-id-1799'/>\r
-    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-1801'/>\r
+    <typedef-decl name='PyMemAllocatorName' type-id='type-id-1798' filepath='./Include/cpython/pymem.h' line='30' column='1' id='type-id-1797'/>\r
+    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-1799'/>\r
     <var-decl name='Py_FileSystemDefaultEncoding' type-id='type-id-4' mangled-name='Py_FileSystemDefaultEncoding' visibility='default' filepath='./Include/fileobject.h' line='22' column='1' elf-symbol-id='Py_FileSystemDefaultEncoding'/>\r
     <var-decl name='Py_FileSystemDefaultEncodeErrors' type-id='type-id-4' mangled-name='Py_FileSystemDefaultEncodeErrors' visibility='default' filepath='./Include/fileobject.h' line='24' column='1' elf-symbol-id='Py_FileSystemDefaultEncodeErrors'/>\r
     <var-decl name='Py_HasFileSystemDefaultEncoding' type-id='type-id-5' mangled-name='Py_HasFileSystemDefaultEncoding' visibility='default' filepath='./Include/fileobject.h' line='26' column='1' elf-symbol-id='Py_HasFileSystemDefaultEncoding'/>\r
     <var-decl name='_Py_HasFileSystemDefaultEncodeErrors' type-id='type-id-5' visibility='default' filepath='./Include/internal/pycore_fileutils.h' line='193' column='1'/>\r
     <function-decl name='_PyWideStringList_Clear' filepath='./Include/internal/pycore_initconfig.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1739'/>\r
+      <parameter type-id='type-id-1737'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyWideStringList_Copy' filepath='./Include/internal/pycore_initconfig.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1739'/>\r
+      <parameter type-id='type-id-1737'/>\r
       <parameter type-id='type-id-239'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyWideStringList_Extend' filepath='./Include/internal/pycore_initconfig.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1739'/>\r
+      <parameter type-id='type-id-1737'/>\r
       <parameter type-id='type-id-239'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
@@ -29643,11 +29662,11 @@
     </function-decl>\r
     <function-decl name='_PyMem_GetAllocatorName' filepath='./Include/internal/pycore_pymem.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-4'/>\r
-      <parameter type-id='type-id-1801'/>\r
+      <parameter type-id='type-id-1799'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyMem_SetupAllocators' filepath='./Include/internal/pycore_pymem.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1799'/>\r
+      <parameter type-id='type-id-1797'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -29657,36 +29676,36 @@
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_InitCompatConfig' mangled-name='_PyPreConfig_InitCompatConfig' filepath='Python/preconfig.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyPreConfig_InitCompatConfig'>\r
-      <parameter type-id='type-id-1738' name='config' filepath='Python/preconfig.c' line='284' column='1'/>\r
+      <parameter type-id='type-id-1736' name='config' filepath='Python/preconfig.c' line='284' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyPreConfig_InitPythonConfig' mangled-name='PyPreConfig_InitPythonConfig' filepath='Python/preconfig.c' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyPreConfig_InitPythonConfig'>\r
-      <parameter type-id='type-id-1738' name='config' filepath='Python/preconfig.c' line='312' column='1'/>\r
+      <parameter type-id='type-id-1736' name='config' filepath='Python/preconfig.c' line='312' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/pyctype.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-452' size-in-bits='2048' id='type-id-1802'>\r
+    <array-type-def dimensions='1' type-id='type-id-452' size-in-bits='2048' id='type-id-1800'>\r
       <subrange length='256' type-id='type-id-2' id='type-id-75'/>\r
     </array-type-def>\r
-    <array-type-def dimensions='1' type-id='type-id-1803' size-in-bits='8192' id='type-id-1804'>\r
+    <array-type-def dimensions='1' type-id='type-id-1801' size-in-bits='8192' id='type-id-1802'>\r
       <subrange length='256' type-id='type-id-2' id='type-id-75'/>\r
     </array-type-def>\r
-    <qualified-type-def type-id='type-id-105' const='yes' id='type-id-1803'/>\r
-    <var-decl name='_Py_ctype_table' type-id='type-id-1804' mangled-name='_Py_ctype_table' visibility='default' filepath='./Include/cpython/pyctype.h' line='16' column='1' elf-symbol-id='_Py_ctype_table'/>\r
-    <var-decl name='_Py_ctype_tolower' type-id='type-id-1802' mangled-name='_Py_ctype_tolower' visibility='default' filepath='./Include/cpython/pyctype.h' line='29' column='1' elf-symbol-id='_Py_ctype_tolower'/>\r
-    <var-decl name='_Py_ctype_toupper' type-id='type-id-1802' mangled-name='_Py_ctype_toupper' visibility='default' filepath='./Include/cpython/pyctype.h' line='30' column='1' elf-symbol-id='_Py_ctype_toupper'/>\r
+    <qualified-type-def type-id='type-id-105' const='yes' id='type-id-1801'/>\r
+    <var-decl name='_Py_ctype_table' type-id='type-id-1802' mangled-name='_Py_ctype_table' visibility='default' filepath='./Include/cpython/pyctype.h' line='16' column='1' elf-symbol-id='_Py_ctype_table'/>\r
+    <var-decl name='_Py_ctype_tolower' type-id='type-id-1800' mangled-name='_Py_ctype_tolower' visibility='default' filepath='./Include/cpython/pyctype.h' line='29' column='1' elf-symbol-id='_Py_ctype_tolower'/>\r
+    <var-decl name='_Py_ctype_toupper' type-id='type-id-1800' mangled-name='_Py_ctype_toupper' visibility='default' filepath='./Include/cpython/pyctype.h' line='30' column='1' elf-symbol-id='_Py_ctype_toupper'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/pyhash.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <array-type-def dimensions='1' type-id='type-id-95' size-in-bits='128' id='type-id-1805'>\r
+    <array-type-def dimensions='1' type-id='type-id-95' size-in-bits='128' id='type-id-1803'>\r
       <subrange length='16' type-id='type-id-2' id='type-id-70'/>\r
     </array-type-def>\r
-    <array-type-def dimensions='1' type-id='type-id-95' size-in-bits='192' id='type-id-1806'>\r
+    <array-type-def dimensions='1' type-id='type-id-95' size-in-bits='192' id='type-id-1804'>\r
       <subrange length='24' type-id='type-id-2' id='type-id-859'/>\r
     </array-type-def>\r
-    <class-decl name='PyHash_FuncDef' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1807' visibility='default' filepath='./Include/cpython/pyhash.h' line='34' column='1' id='type-id-1808'>\r
+    <class-decl name='PyHash_FuncDef' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1805' visibility='default' filepath='./Include/cpython/pyhash.h' line='34' column='1' id='type-id-1806'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='hash' type-id='type-id-1809' visibility='default' filepath='./Include/cpython/pyhash.h' line='35' column='1'/>\r
+        <var-decl name='hash' type-id='type-id-1807' visibility='default' filepath='./Include/cpython/pyhash.h' line='35' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='64'>\r
         <var-decl name='name' type-id='type-id-4' visibility='default' filepath='./Include/cpython/pyhash.h' line='36' column='1'/>\r
@@ -29698,25 +29717,25 @@
         <var-decl name='seed_bits' type-id='type-id-275' visibility='default' filepath='./Include/cpython/pyhash.h' line='38' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='PyHash_FuncDef' type-id='type-id-1808' filepath='./Include/cpython/pyhash.h' line='39' column='1' id='type-id-1807'/>\r
-    <union-decl name='_Py_HashSecret_t' size-in-bits='192' naming-typedef-id='type-id-1810' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='42' column='1' id='type-id-1811'>\r
+    <typedef-decl name='PyHash_FuncDef' type-id='type-id-1806' filepath='./Include/cpython/pyhash.h' line='39' column='1' id='type-id-1805'/>\r
+    <union-decl name='_Py_HashSecret_t' size-in-bits='192' naming-typedef-id='type-id-1808' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='42' column='1' id='type-id-1809'>\r
       <data-member access='public'>\r
-        <var-decl name='uc' type-id='type-id-1806' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='44' column='1'/>\r
+        <var-decl name='uc' type-id='type-id-1804' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='44' column='1'/>\r
       </data-member>\r
       <data-member access='public'>\r
-        <var-decl name='fnv' type-id='type-id-1812' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='49' column='1'/>\r
+        <var-decl name='fnv' type-id='type-id-1810' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='49' column='1'/>\r
       </data-member>\r
       <data-member access='public'>\r
-        <var-decl name='siphash' type-id='type-id-1813' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='54' column='1'/>\r
+        <var-decl name='siphash' type-id='type-id-1811' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='54' column='1'/>\r
       </data-member>\r
       <data-member access='public'>\r
-        <var-decl name='djbx33a' type-id='type-id-1814' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='59' column='1'/>\r
+        <var-decl name='djbx33a' type-id='type-id-1812' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='59' column='1'/>\r
       </data-member>\r
       <data-member access='public'>\r
-        <var-decl name='expat' type-id='type-id-1815' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='63' column='1'/>\r
+        <var-decl name='expat' type-id='type-id-1813' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='63' column='1'/>\r
       </data-member>\r
     </union-decl>\r
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='46' column='1' id='type-id-1812'>\r
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='46' column='1' id='type-id-1810'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='prefix' type-id='type-id-304' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='47' column='1'/>\r
       </data-member>\r
@@ -29724,7 +29743,7 @@
         <var-decl name='suffix' type-id='type-id-304' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='48' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='51' column='1' id='type-id-1813'>\r
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='51' column='1' id='type-id-1811'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='k0' type-id='type-id-111' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='52' column='1'/>\r
       </data-member>\r
@@ -29732,38 +29751,38 @@
         <var-decl name='k1' type-id='type-id-111' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='53' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='__anonymous_struct__2' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='56' column='1' id='type-id-1814'>\r
+    <class-decl name='__anonymous_struct__2' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='56' column='1' id='type-id-1812'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='padding' type-id='type-id-1805' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='57' column='1'/>\r
+        <var-decl name='padding' type-id='type-id-1803' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='57' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
         <var-decl name='suffix' type-id='type-id-304' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='58' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <class-decl name='__anonymous_struct__3' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='60' column='1' id='type-id-1815'>\r
+    <class-decl name='__anonymous_struct__3' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='60' column='1' id='type-id-1813'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
-        <var-decl name='padding' type-id='type-id-1805' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='61' column='1'/>\r
+        <var-decl name='padding' type-id='type-id-1803' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='61' column='1'/>\r
       </data-member>\r
       <data-member access='public' layout-offset-in-bits='128'>\r
         <var-decl name='hashsalt' type-id='type-id-304' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='62' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_Py_HashSecret_t' type-id='type-id-1811' filepath='./Include/internal/pycore_pyhash.h' line='64' column='1' id='type-id-1810'/>\r
-    <pointer-type-def type-id='type-id-1807' size-in-bits='64' id='type-id-1816'/>\r
-    <pointer-type-def type-id='type-id-1817' size-in-bits='64' id='type-id-1818'/>\r
-    <qualified-type-def type-id='type-id-1818' const='yes' id='type-id-1809'/>\r
-    <var-decl name='_Py_HashSecret' type-id='type-id-1810' mangled-name='_Py_HashSecret' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='67' column='1' elf-symbol-id='_Py_HashSecret'/>\r
+    <typedef-decl name='_Py_HashSecret_t' type-id='type-id-1809' filepath='./Include/internal/pycore_pyhash.h' line='64' column='1' id='type-id-1808'/>\r
+    <pointer-type-def type-id='type-id-1805' size-in-bits='64' id='type-id-1814'/>\r
+    <pointer-type-def type-id='type-id-1815' size-in-bits='64' id='type-id-1816'/>\r
+    <qualified-type-def type-id='type-id-1816' const='yes' id='type-id-1807'/>\r
+    <var-decl name='_Py_HashSecret' type-id='type-id-1808' mangled-name='_Py_HashSecret' visibility='default' filepath='./Include/internal/pycore_pyhash.h' line='67' column='1' elf-symbol-id='_Py_HashSecret'/>\r
     <function-decl name='PyHash_GetFuncDef' mangled-name='PyHash_GetFuncDef' filepath='Python/pyhash.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyHash_GetFuncDef'>\r
-      <return type-id='type-id-1816'/>\r
+      <return type-id='type-id-1814'/>\r
     </function-decl>\r
-    <function-type size-in-bits='64' id='type-id-1817'>\r
+    <function-type size-in-bits='64' id='type-id-1815'>\r
       <parameter type-id='type-id-35'/>\r
       <parameter type-id='type-id-7'/>\r
       <return type-id='type-id-304'/>\r
     </function-type>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/pylifecycle.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_PyPerf_Callbacks' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1798' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='92' column='1' id='type-id-1819'>\r
+    <class-decl name='_PyPerf_Callbacks' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1796' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='92' column='1' id='type-id-1817'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='init_state' type-id='type-id-1241' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='94' column='1'/>\r
       </data-member>\r
@@ -29774,17 +29793,17 @@
         <var-decl name='free_state' type-id='type-id-255' visibility='default' filepath='./Include/internal/pycore_ceval.h' line='99' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_PyPerf_Callbacks' type-id='type-id-1819' filepath='./Include/internal/pycore_ceval.h' line='100' column='1' id='type-id-1798'/>\r
-    <typedef-decl name='PyOS_sighandler_t' type-id='type-id-1414' filepath='./Include/pylifecycle.h' line='59' column='1' id='type-id-1820'/>\r
-    <typedef-decl name='nl_item' type-id='type-id-5' filepath='/usr/include/nl_types.h' line='36' column='1' id='type-id-1821'/>\r
+    <typedef-decl name='_PyPerf_Callbacks' type-id='type-id-1817' filepath='./Include/internal/pycore_ceval.h' line='100' column='1' id='type-id-1796'/>\r
+    <typedef-decl name='PyOS_sighandler_t' type-id='type-id-1414' filepath='./Include/pylifecycle.h' line='59' column='1' id='type-id-1818'/>\r
+    <typedef-decl name='nl_item' type-id='type-id-5' filepath='/usr/include/nl_types.h' line='36' column='1' id='type-id-1819'/>\r
     <typedef-decl name='sigset_t' type-id='type-id-42' filepath='/usr/include/x86_64-linux-gnu/bits/types/sigset_t.h' line='7' column='1' id='type-id-86'/>\r
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-1822'/>\r
-    <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-238'/>\r
-    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1823'/>\r
-    <pointer-type-def type-id='type-id-1823' size-in-bits='64' id='type-id-1824'/>\r
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-1820'/>\r
+    <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-238'/>\r
+    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1821'/>\r
+    <pointer-type-def type-id='type-id-1821' size-in-bits='64' id='type-id-1822'/>\r
+    <qualified-type-def type-id='type-id-1822' restrict='yes' id='type-id-1823'/>\r
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1824'/>\r
     <qualified-type-def type-id='type-id-1824' restrict='yes' id='type-id-1825'/>\r
-    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1826'/>\r
-    <qualified-type-def type-id='type-id-1826' restrict='yes' id='type-id-1827'/>\r
     <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-57'/>\r
     <function-decl name='_PySys_ClearAuditHooks' filepath='./Include/internal/pycore_audit.h' line='29' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-31'/>\r
@@ -29954,13 +29973,13 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_InitFromConfig' filepath='./Include/internal/pycore_initconfig.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1738'/>\r
+      <parameter type-id='type-id-1736'/>\r
       <parameter type-id='type-id-240'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_Read' filepath='./Include/internal/pycore_initconfig.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1738'/>\r
-      <parameter type-id='type-id-1745'/>\r
+      <parameter type-id='type-id-1736'/>\r
+      <parameter type-id='type-id-1743'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyPreConfig_Write' filepath='./Include/internal/pycore_initconfig.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -29992,7 +30011,7 @@
     </function-decl>\r
     <function-decl name='_PyInterpreterState_New' mangled-name='_PyInterpreterState_New' filepath='./Include/internal/pycore_interp.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyInterpreterState_New'>\r
       <parameter type-id='type-id-31'/>\r
-      <parameter type-id='type-id-1822'/>\r
+      <parameter type-id='type-id-1820'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyInterpolation_InitTypes' filepath='./Include/internal/pycore_interpolation.h' line='19' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30340,7 +30359,7 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1821'/>\r
+      <parameter type-id='type-id-1819'/>\r
       <return type-id='type-id-17'/>\r
     </function-decl>\r
     <function-decl name='sigemptyset' filepath='/usr/include/signal.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30349,8 +30368,8 @@
     </function-decl>\r
     <function-decl name='sigaction' filepath='/usr/include/signal.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-5'/>\r
+      <parameter type-id='type-id-1823'/>\r
       <parameter type-id='type-id-1825'/>\r
-      <parameter type-id='type-id-1827'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30415,19 +30434,19 @@
     </function-decl>\r
     <function-decl name='PyOS_getsig' mangled-name='PyOS_getsig' filepath='Python/pylifecycle.c' line='3557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyOS_getsig'>\r
       <parameter type-id='type-id-5' name='sig' filepath='Python/pylifecycle.c' line='3557' column='1'/>\r
-      <return type-id='type-id-1820'/>\r
+      <return type-id='type-id-1818'/>\r
     </function-decl>\r
     <function-decl name='PyOS_setsig' mangled-name='PyOS_setsig' filepath='Python/pylifecycle.c' line='3596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyOS_setsig'>\r
       <parameter type-id='type-id-5' name='sig' filepath='Python/pylifecycle.c' line='3596' column='1'/>\r
-      <parameter type-id='type-id-1820' name='handler' filepath='Python/pylifecycle.c' line='3596' column='1'/>\r
-      <return type-id='type-id-1820'/>\r
+      <parameter type-id='type-id-1818' name='handler' filepath='Python/pylifecycle.c' line='3596' column='1'/>\r
+      <return type-id='type-id-1818'/>\r
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/pystate.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-1828'/>\r
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1829'/>\r
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1830'/>\r
-    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1831'/>\r
+    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-1826'/>\r
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1827'/>\r
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1828'/>\r
+    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1829'/>\r
     <function-decl name='_PyEval_InitState' filepath='./Include/internal/pycore_ceval.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-33'/>\r
       <return type-id='type-id-3'/>\r
@@ -30447,7 +30466,7 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyGC_InitState' filepath='./Include/internal/pycore_gc.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1830'/>\r
+      <parameter type-id='type-id-1828'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyImport_ClearCore' filepath='./Include/internal/pycore_import.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30509,7 +30528,7 @@
     </function-decl>\r
     <var-decl name='_Py_tss_tstate' type-id='type-id-31' visibility='default' filepath='./Include/internal/pycore_pystate.h' line='92' column='1'/>\r
     <function-decl name='_PyThread_AfterFork' filepath='./Include/internal/pycore_pythread.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1831'/>\r
+      <parameter type-id='type-id-1829'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyThread_hang_thread' filepath='./Include/internal/pycore_pythread.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30520,7 +30539,7 @@
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='_PyTime_Init' filepath='./Include/internal/pycore_time.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1829'/>\r
+      <parameter type-id='type-id-1827'/>\r
       <return type-id='type-id-66'/>\r
     </function-decl>\r
     <function-decl name='_PyTypes_AfterFork' filepath='./Include/internal/pycore_typeobject.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -30533,24 +30552,24 @@
       <return type-id='type-id-2'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_is_created' mangled-name='PyThread_tss_is_created' filepath='./Include/pythread.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_is_created'>\r
-      <parameter type-id='type-id-1828'/>\r
+      <parameter type-id='type-id-1826'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_create' mangled-name='PyThread_tss_create' filepath='./Include/pythread.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_create'>\r
-      <parameter type-id='type-id-1828'/>\r
+      <parameter type-id='type-id-1826'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_delete' mangled-name='PyThread_tss_delete' filepath='./Include/pythread.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_delete'>\r
-      <parameter type-id='type-id-1828'/>\r
+      <parameter type-id='type-id-1826'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_set' mangled-name='PyThread_tss_set' filepath='./Include/pythread.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_set'>\r
-      <parameter type-id='type-id-1828'/>\r
+      <parameter type-id='type-id-1826'/>\r
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_get' mangled-name='PyThread_tss_get' filepath='./Include/pythread.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_get'>\r
-      <parameter type-id='type-id-1828'/>\r
+      <parameter type-id='type-id-1826'/>\r
       <return type-id='type-id-35'/>\r
     </function-decl>\r
     <function-decl name='_PyThreadState_GetCurrent' mangled-name='_PyThreadState_GetCurrent' filepath='Python/pystate.c' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyThreadState_GetCurrent'>\r
@@ -30858,7 +30877,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/pytime.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_Py_clock_info_t' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1832' visibility='default' filepath='./Include/internal/pycore_time.h' line='246' column='1' id='type-id-1833'>\r
+    <class-decl name='_Py_clock_info_t' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-1830' visibility='default' filepath='./Include/internal/pycore_time.h' line='246' column='1' id='type-id-1831'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='implementation' type-id='type-id-4' visibility='default' filepath='./Include/internal/pycore_time.h' line='247' column='1'/>\r
       </data-member>\r
@@ -30872,7 +30891,7 @@
         <var-decl name='resolution' type-id='type-id-172' visibility='default' filepath='./Include/internal/pycore_time.h' line='250' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_Py_clock_info_t' type-id='type-id-1833' filepath='./Include/internal/pycore_time.h' line='251' column='1' id='type-id-1832'/>\r
+    <typedef-decl name='_Py_clock_info_t' type-id='type-id-1831' filepath='./Include/internal/pycore_time.h' line='251' column='1' id='type-id-1830'/>\r
     <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_tm.h' line='7' column='1' id='type-id-217'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='tm_sec' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_tm.h' line='9' column='1'/>\r
@@ -30909,22 +30928,22 @@
       </data-member>\r
     </class-decl>\r
     <typedef-decl name='time_t' type-id='type-id-544' filepath='/usr/include/x86_64-linux-gnu/bits/types/time_t.h' line='10' column='1' id='type-id-224'/>\r
-    <pointer-type-def type-id='type-id-1832' size-in-bits='64' id='type-id-222'/>\r
-    <qualified-type-def type-id='type-id-224' const='yes' id='type-id-1834'/>\r
-    <pointer-type-def type-id='type-id-1834' size-in-bits='64' id='type-id-1835'/>\r
-    <qualified-type-def type-id='type-id-1835' restrict='yes' id='type-id-1836'/>\r
+    <pointer-type-def type-id='type-id-1830' size-in-bits='64' id='type-id-222'/>\r
+    <qualified-type-def type-id='type-id-224' const='yes' id='type-id-1832'/>\r
+    <pointer-type-def type-id='type-id-1832' size-in-bits='64' id='type-id-1833'/>\r
+    <qualified-type-def type-id='type-id-1833' restrict='yes' id='type-id-1834'/>\r
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-223'/>\r
     <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-221'/>\r
     <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-225'/>\r
-    <qualified-type-def type-id='type-id-225' restrict='yes' id='type-id-1837'/>\r
+    <qualified-type-def type-id='type-id-225' restrict='yes' id='type-id-1835'/>\r
     <function-decl name='gmtime_r' filepath='/usr/include/time.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1836'/>\r
-      <parameter type-id='type-id-1837'/>\r
+      <parameter type-id='type-id-1834'/>\r
+      <parameter type-id='type-id-1835'/>\r
       <return type-id='type-id-225'/>\r
     </function-decl>\r
     <function-decl name='localtime_r' filepath='/usr/include/time.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1836'/>\r
-      <parameter type-id='type-id-1837'/>\r
+      <parameter type-id='type-id-1834'/>\r
+      <parameter type-id='type-id-1835'/>\r
       <return type-id='type-id-225'/>\r
     </function-decl>\r
     <function-decl name='clock_getres' filepath='/usr/include/time.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -31055,7 +31074,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/remote_debugging.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_iovec.h' line='26' column='1' id='type-id-1838'>\r
+    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_iovec.h' line='26' column='1' id='type-id-1836'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='iov_base' type-id='type-id-35' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_iovec.h' line='28' column='1'/>\r
       </data-member>\r
@@ -31064,8 +31083,8 @@
       </data-member>\r
     </class-decl>\r
     <typedef-decl name='pid_t' type-id='type-id-178' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='97' column='1' id='type-id-85'/>\r
-    <qualified-type-def type-id='type-id-1838' const='yes' id='type-id-1839'/>\r
-    <pointer-type-def type-id='type-id-1839' size-in-bits='64' id='type-id-189'/>\r
+    <qualified-type-def type-id='type-id-1836' const='yes' id='type-id-1837'/>\r
+    <pointer-type-def type-id='type-id-1837' size-in-bits='64' id='type-id-189'/>\r
     <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
@@ -31089,7 +31108,7 @@
     </function-decl>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/specialize.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='_PyCode8' size-in-bits='1728' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_code.h' line='520' column='1' id='type-id-1840'>\r
+    <class-decl name='_PyCode8' size-in-bits='1728' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_code.h' line='520' column='1' id='type-id-1838'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='ob_base' type-id='type-id-254' visibility='default' filepath='./Include/internal/pycore_code.h' line='520' column='1'/>\r
       </data-member>\r
@@ -31184,10 +31203,10 @@
         <var-decl name='co_code_adaptive' type-id='type-id-866' visibility='default' filepath='./Include/internal/pycore_code.h' line='520' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='_py_validate_type' type-id='type-id-1028' filepath='./Include/internal/pycore_typeobject.h' line='144' column='1' id='type-id-1841'/>\r
-    <qualified-type-def type-id='type-id-1840' const='yes' id='type-id-1842'/>\r
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-1843'/>\r
-    <var-decl name='_Py_InitCleanup' type-id='type-id-1842' mangled-name='_Py_InitCleanup' visibility='default' filepath='./Include/internal/pycore_code.h' line='522' column='1' elf-symbol-id='_Py_InitCleanup'/>\r
+    <typedef-decl name='_py_validate_type' type-id='type-id-1028' filepath='./Include/internal/pycore_typeobject.h' line='144' column='1' id='type-id-1839'/>\r
+    <qualified-type-def type-id='type-id-1838' const='yes' id='type-id-1840'/>\r
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-1841'/>\r
+    <var-decl name='_Py_InitCleanup' type-id='type-id-1840' mangled-name='_Py_InitCleanup' visibility='default' filepath='./Include/internal/pycore_code.h' line='522' column='1' elf-symbol-id='_Py_InitCleanup'/>\r
     <function-decl name='_PyDict_GetKeysVersionForCurrentState' filepath='./Include/internal/pycore_dict.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-33'/>\r
       <parameter type-id='type-id-394'/>\r
@@ -31217,7 +31236,7 @@
     <function-decl name='_PyType_LookupRefAndVersion' filepath='./Include/internal/pycore_object.h' line='891' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-1'/>\r
       <parameter type-id='type-id-6'/>\r
-      <parameter type-id='type-id-1843'/>\r
+      <parameter type-id='type-id-1841'/>\r
       <return type-id='type-id-6'/>\r
     </function-decl>\r
     <function-decl name='_PyType_CacheInitForSpecialization' filepath='./Include/internal/pycore_object.h' line='908' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -31238,8 +31257,8 @@
     </function-decl>\r
     <function-decl name='_PyType_Validate' filepath='./Include/internal/pycore_typeobject.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-1'/>\r
+      <parameter type-id='type-id-1839'/>\r
       <parameter type-id='type-id-1841'/>\r
-      <parameter type-id='type-id-1843'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='_PyType_CacheGetItemForSpecialization' filepath='./Include/internal/pycore_typeobject.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -31261,26 +31280,26 @@
     <var-decl name='PySTEntry_Type' type-id='type-id-271' visibility='default' filepath='./Include/internal/pycore_symtable.h' line='136' column='1'/>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/thread.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <typedef-decl name='PyThread_handle_t' type-id='type-id-443' filepath='./Include/internal/pycore_pythread.h' line='120' column='1' id='type-id-1844'/>\r
-    <pointer-type-def type-id='type-id-1844' size-in-bits='64' id='type-id-1845'/>\r
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1846'/>\r
-    <qualified-type-def type-id='type-id-463' const='yes' id='type-id-1847'/>\r
-    <qualified-type-def type-id='type-id-1330' const='yes' id='type-id-1848'/>\r
-    <pointer-type-def type-id='type-id-1848' size-in-bits='64' id='type-id-1849'/>\r
-    <qualified-type-def type-id='type-id-1849' restrict='yes' id='type-id-1850'/>\r
-    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-1851'/>\r
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1852'/>\r
-    <qualified-type-def type-id='type-id-1852' restrict='yes' id='type-id-1853'/>\r
-    <pointer-type-def type-id='type-id-1854' size-in-bits='64' id='type-id-1855'/>\r
-    <var-decl name='PY_TIMEOUT_MAX' type-id='type-id-1847' mangled-name='PY_TIMEOUT_MAX' visibility='default' filepath='./Include/cpython/pythread.h' line='11' column='1' elf-symbol-id='PY_TIMEOUT_MAX'/>\r
+    <typedef-decl name='PyThread_handle_t' type-id='type-id-443' filepath='./Include/internal/pycore_pythread.h' line='120' column='1' id='type-id-1842'/>\r
+    <pointer-type-def type-id='type-id-1842' size-in-bits='64' id='type-id-1843'/>\r
+    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-1844'/>\r
+    <qualified-type-def type-id='type-id-463' const='yes' id='type-id-1845'/>\r
+    <qualified-type-def type-id='type-id-1330' const='yes' id='type-id-1846'/>\r
+    <pointer-type-def type-id='type-id-1846' size-in-bits='64' id='type-id-1847'/>\r
+    <qualified-type-def type-id='type-id-1847' restrict='yes' id='type-id-1848'/>\r
+    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-1849'/>\r
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1850'/>\r
+    <qualified-type-def type-id='type-id-1850' restrict='yes' id='type-id-1851'/>\r
+    <pointer-type-def type-id='type-id-1852' size-in-bits='64' id='type-id-1853'/>\r
+    <var-decl name='PY_TIMEOUT_MAX' type-id='type-id-1845' mangled-name='PY_TIMEOUT_MAX' visibility='default' filepath='./Include/cpython/pythread.h' line='11' column='1' elf-symbol-id='PY_TIMEOUT_MAX'/>\r
     <function-decl name='_PyTime_FromMicrosecondsClamp' filepath='./Include/internal/pycore_time.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-28'/>\r
       <return type-id='type-id-28'/>\r
     </function-decl>\r
     <function-decl name='pthread_create' filepath='/usr/include/pthread.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1853'/>\r
+      <parameter type-id='type-id-1851'/>\r
       <parameter type-id='type-id-1590'/>\r
-      <parameter type-id='type-id-1855'/>\r
+      <parameter type-id='type-id-1853'/>\r
       <parameter type-id='type-id-231'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
@@ -31313,7 +31332,7 @@
     </function-decl>\r
     <function-decl name='pthread_cond_init' filepath='/usr/include/pthread.h' line='1112' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-1600'/>\r
-      <parameter type-id='type-id-1850'/>\r
+      <parameter type-id='type-id-1848'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='pthread_condattr_init' filepath='/usr/include/pthread.h' line='1194' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -31334,7 +31353,7 @@
       <return type-id='type-id-35'/>\r
     </function-decl>\r
     <function-decl name='sem_trywait' filepath='/usr/include/semaphore.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>\r
-      <parameter type-id='type-id-1795'/>\r
+      <parameter type-id='type-id-1793'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='perror' filepath='/usr/include/stdio.h' line='804' column='1' visibility='default' binding='global' size-in-bits='64'>\r
@@ -31364,7 +31383,7 @@
     <function-decl name='PyThread_ParseTimeoutArg' mangled-name='PyThread_ParseTimeoutArg' filepath='Python/thread.c' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_ParseTimeoutArg'>\r
       <parameter type-id='type-id-6' name='arg' filepath='Python/thread.c' line='98' column='1'/>\r
       <parameter type-id='type-id-5' name='blocking' filepath='Python/thread.c' line='98' column='1'/>\r
-      <parameter type-id='type-id-1851' name='timeout_p' filepath='Python/thread.c' line='98' column='1'/>\r
+      <parameter type-id='type-id-1849' name='timeout_p' filepath='Python/thread.c' line='98' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_acquire_lock_timed_with_retries' mangled-name='PyThread_acquire_lock_timed_with_retries' filepath='Python/thread.c' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_acquire_lock_timed_with_retries'>\r
@@ -31373,17 +31392,17 @@
       <return type-id='type-id-30'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_alloc' mangled-name='PyThread_tss_alloc' filepath='Python/thread.c' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_alloc'>\r
-      <return type-id='type-id-1828'/>\r
+      <return type-id='type-id-1826'/>\r
     </function-decl>\r
     <function-decl name='PyThread_tss_free' mangled-name='PyThread_tss_free' filepath='Python/thread.c' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_tss_free'>\r
-      <parameter type-id='type-id-1828' name='key' filepath='Python/thread.c' line='197' column='1'/>\r
+      <parameter type-id='type-id-1826' name='key' filepath='Python/thread.c' line='197' column='1'/>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
     <function-decl name='PyThread_start_joinable_thread' mangled-name='PyThread_start_joinable_thread' filepath='Python/thread_pthread.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_start_joinable_thread'>\r
       <parameter type-id='type-id-572' name='func' filepath='Python/thread_pthread.h' line='328' column='1'/>\r
       <parameter type-id='type-id-35' name='arg' filepath='Python/thread_pthread.h' line='328' column='1'/>\r
-      <parameter type-id='type-id-1846' name='ident' filepath='Python/thread_pthread.h' line='329' column='1'/>\r
-      <parameter type-id='type-id-1845' name='handle' filepath='Python/thread_pthread.h' line='329' column='1'/>\r
+      <parameter type-id='type-id-1844' name='ident' filepath='Python/thread_pthread.h' line='329' column='1'/>\r
+      <parameter type-id='type-id-1843' name='handle' filepath='Python/thread_pthread.h' line='329' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_start_new_thread' mangled-name='PyThread_start_new_thread' filepath='Python/thread_pthread.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_start_new_thread'>\r
@@ -31392,11 +31411,11 @@
       <return type-id='type-id-2'/>\r
     </function-decl>\r
     <function-decl name='PyThread_join_thread' mangled-name='PyThread_join_thread' filepath='Python/thread_pthread.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_join_thread'>\r
-      <parameter type-id='type-id-1844' name='th' filepath='Python/thread_pthread.h' line='352' column='1'/>\r
+      <parameter type-id='type-id-1842' name='th' filepath='Python/thread_pthread.h' line='352' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_detach_thread' mangled-name='PyThread_detach_thread' filepath='Python/thread_pthread.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_detach_thread'>\r
-      <parameter type-id='type-id-1844' name='th' filepath='Python/thread_pthread.h' line='357' column='1'/>\r
+      <parameter type-id='type-id-1842' name='th' filepath='Python/thread_pthread.h' line='357' column='1'/>\r
       <return type-id='type-id-5'/>\r
     </function-decl>\r
     <function-decl name='PyThread_exit_thread' mangled-name='PyThread_exit_thread' filepath='Python/thread_pthread.h' line='418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_exit_thread'>\r
@@ -31431,13 +31450,13 @@
     <function-decl name='PyThread_ReInitTLS' mangled-name='PyThread_ReInitTLS' filepath='Python/thread_pthread.h' line='948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThread_ReInitTLS'>\r
       <return type-id='type-id-3'/>\r
     </function-decl>\r
-    <function-type size-in-bits='64' id='type-id-1854'>\r
+    <function-type size-in-bits='64' id='type-id-1852'>\r
       <parameter type-id='type-id-35'/>\r
       <return type-id='type-id-35'/>\r
     </function-type>\r
   </abi-instr>\r
   <abi-instr address-size='64' path='Python/traceback.c' comp-dir-path='/home/runner/work/cpython/cpython' language='LANG_C11'>\r
-    <class-decl name='Dl_info' size-in-bits='256' is-struct='yes' naming-typedef-id='type-id-1856' visibility='default' filepath='/usr/include/dlfcn.h' line='90' column='1' id='type-id-1857'>\r
+    <class-decl name='Dl_info' size-in-bits='256' is-struct='yes' naming-typedef-id='type-id-1854' visibility='default' filepath='/usr/include/dlfcn.h' line='90' column='1' id='type-id-1855'>\r
       <data-member access='public' layout-offset-in-bits='0'>\r
         <var-decl name='dli_fname' type-id='type-id-4' visibility='default' filepath='/usr/include/dlfcn.h' line='92' column='1'/>\r
       </data-member>\r
@@ -31451,8 +31470,8 @@
         <var-decl name='dli_saddr' type-id='type-id-35' visibility='default' filepath='/usr/include/dlfcn.h' line='95' column='1'/>\r
       </data-member>\r
     </class-decl>\r
-    <typedef-decl name='Dl_info' type-id='type-id-1857' filepath='/usr/include/dlfcn.h' line='96' column='1' id='type-id-1856'/>\r
-    <pointer-type-def type-id='type-id-1856' size-in-bits='64' id='type-id-67'/>\r
+    <typedef-decl name='Dl_info' type-id='type-id-1855' filepath='/usr/include/dlfcn.h' line='96' column='1' id='type-id-1854'/>\r
+    <pointer-type-def type-id='type-id-1854' size-in-bits='64' id='type-id-67'/>\r
     <function-decl name='_PyObject_CallMethodFormat' filepath='./Include/internal/pycore_call.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>\r
       <parameter type-id='type-id-31'/>\r
       <parameter type-id='type-id-6'/>\r
diff --git a/Include/internal/pycore_crossinterp.h b/Include/internal/pycore_crossinterp.h
index 713ddc66ba7382c2c6af6697d0676362ef69a27b..81faffac1941719cfccd5c44f0b8b4fae81f45fe 100644 (file)
--- a/Include/internal/pycore_crossinterp.h
+++ b/Include/internal/pycore_crossinterp.h
@@ -303,10 +303,10 @@ typedef struct _excinfo {
     const char *errdisplay;
 } _PyXI_excinfo;
 
-PyAPI_FUNC(int) _PyXI_InitExcInfo(_PyXI_excinfo *info, PyObject *exc);
+PyAPI_FUNC(_PyXI_excinfo *) _PyXI_NewExcInfo(PyObject *exc);
+PyAPI_FUNC(void) _PyXI_FreeExcInfo(_PyXI_excinfo *info);
 PyAPI_FUNC(PyObject *) _PyXI_FormatExcInfo(_PyXI_excinfo *info);
 PyAPI_FUNC(PyObject *) _PyXI_ExcInfoAsObject(_PyXI_excinfo *info);
-PyAPI_FUNC(void) _PyXI_ClearExcInfo(_PyXI_excinfo *info);
 
 
 typedef enum error_code {
@@ -322,19 +322,20 @@ typedef enum error_code {
     _PyXI_ERR_NOT_SHAREABLE = -9,
 } _PyXI_errcode;
 
+typedef struct xi_failure _PyXI_failure;
 
-typedef struct _sharedexception {
-    // The originating interpreter.
-    PyInterpreterState *interp;
-    // The kind of error to propagate.
-    _PyXI_errcode code;
-    // The exception information to propagate, if applicable.
-    // This is populated only for some error codes,
-    // but always for _PyXI_ERR_UNCAUGHT_EXCEPTION.
-    _PyXI_excinfo uncaught;
-} _PyXI_error;
+PyAPI_FUNC(_PyXI_failure *) _PyXI_NewFailure(void);
+PyAPI_FUNC(void) _PyXI_FreeFailure(_PyXI_failure *);
+PyAPI_FUNC(_PyXI_errcode) _PyXI_GetFailureCode(_PyXI_failure *);
+PyAPI_FUNC(int) _PyXI_InitFailure(_PyXI_failure *, _PyXI_errcode, PyObject *);
+PyAPI_FUNC(void) _PyXI_InitFailureUTF8(
+    _PyXI_failure *,
+    _PyXI_errcode,
+    const char *);
 
-PyAPI_FUNC(PyObject *) _PyXI_ApplyError(_PyXI_error *err);
+PyAPI_FUNC(int) _PyXI_UnwrapNotShareableError(
+    PyThreadState *,
+    _PyXI_failure *);
 
 
 // A cross-interpreter session involves entering an interpreter
@@ -366,19 +367,21 @@ PyAPI_FUNC(int) _PyXI_Enter(
     _PyXI_session_result *);
 PyAPI_FUNC(int) _PyXI_Exit(
     _PyXI_session *,
-    _PyXI_errcode,
+    _PyXI_failure *,
     _PyXI_session_result *);
 
 PyAPI_FUNC(PyObject *) _PyXI_GetMainNamespace(
     _PyXI_session *,
-    _PyXI_errcode *);
+    _PyXI_failure *);
 
 PyAPI_FUNC(int) _PyXI_Preserve(
     _PyXI_session *,
     const char *,
     PyObject *,
-    _PyXI_errcode *);
-PyAPI_FUNC(PyObject *) _PyXI_GetPreserved(_PyXI_session_result *, const char *);
+    _PyXI_failure *);
+PyAPI_FUNC(PyObject *) _PyXI_GetPreserved(
+    _PyXI_session_result *,
+    const char *);
 
 
 /*************/
diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c
index 037e9544543c4d9be03d2b38eb631a649f47b2cb..fdfb3e6dd3482d7ccdd10338529f3f2af8e6667c 100644 (file)
--- a/Modules/_interpretersmodule.c
+++ b/Modules/_interpretersmodule.c
@@ -80,21 +80,11 @@ is_notshareable_raised(PyThreadState *tstate)
 }
 
 static void
-unwrap_not_shareable(PyThreadState *tstate)
+unwrap_not_shareable(PyThreadState *tstate, _PyXI_failure *failure)
 {
-    if (!is_notshareable_raised(tstate)) {
-        return;
-    }
-    PyObject *exc = _PyErr_GetRaisedException(tstate);
-    PyObject *cause = PyException_GetCause(exc);
-    if (cause != NULL) {
-        Py_DECREF(exc);
-        exc = cause;
+    if (_PyXI_UnwrapNotShareableError(tstate, failure) < 0) {
+        _PyErr_Clear(tstate);
     }
-    else {
-        assert(PyException_GetContext(exc) == NULL);
-    }
-    _PyErr_SetRaisedException(tstate, exc);
 }
 
 
@@ -532,13 +522,30 @@ _interp_call_pack(PyThreadState *tstate, struct interp_call *call,
     return 0;
 }
 
+static void
+wrap_notshareable(PyThreadState *tstate, const char *label)
+{
+    if (!is_notshareable_raised(tstate)) {
+        return;
+    }
+    assert(label != NULL && strlen(label) > 0);
+    PyObject *cause = _PyErr_GetRaisedException(tstate);
+    _PyXIData_FormatNotShareableError(tstate, "%s not shareable", label);
+    PyObject *exc = _PyErr_GetRaisedException(tstate);
+    PyException_SetCause(exc, cause);
+    _PyErr_SetRaisedException(tstate, exc);
+}
+
 static int
 _interp_call_unpack(struct interp_call *call,
                     PyObject **p_func, PyObject **p_args, PyObject **p_kwargs)
 {
+    PyThreadState *tstate = PyThreadState_Get();
+
     // Unpack the func.
     PyObject *func = _PyXIData_NewObject(call->func);
     if (func == NULL) {
+        wrap_notshareable(tstate, "func");
         return -1;
     }
     // Unpack the args.
@@ -553,6 +560,7 @@ _interp_call_unpack(struct interp_call *call,
     else {
         args = _PyXIData_NewObject(call->args);
         if (args == NULL) {
+            wrap_notshareable(tstate, "args");
             Py_DECREF(func);
             return -1;
         }
@@ -563,6 +571,7 @@ _interp_call_unpack(struct interp_call *call,
     if (call->kwargs != NULL) {
         kwargs = _PyXIData_NewObject(call->kwargs);
         if (kwargs == NULL) {
+            wrap_notshareable(tstate, "kwargs");
             Py_DECREF(func);
             Py_DECREF(args);
             return -1;
@@ -577,7 +586,7 @@ _interp_call_unpack(struct interp_call *call,
 
 static int
 _make_call(struct interp_call *call,
-           PyObject **p_result, _PyXI_errcode *p_errcode)
+           PyObject **p_result, _PyXI_failure *failure)
 {
     assert(call != NULL && call->func != NULL);
     PyThreadState *tstate = _PyThreadState_GET();
@@ -588,12 +597,10 @@ _make_call(struct interp_call *call,
         assert(func == NULL);
         assert(args == NULL);
         assert(kwargs == NULL);
-        *p_errcode = is_notshareable_raised(tstate)
-            ? _PyXI_ERR_NOT_SHAREABLE
-            : _PyXI_ERR_OTHER;
+        _PyXI_InitFailure(failure, _PyXI_ERR_OTHER, NULL);
+        unwrap_not_shareable(tstate, failure);
         return -1;
     }
-    *p_errcode = _PyXI_ERR_NO_ERROR;
 
     // Make the call.
     PyObject *resobj = PyObject_Call(func, args, kwargs);
@@ -608,17 +615,17 @@ _make_call(struct interp_call *call,
 }
 
 static int
-_run_script(_PyXIData_t *script, PyObject *ns, _PyXI_errcode *p_errcode)
+_run_script(_PyXIData_t *script, PyObject *ns, _PyXI_failure *failure)
 {
     PyObject *code = _PyXIData_NewObject(script);
     if (code == NULL) {
-        *p_errcode = _PyXI_ERR_NOT_SHAREABLE;
+        _PyXI_InitFailure(failure, _PyXI_ERR_NOT_SHAREABLE, NULL);
         return -1;
     }
     PyObject *result = PyEval_EvalCode(code, ns, ns);
     Py_DECREF(code);
     if (result == NULL) {
-        *p_errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+        _PyXI_InitFailure(failure, _PyXI_ERR_UNCAUGHT_EXCEPTION, NULL);
         return -1;
     }
     assert(result == Py_None);
@@ -644,8 +651,14 @@ _run_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
                      PyObject *shareables, struct run_result *runres)
 {
     assert(!_PyErr_Occurred(tstate));
+    int res = -1;
+    _PyXI_failure *failure = _PyXI_NewFailure();
+    if (failure == NULL) {
+        return -1;
+    }
     _PyXI_session *session = _PyXI_NewSession();
     if (session == NULL) {
+        _PyXI_FreeFailure(failure);
         return -1;
     }
     _PyXI_session_result result = {0};
@@ -655,43 +668,44 @@ _run_in_interpreter(PyThreadState *tstate, PyInterpreterState *interp,
         // If an error occured at this step, it means that interp
         // was not prepared and switched.
         _PyXI_FreeSession(session);
+        _PyXI_FreeFailure(failure);
         assert(result.excinfo == NULL);
         return -1;
     }
 
     // Run in the interpreter.
-    int res = -1;
-    _PyXI_errcode errcode = _PyXI_ERR_NO_ERROR;
     if (script != NULL) {
         assert(call == NULL);
-        PyObject *mainns = _PyXI_GetMainNamespace(session, &errcode);
+        PyObject *mainns = _PyXI_GetMainNamespace(session, failure);
         if (mainns == NULL) {
             goto finally;
         }
-        res = _run_script(script, mainns, &errcode);
+        res = _run_script(script, mainns, failure);
     }
     else {
         assert(call != NULL);
         PyObject *resobj;
-        res = _make_call(call, &resobj, &errcode);
+        res = _make_call(call, &resobj, failure);
         if (res == 0) {
-            res = _PyXI_Preserve(session, "resobj", resobj, &errcode);
+            res = _PyXI_Preserve(session, "resobj", resobj, failure);
             Py_DECREF(resobj);
             if (res < 0) {
                 goto finally;
             }
         }
     }
-    int exitres;
 
 finally:
     // Clean up and switch back.
-    exitres = _PyXI_Exit(session, errcode, &result);
+    (void)res;
+    int exitres = _PyXI_Exit(session, failure, &result);
     assert(res == 0 || exitres != 0);
     _PyXI_FreeSession(session);
+    _PyXI_FreeFailure(failure);
 
     res = exitres;
     if (_PyErr_Occurred(tstate)) {
+        // It's a directly propagated exception.
         assert(res < 0);
     }
     else if (res < 0) {
@@ -1064,7 +1078,7 @@ interp_set___main___attrs(PyObject *self, PyObject *args, PyObject *kwargs)
 
     // Clean up and switch back.
     assert(!PyErr_Occurred());
-    int res = _PyXI_Exit(session, _PyXI_ERR_NO_ERROR, NULL);
+    int res = _PyXI_Exit(session, NULL, NULL);
     _PyXI_FreeSession(session);
     assert(res == 0);
     if (res < 0) {
@@ -1124,7 +1138,7 @@ interp_exec(PyObject *self, PyObject *args, PyObject *kwds)
     // global variables.  They will be resolved against __main__.
     _PyXIData_t xidata = {0};
     if (_PyCode_GetScriptXIData(tstate, code, &xidata) < 0) {
-        unwrap_not_shareable(tstate);
+        unwrap_not_shareable(tstate, NULL);
         return NULL;
     }
 
@@ -1188,7 +1202,7 @@ interp_run_string(PyObject *self, PyObject *args, PyObject *kwds)
 
     _PyXIData_t xidata = {0};
     if (_PyCode_GetScriptXIData(tstate, script, &xidata) < 0) {
-        unwrap_not_shareable(tstate);
+        unwrap_not_shareable(tstate, NULL);
         return NULL;
     }
 
@@ -1251,7 +1265,7 @@ interp_run_func(PyObject *self, PyObject *args, PyObject *kwds)
 
     _PyXIData_t xidata = {0};
     if (_PyCode_GetScriptXIData(tstate, code, &xidata) < 0) {
-        unwrap_not_shareable(tstate);
+        unwrap_not_shareable(tstate, NULL);
         return NULL;
     }
 
@@ -1542,16 +1556,16 @@ capture_exception(PyObject *self, PyObject *args, PyObject *kwds)
     }
     PyObject *captured = NULL;
 
-    _PyXI_excinfo info = {0};
-    if (_PyXI_InitExcInfo(&info, exc) < 0) {
+    _PyXI_excinfo *info = _PyXI_NewExcInfo(exc);
+    if (info == NULL) {
         goto finally;
     }
-    captured = _PyXI_ExcInfoAsObject(&info);
+    captured = _PyXI_ExcInfoAsObject(info);
     if (captured == NULL) {
         goto finally;
     }
 
-    PyObject *formatted = _PyXI_FormatExcInfo(&info);
+    PyObject *formatted = _PyXI_FormatExcInfo(info);
     if (formatted == NULL) {
         Py_CLEAR(captured);
         goto finally;
@@ -1564,7 +1578,7 @@ capture_exception(PyObject *self, PyObject *args, PyObject *kwds)
     }
 
 finally:
-    _PyXI_ClearExcInfo(&info);
+    _PyXI_FreeExcInfo(info);
     if (exc != exc_arg) {
         if (PyErr_Occurred()) {
             PyErr_SetRaisedException(exc);
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index 5e73ab28f2b6636c5b348e6e261ce71e4c2d47e2..39c7ea698904bd0ff60c805253e8962288b7e1b5 100644 (file)
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -1324,6 +1324,12 @@ _excinfo_normalize_type(struct _excinfo_type *info,
     *p_module = module;
 }
 
+static int
+excinfo_is_set(_PyXI_excinfo *info)
+{
+    return info->type.name != NULL || info->msg != NULL;
+}
+
 static void
 _PyXI_excinfo_clear(_PyXI_excinfo *info)
 {
@@ -1485,6 +1491,11 @@ _PyXI_excinfo_Apply(_PyXI_excinfo *info, PyObject *exctype)
         if (tbexc == NULL) {
             PyErr_Clear();
         }
+        else {
+            PyErr_SetObject(exctype, tbexc);
+            Py_DECREF(tbexc);
+            return;
+        }
     }
 
     PyObject *formatted = _PyXI_excinfo_format(info);
@@ -1630,13 +1641,17 @@ error:
 }
 
 
-int
-_PyXI_InitExcInfo(_PyXI_excinfo *info, PyObject *exc)
+_PyXI_excinfo *
+_PyXI_NewExcInfo(PyObject *exc)
 {
     assert(!PyErr_Occurred());
     if (exc == NULL || exc == Py_None) {
         PyErr_SetString(PyExc_ValueError, "missing exc");
-        return -1;
+        return NULL;
+    }
+    _PyXI_excinfo *info = PyMem_RawCalloc(1, sizeof(_PyXI_excinfo));
+    if (info == NULL) {
+        return NULL;
     }
     const char *failure;
     if (PyExceptionInstance_Check(exc) || PyExceptionClass_Check(exc)) {
@@ -1646,10 +1661,18 @@ _PyXI_InitExcInfo(_PyXI_excinfo *info, PyObject *exc)
         failure = _PyXI_excinfo_InitFromObject(info, exc);
     }
     if (failure != NULL) {
-        PyErr_SetString(PyExc_Exception, failure);
-        return -1;
+        PyMem_RawFree(info);
+        set_exc_with_cause(PyExc_Exception, failure);
+        return NULL;
     }
-    return 0;
+    return info;
+}
+
+void
+_PyXI_FreeExcInfo(_PyXI_excinfo *info)
+{
+    _PyXI_excinfo_clear(info);
+    PyMem_RawFree(info);
 }
 
 PyObject *
@@ -1664,12 +1687,6 @@ _PyXI_ExcInfoAsObject(_PyXI_excinfo *info)
     return _PyXI_excinfo_AsObject(info);
 }
 
-void
-_PyXI_ClearExcInfo(_PyXI_excinfo *info)
-{
-    _PyXI_excinfo_clear(info);
-}
-
 
 /***************************/
 /* short-term data sharing */
@@ -1727,70 +1744,267 @@ _PyXI_ApplyErrorCode(_PyXI_errcode code, PyInterpreterState *interp)
     return -1;
 }
 
+/* basic failure info */
+
+struct xi_failure {
+    // The kind of error to propagate.
+    _PyXI_errcode code;
+    // The propagated message.
+    const char *msg;
+    int msg_owned;
+};  // _PyXI_failure
+
+#define XI_FAILURE_INIT (_PyXI_failure){ .code = _PyXI_ERR_NO_ERROR }
+
+static void
+clear_xi_failure(_PyXI_failure *failure)
+{
+    if (failure->msg != NULL && failure->msg_owned) {
+        PyMem_RawFree((void*)failure->msg);
+    }
+    *failure = XI_FAILURE_INIT;
+}
+
+static void
+copy_xi_failure(_PyXI_failure *dest, _PyXI_failure *src)
+{
+    *dest = *src;
+    dest->msg_owned = 0;
+}
+
+_PyXI_failure *
+_PyXI_NewFailure(void)
+{
+    _PyXI_failure *failure = PyMem_RawMalloc(sizeof(_PyXI_failure));
+    if (failure == NULL) {
+        PyErr_NoMemory();
+        return NULL;
+    }
+    *failure = XI_FAILURE_INIT;
+    return failure;
+}
+
+void
+_PyXI_FreeFailure(_PyXI_failure *failure)
+{
+    clear_xi_failure(failure);
+    PyMem_RawFree(failure);
+}
+
+_PyXI_errcode
+_PyXI_GetFailureCode(_PyXI_failure *failure)
+{
+    if (failure == NULL) {
+        return _PyXI_ERR_NO_ERROR;
+    }
+    return failure->code;
+}
+
+void
+_PyXI_InitFailureUTF8(_PyXI_failure *failure,
+                      _PyXI_errcode code, const char *msg)
+{
+    *failure = (_PyXI_failure){
+        .code = code,
+        .msg = msg,
+        .msg_owned = 0,
+    };
+}
+
+int
+_PyXI_InitFailure(_PyXI_failure *failure, _PyXI_errcode code, PyObject *obj)
+{
+    PyObject *msgobj = PyObject_Str(obj);
+    if (msgobj == NULL) {
+        return -1;
+    }
+    // This will leak if not paired with clear_xi_failure().
+    // That happens automatically in _capture_current_exception().
+    const char *msg = _copy_string_obj_raw(msgobj, NULL);
+    Py_DECREF(msgobj);
+    if (PyErr_Occurred()) {
+        return -1;
+    }
+    *failure = (_PyXI_failure){
+        .code = code,
+        .msg = msg,
+        .msg_owned = 1,
+    };
+    return 0;
+}
+
 /* shared exceptions */
 
-static const char *
-_PyXI_InitError(_PyXI_error *error, PyObject *excobj, _PyXI_errcode code)
+typedef struct {
+    // The originating interpreter.
+    PyInterpreterState *interp;
+    // The error to propagate, if different from the uncaught exception.
+    _PyXI_failure *override;
+    _PyXI_failure _override;
+    // The exception information to propagate, if applicable.
+    // This is populated only for some error codes,
+    // but always for _PyXI_ERR_UNCAUGHT_EXCEPTION.
+    _PyXI_excinfo uncaught;
+} _PyXI_error;
+
+static void
+xi_error_clear(_PyXI_error *err)
 {
-    if (error->interp == NULL) {
-        error->interp = PyInterpreterState_Get();
+    err->interp = NULL;
+    if (err->override != NULL) {
+        clear_xi_failure(err->override);
     }
+    _PyXI_excinfo_clear(&err->uncaught);
+}
 
-    const char *failure = NULL;
-    if (code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
-        // There is an unhandled exception we need to propagate.
-        failure = _PyXI_excinfo_InitFromException(&error->uncaught, excobj);
-        if (failure != NULL) {
-            // We failed to initialize error->uncaught.
-            // XXX Print the excobj/traceback?  Emit a warning?
-            // XXX Print the current exception/traceback?
-            if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
-                error->code = _PyXI_ERR_NO_MEMORY;
-            }
-            else {
-                error->code = _PyXI_ERR_OTHER;
-            }
-            PyErr_Clear();
+static int
+xi_error_is_set(_PyXI_error *error)
+{
+    if (error->override != NULL) {
+        assert(error->override->code != _PyXI_ERR_NO_ERROR);
+        assert(error->override->code != _PyXI_ERR_UNCAUGHT_EXCEPTION
+               || excinfo_is_set(&error->uncaught));
+        return 1;
+    }
+    return excinfo_is_set(&error->uncaught);
+}
+
+static int
+xi_error_has_override(_PyXI_error *err)
+{
+    if (err->override == NULL) {
+        return 0;
+    }
+    return (err->override->code != _PyXI_ERR_NO_ERROR
+            && err->override->code != _PyXI_ERR_UNCAUGHT_EXCEPTION);
+}
+
+static PyObject *
+xi_error_resolve_current_exc(PyThreadState *tstate,
+                             _PyXI_failure *override)
+{
+    assert(override == NULL || override->code != _PyXI_ERR_NO_ERROR);
+
+    PyObject *exc = _PyErr_GetRaisedException(tstate);
+    if (exc == NULL) {
+        assert(override == NULL
+               || override->code != _PyXI_ERR_UNCAUGHT_EXCEPTION);
+    }
+    else if (override == NULL) {
+        // This is equivalent to _PyXI_ERR_UNCAUGHT_EXCEPTION.
+    }
+    else if (override->code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
+        // We want to actually capture the current exception.
+    }
+    else if (exc != NULL) {
+        // It might make sense to do similarly for other codes.
+        if (override->code == _PyXI_ERR_ALREADY_RUNNING) {
+            // We don't need the exception info.
+            Py_CLEAR(exc);
+        }
+        // ...else we want to actually capture the current exception.
+    }
+    return exc;
+}
+
+static void
+xi_error_set_override(PyThreadState *tstate, _PyXI_error *err,
+                      _PyXI_failure *override)
+{
+    assert(err->override == NULL);
+    assert(override != NULL);
+    assert(override->code != _PyXI_ERR_NO_ERROR);
+    // Use xi_error_set_exc() instead of setting _PyXI_ERR_UNCAUGHT_EXCEPTION..
+    assert(override->code != _PyXI_ERR_UNCAUGHT_EXCEPTION);
+    err->override = &err->_override;
+    // The caller still owns override->msg.
+    copy_xi_failure(&err->_override, override);
+    err->interp = tstate->interp;
+}
+
+static void
+xi_error_set_override_code(PyThreadState *tstate, _PyXI_error *err,
+                           _PyXI_errcode code)
+{
+    _PyXI_failure override = XI_FAILURE_INIT;
+    override.code = code;
+    xi_error_set_override(tstate, err, &override);
+}
+
+static const char *
+xi_error_set_exc(PyThreadState *tstate, _PyXI_error *err, PyObject *exc)
+{
+    assert(!_PyErr_Occurred(tstate));
+    assert(!xi_error_is_set(err));
+    assert(err->override == NULL);
+    assert(err->interp == NULL);
+    assert(exc != NULL);
+    const char *failure =
+                _PyXI_excinfo_InitFromException(&err->uncaught, exc);
+    if (failure != NULL) {
+        // We failed to initialize err->uncaught.
+        // XXX Print the excobj/traceback?  Emit a warning?
+        // XXX Print the current exception/traceback?
+        if (_PyErr_ExceptionMatches(tstate, PyExc_MemoryError)) {
+            xi_error_set_override_code(tstate, err, _PyXI_ERR_NO_MEMORY);
         }
         else {
-            error->code = code;
+            xi_error_set_override_code(tstate, err, _PyXI_ERR_OTHER);
         }
-        assert(error->code != _PyXI_ERR_NO_ERROR);
-    }
-    else {
-        // There is an error code we need to propagate.
-        assert(excobj == NULL);
-        assert(code != _PyXI_ERR_NO_ERROR);
-        error->code = code;
-        _PyXI_excinfo_clear(&error->uncaught);
+        PyErr_Clear();
     }
     return failure;
 }
 
-PyObject *
-_PyXI_ApplyError(_PyXI_error *error)
+static PyObject *
+_PyXI_ApplyError(_PyXI_error *error, const char *failure)
 {
     PyThreadState *tstate = PyThreadState_Get();
-    if (error->code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
+
+    if (failure != NULL) {
+        xi_error_clear(error);
+        return NULL;
+    }
+
+    _PyXI_errcode code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+    if (error->override != NULL) {
+        code = error->override->code;
+        assert(code != _PyXI_ERR_NO_ERROR);
+    }
+
+    if (code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
         // We will raise an exception that proxies the propagated exception.
        return _PyXI_excinfo_AsObject(&error->uncaught);
     }
-    else if (error->code == _PyXI_ERR_NOT_SHAREABLE) {
+    else if (code == _PyXI_ERR_NOT_SHAREABLE) {
         // Propagate the exception directly.
         assert(!_PyErr_Occurred(tstate));
-        _set_xid_lookup_failure(tstate, NULL, error->uncaught.msg, NULL);
+        PyObject *cause = NULL;
+        if (excinfo_is_set(&error->uncaught)) {
+            // Maybe instead set a PyExc_ExceptionSnapshot as __cause__?
+            // That type doesn't exist currently
+            // but would look like interpreters.ExecutionFailed.
+            _PyXI_excinfo_Apply(&error->uncaught, PyExc_Exception);
+            cause = _PyErr_GetRaisedException(tstate);
+        }
+        const char *msg = error->override != NULL
+            ? error->override->msg
+            : error->uncaught.msg;
+        _set_xid_lookup_failure(tstate, NULL, msg, cause);
+        Py_XDECREF(cause);
     }
     else {
         // Raise an exception corresponding to the code.
-        assert(error->code != _PyXI_ERR_NO_ERROR);
-        (void)_PyXI_ApplyErrorCode(error->code, error->interp);
-        if (error->uncaught.type.name != NULL || error->uncaught.msg != NULL) {
+        (void)_PyXI_ApplyErrorCode(code, error->interp);
+        assert(error->override == NULL || error->override->msg == NULL);
+        if (excinfo_is_set(&error->uncaught)) {
             // __context__ will be set to a proxy of the propagated exception.
-            PyObject *exc = PyErr_GetRaisedException();
+            // (or use PyExc_ExceptionSnapshot like _PyXI_ERR_NOT_SHAREABLE?)
+            PyObject *exc = _PyErr_GetRaisedException(tstate);
             _PyXI_excinfo_Apply(&error->uncaught, PyExc_InterpreterError);
-            PyObject *exc2 = PyErr_GetRaisedException();
+            PyObject *exc2 = _PyErr_GetRaisedException(tstate);
             PyException_SetContext(exc, exc2);
-            PyErr_SetRaisedException(exc);
+            _PyErr_SetRaisedException(tstate, exc);
         }
     }
     assert(PyErr_Occurred());
@@ -2164,20 +2378,22 @@ error:
     return NULL;
 }
 
-static void _propagate_not_shareable_error(_PyXI_errcode *);
+static void _propagate_not_shareable_error(PyThreadState *,
+                                           _PyXI_failure *);
 
 static int
 _fill_sharedns(_PyXI_namespace *ns, PyObject *nsobj,
-               xidata_fallback_t fallback, _PyXI_errcode *p_errcode)
+               xidata_fallback_t fallback, _PyXI_failure *p_err)
 {
     // All items are expected to be shareable.
     assert(_sharedns_check_counts(ns));
     assert(ns->numnames == ns->maxitems);
     assert(ns->numvalues == 0);
+    PyThreadState *tstate = PyThreadState_Get();
     for (Py_ssize_t i=0; i < ns->maxitems; i++) {
         if (_sharednsitem_copy_from_ns(&ns->items[i], nsobj, fallback) < 0) {
-            if (p_errcode != NULL) {
-                _propagate_not_shareable_error(p_errcode);
+            if (p_err != NULL) {
+                _propagate_not_shareable_error(tstate, p_err);
             }
             // Clear out the ones we set so far.
             for (Py_ssize_t j=0; j < i; j++) {
@@ -2244,18 +2460,6 @@ _apply_sharedns(_PyXI_namespace *ns, PyObject *nsobj, PyObject *dflt)
 /* switched-interpreter sessions */
 /*********************************/
 
-struct xi_session_error {
-    // This is set if the interpreter is entered and raised an exception
-    // that needs to be handled in some special way during exit.
-    _PyXI_errcode *override;
-    // This is set if exit captured an exception to propagate.
-    _PyXI_error *info;
-
-    // -- pre-allocated memory --
-    _PyXI_error _info;
-    _PyXI_errcode _override;
-};
-
 struct xi_session {
 #define SESSION_UNUSED 0
 #define SESSION_ACTIVE 1
@@ -2288,8 +2492,6 @@ struct xi_session {
     // once the session exits.  Do not access this directly; use
     // _PyXI_Preserve() and _PyXI_GetPreserved() instead;
     PyObject *_preserved;
-
-    struct xi_session_error error;
 };
 
 _PyXI_session *
@@ -2317,26 +2519,6 @@ _session_is_active(_PyXI_session *session)
     return session->status == SESSION_ACTIVE;
 }
 
-static int
-_session_pop_error(_PyXI_session *session, struct xi_session_error *err)
-{
-    if (session->error.info == NULL) {
-        assert(session->error.override == NULL);
-        *err = (struct xi_session_error){0};
-        return 0;
-    }
-    *err = session->error;
-    err->info = &err->_info;
-    if (err->override != NULL) {
-        err->override = &err->_override;
-    }
-    session->error = (struct xi_session_error){0};
-    return 1;
-}
-
-static int _ensure_main_ns(_PyXI_session *, _PyXI_errcode *);
-static inline void _session_set_error(_PyXI_session *, _PyXI_errcode);
-
 
 /* enter/exit a cross-interpreter session */
 
@@ -2351,10 +2533,6 @@ _enter_session(_PyXI_session *session, PyInterpreterState *interp)
     // Set elsewhere and cleared in _exit_session().
     assert(!session->running);
     assert(session->main_ns == NULL);
-    // Set elsewhere and cleared in _capture_current_exception().
-    assert(session->error.override == NULL);
-    // Set elsewhere and cleared in _PyXI_Exit().
-    assert(session->error.info == NULL);
 
     // Switch to interpreter.
     PyThreadState *tstate = PyThreadState_Get();
@@ -2409,17 +2587,14 @@ _exit_session(_PyXI_session *session)
         assert(!session->own_init_tstate);
     }
 
-    assert(session->error.info == NULL);
-    assert(session->error.override == _PyXI_ERR_NO_ERROR);
-
     *session = (_PyXI_session){0};
 }
 
 static void
-_propagate_not_shareable_error(_PyXI_errcode *p_errcode)
+_propagate_not_shareable_error(PyThreadState *tstate,
+                               _PyXI_failure *override)
 {
-    assert(p_errcode != NULL);
-    PyThreadState *tstate = PyThreadState_Get();
+    assert(override != NULL);
     PyObject *exctype = get_notshareableerror_type(tstate);
     if (exctype == NULL) {
         PyErr_FormatUnraisable(
@@ -2428,15 +2603,24 @@ _propagate_not_shareable_error(_PyXI_errcode *p_errcode)
     }
     if (PyErr_ExceptionMatches(exctype)) {
         // We want to propagate the exception directly.
-        *p_errcode = _PyXI_ERR_NOT_SHAREABLE;
+        *override = (_PyXI_failure){
+            .code = _PyXI_ERR_NOT_SHAREABLE,
+        };
     }
 }
 
+
+static int _ensure_main_ns(_PyXI_session *, _PyXI_failure *);
+static const char * capture_session_error(_PyXI_session *, _PyXI_error *,
+                                          _PyXI_failure *);
+
 int
 _PyXI_Enter(_PyXI_session *session,
             PyInterpreterState *interp, PyObject *nsupdates,
             _PyXI_session_result *result)
 {
+    PyThreadState *tstate = _PyThreadState_GET();
+
     // Convert the attrs for cross-interpreter use.
     _PyXI_namespace *sharedns = NULL;
     if (nsupdates != NULL) {
@@ -2457,16 +2641,16 @@ _PyXI_Enter(_PyXI_session *session,
             }
             // For now we limit it to shareable objects.
             xidata_fallback_t fallback = _PyXIDATA_XIDATA_ONLY;
-            _PyXI_errcode errcode = _PyXI_ERR_NO_ERROR;
-            if (_fill_sharedns(sharedns, nsupdates, fallback, &errcode) < 0) {
-                assert(PyErr_Occurred());
-                assert(session->error.info == NULL);
-                if (errcode == _PyXI_ERR_NO_ERROR) {
-                    errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+            _PyXI_failure _err = XI_FAILURE_INIT;
+            if (_fill_sharedns(sharedns, nsupdates, fallback, &_err) < 0) {
+                assert(_PyErr_Occurred(tstate));
+                if (_err.code == _PyXI_ERR_NO_ERROR) {
+                    _err.code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
                 }
                 _destroy_sharedns(sharedns);
                 if (result != NULL) {
-                    result->errcode = errcode;
+                    assert(_err.msg == NULL);
+                    result->errcode = _err.code;
                 }
                 return -1;
             }
@@ -2475,52 +2659,53 @@ _PyXI_Enter(_PyXI_session *session,
 
     // Switch to the requested interpreter (if necessary).
     _enter_session(session, interp);
-    _PyXI_errcode errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+    _PyXI_failure override = XI_FAILURE_INIT;
+    override.code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+    tstate = _PyThreadState_GET();
 
     // Ensure this thread owns __main__.
     if (_PyInterpreterState_SetRunningMain(interp) < 0) {
         // In the case where we didn't switch interpreters, it would
         // be more efficient to leave the exception in place and return
         // immediately.  However, life is simpler if we don't.
-        errcode = _PyXI_ERR_ALREADY_RUNNING;
+        override.code = _PyXI_ERR_ALREADY_RUNNING;
         goto error;
     }
     session->running = 1;
 
     // Apply the cross-interpreter data.
     if (sharedns != NULL) {
-        if (_ensure_main_ns(session, &errcode) < 0) {
+        if (_ensure_main_ns(session, &override) < 0) {
             goto error;
         }
         if (_apply_sharedns(sharedns, session->main_ns, NULL) < 0) {
-            errcode = _PyXI_ERR_APPLY_NS_FAILURE;
+            override.code = _PyXI_ERR_APPLY_NS_FAILURE;
             goto error;
         }
         _destroy_sharedns(sharedns);
     }
 
-    errcode = _PyXI_ERR_NO_ERROR;
-    assert(!PyErr_Occurred());
+    override.code = _PyXI_ERR_NO_ERROR;
+    assert(!_PyErr_Occurred(tstate));
     return 0;
 
 error:
     // We want to propagate all exceptions here directly (best effort).
-    assert(errcode != _PyXI_ERR_NO_ERROR);
-    _session_set_error(session, errcode);
-    assert(!PyErr_Occurred());
+    assert(override.code != _PyXI_ERR_NO_ERROR);
+    _PyXI_error err = {0};
+    const char *failure = capture_session_error(session, &err, &override);
 
     // Exit the session.
-    struct xi_session_error err;
-    (void)_session_pop_error(session, &err);
     _exit_session(session);
+    tstate = _PyThreadState_GET();
 
     if (sharedns != NULL) {
         _destroy_sharedns(sharedns);
     }
 
     // Apply the error from the other interpreter.
-    PyObject *excinfo = _PyXI_ApplyError(err.info);
-    _PyXI_excinfo_clear(&err.info->uncaught);
+    PyObject *excinfo = _PyXI_ApplyError(&err, failure);
+    xi_error_clear(&err);
     if (excinfo != NULL) {
         if (result != NULL) {
             result->excinfo = excinfo;
@@ -2529,84 +2714,100 @@ error:
 #ifdef Py_DEBUG
             fprintf(stderr, "_PyXI_Enter(): uncaught exception discarded");
 #endif
+            Py_DECREF(excinfo);
         }
     }
-    assert(PyErr_Occurred());
+    assert(_PyErr_Occurred(tstate));
 
     return -1;
 }
 
 static int _pop_preserved(_PyXI_session *, _PyXI_namespace **, PyObject **,
-                          _PyXI_errcode *);
+                          _PyXI_failure *);
 static int _finish_preserved(_PyXI_namespace *, PyObject **);
 
 int
-_PyXI_Exit(_PyXI_session *session, _PyXI_errcode errcode,
+_PyXI_Exit(_PyXI_session *session, _PyXI_failure *override,
            _PyXI_session_result *result)
 {
+    PyThreadState *tstate = _PyThreadState_GET();
     int res = 0;
 
     // Capture the raised exception, if any.
-    assert(session->error.info == NULL);
-    if (PyErr_Occurred()) {
-        _session_set_error(session, errcode);
-        assert(!PyErr_Occurred());
+    _PyXI_error err = {0};
+    const char *failure = NULL;
+    if (override != NULL && override->code == _PyXI_ERR_NO_ERROR) {
+        assert(override->msg == NULL);
+        override = NULL;
+    }
+    if (_PyErr_Occurred(tstate)) {
+        failure = capture_session_error(session, &err, override);
     }
     else {
-        assert(errcode == _PyXI_ERR_NO_ERROR);
-        assert(session->error.override == NULL);
+        assert(override == NULL);
     }
 
     // Capture the preserved namespace.
     _PyXI_namespace *preserved = NULL;
     PyObject *preservedobj = NULL;
     if (result != NULL) {
-        errcode = _PyXI_ERR_NO_ERROR;
-        if (_pop_preserved(session, &preserved, &preservedobj, &errcode) < 0) {
-            if (session->error.info != NULL) {
+        assert(!_PyErr_Occurred(tstate));
+        _PyXI_failure _override = XI_FAILURE_INIT;
+        if (_pop_preserved(
+                    session, &preserved, &preservedobj, &_override) < 0)
+        {
+            assert(preserved == NULL);
+            assert(preservedobj == NULL);
+            if (xi_error_is_set(&err)) {
                 // XXX Chain the exception (i.e. set __context__)?
                 PyErr_FormatUnraisable(
                     "Exception ignored while capturing preserved objects");
+                clear_xi_failure(&_override);
             }
             else {
-                _session_set_error(session, errcode);
+                if (_override.code == _PyXI_ERR_NO_ERROR) {
+                    _override.code = _PyXI_ERR_UNCAUGHT_EXCEPTION;
+                }
+                failure = capture_session_error(session, &err, &_override);
             }
         }
     }
 
     // Exit the session.
-    struct xi_session_error err;
-    (void)_session_pop_error(session, &err);
+    assert(!_PyErr_Occurred(tstate));
     _exit_session(session);
+    tstate = _PyThreadState_GET();
 
     // Restore the preserved namespace.
     assert(preserved == NULL || preservedobj == NULL);
     if (_finish_preserved(preserved, &preservedobj) < 0) {
         assert(preservedobj == NULL);
-        if (err.info != NULL) {
+        if (xi_error_is_set(&err)) {
             // XXX Chain the exception (i.e. set __context__)?
             PyErr_FormatUnraisable(
                 "Exception ignored while capturing preserved objects");
         }
         else {
-            errcode = _PyXI_ERR_PRESERVE_FAILURE;
-            _propagate_not_shareable_error(&errcode);
+            xi_error_set_override_code(
+                            tstate, &err, _PyXI_ERR_PRESERVE_FAILURE);
+            _propagate_not_shareable_error(tstate, err.override);
         }
     }
     if (result != NULL) {
         result->preserved = preservedobj;
-        result->errcode = errcode;
+        result->errcode = err.override != NULL
+            ? err.override->code
+            : _PyXI_ERR_NO_ERROR;
     }
 
     // Apply the error from the other interpreter, if any.
-    if (err.info != NULL) {
+    if (xi_error_is_set(&err)) {
         res = -1;
-        assert(!PyErr_Occurred());
-        PyObject *excinfo = _PyXI_ApplyError(err.info);
-        _PyXI_excinfo_clear(&err.info->uncaught);
+        assert(!_PyErr_Occurred(tstate));
+        PyObject *excinfo = _PyXI_ApplyError(&err, failure);
         if (excinfo == NULL) {
-            assert(PyErr_Occurred());
-            if (result != NULL) {
+            assert(_PyErr_Occurred(tstate));
+            if (result != NULL && !xi_error_has_override(&err)) {
                 _PyXI_ClearResult(result);
                 *result = (_PyXI_session_result){
                     .errcode = _PyXI_ERR_EXC_PROPAGATION_FAILURE,
@@ -2620,7 +2821,9 @@ _PyXI_Exit(_PyXI_session *session, _PyXI_errcode errcode,
 #ifdef Py_DEBUG
             fprintf(stderr, "_PyXI_Exit(): uncaught exception discarded");
 #endif
+            Py_DECREF(excinfo);
         }
+        xi_error_clear(&err);
     }
     return res;
 }
@@ -2628,106 +2831,72 @@ _PyXI_Exit(_PyXI_session *session, _PyXI_errcode errcode,
 
 /* in an active cross-interpreter session */
 
-static void
-_capture_current_exception(_PyXI_session *session)
+static const char *
+capture_session_error(_PyXI_session *session, _PyXI_error *err,
+                      _PyXI_failure *override)
 {
-    assert(session->error.info == NULL);
-    if (!PyErr_Occurred()) {
-        assert(session->error.override == NULL);
-        return;
-    }
-
-    // Handle the exception override.
-    _PyXI_errcode *override = session->error.override;
-    session->error.override = NULL;
-    _PyXI_errcode errcode = override != NULL
-        ? *override
-        : _PyXI_ERR_UNCAUGHT_EXCEPTION;
+    assert(_session_is_active(session));
+    assert(!xi_error_is_set(err));
+    PyThreadState *tstate = session->init_tstate;
 
-    // Pop the exception object.
-    PyObject *excval = NULL;
-    if (errcode == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
-        // We want to actually capture the current exception.
-        excval = PyErr_GetRaisedException();
-    }
-    else if (errcode == _PyXI_ERR_ALREADY_RUNNING) {
-        // We don't need the exception info.
-        PyErr_Clear();
-    }
-    else {
-        // We could do a variety of things here, depending on errcode.
-        // However, for now we simply capture the exception and save
-        // the errcode.
-        excval = PyErr_GetRaisedException();
+    // Normalize the exception override.
+    if (override != NULL) {
+        if (override->code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
+            assert(override->msg == NULL);
+            override = NULL;
+        }
+        else {
+            assert(override->code != _PyXI_ERR_NO_ERROR);
+        }
     }
 
-    // Capture the exception.
-    _PyXI_error *err = &session->error._info;
-    *err = (_PyXI_error){
-        .interp = session->init_tstate->interp,
-    };
-    const char *failure;
-    if (excval == NULL) {
-        failure = _PyXI_InitError(err, NULL, errcode);
-    }
-    else {
-        failure = _PyXI_InitError(err, excval, _PyXI_ERR_UNCAUGHT_EXCEPTION);
-        Py_DECREF(excval);
-        if (failure == NULL && override != NULL) {
-            err->code = errcode;
+    // Handle the exception, if any.
+    const char *failure = NULL;
+    PyObject *exc = xi_error_resolve_current_exc(tstate, override);
+    if (exc != NULL) {
+        // There is an unhandled exception we need to preserve.
+        failure = xi_error_set_exc(tstate, err, exc);
+        Py_DECREF(exc);
+        if (_PyErr_Occurred(tstate)) {
+            PyErr_FormatUnraisable(failure);
         }
     }
 
-    // Handle capture failure.
-    if (failure != NULL) {
-        // XXX Make this error message more generic.
-        fprintf(stderr,
-                "RunFailedError: script raised an uncaught exception (%s)",
-                failure);
-        err = NULL;
+    // Handle the override.
+    if (override != NULL && failure == NULL) {
+        xi_error_set_override(tstate, err, override);
     }
 
     // Finished!
-    assert(!PyErr_Occurred());
-    session->error.info = err;
-}
-
-static inline void
-_session_set_error(_PyXI_session *session, _PyXI_errcode errcode)
-{
-    assert(_session_is_active(session));
-    assert(PyErr_Occurred());
-    if (errcode == _PyXI_ERR_NO_ERROR) {
-        // We're a bit forgiving here.
-        errcode = _PyXI_ERR_UNCAUGHT_EXCEPTION;
-    }
-    if (errcode != _PyXI_ERR_UNCAUGHT_EXCEPTION) {
-        session->error._override = errcode;
-        session->error.override = &session->error._override;
-    }
-    _capture_current_exception(session);
+    assert(!_PyErr_Occurred(tstate));
+    return failure;
 }
 
 static int
-_ensure_main_ns(_PyXI_session *session, _PyXI_errcode *p_errcode)
+_ensure_main_ns(_PyXI_session *session, _PyXI_failure *failure)
 {
     assert(_session_is_active(session));
+    PyThreadState *tstate = session->init_tstate;
     if (session->main_ns != NULL) {
         return 0;
     }
     // Cache __main__.__dict__.
-    PyObject *main_mod = _Py_GetMainModule(session->init_tstate);
+    PyObject *main_mod = _Py_GetMainModule(tstate);
     if (_Py_CheckMainModule(main_mod) < 0) {
-        if (p_errcode != NULL) {
-            *p_errcode = _PyXI_ERR_MAIN_NS_FAILURE;
+        if (failure != NULL) {
+            *failure = (_PyXI_failure){
+                .code = _PyXI_ERR_MAIN_NS_FAILURE,
+            };
         }
         return -1;
     }
     PyObject *ns = PyModule_GetDict(main_mod);  // borrowed
     Py_DECREF(main_mod);
     if (ns == NULL) {
-        if (p_errcode != NULL) {
-            *p_errcode = _PyXI_ERR_MAIN_NS_FAILURE;
+        if (failure != NULL) {
+            *failure = (_PyXI_failure){
+                .code = _PyXI_ERR_MAIN_NS_FAILURE,
+            };
         }
         return -1;
     }
@@ -2736,13 +2905,13 @@ _ensure_main_ns(_PyXI_session *session, _PyXI_errcode *p_errcode)
 }
 
 PyObject *
-_PyXI_GetMainNamespace(_PyXI_session *session, _PyXI_errcode *p_errcode)
+_PyXI_GetMainNamespace(_PyXI_session *session, _PyXI_failure *failure)
 {
     if (!_session_is_active(session)) {
         PyErr_SetString(PyExc_RuntimeError, "session not active");
         return NULL;
     }
-    if (_ensure_main_ns(session, p_errcode) < 0) {
+    if (_ensure_main_ns(session, failure) < 0) {
         return NULL;
     }
     return session->main_ns;
@@ -2752,9 +2921,12 @@ _PyXI_GetMainNamespace(_PyXI_session *session, _PyXI_errcode *p_errcode)
 static int
 _pop_preserved(_PyXI_session *session,
                _PyXI_namespace **p_xidata, PyObject **p_obj,
-               _PyXI_errcode *p_errcode)
+               _PyXI_failure *p_failure)
 {
+    _PyXI_failure failure = XI_FAILURE_INIT;
+    _PyXI_namespace *xidata = NULL;
     assert(_PyThreadState_GET() == session->init_tstate);  // active session
+
     if (session->_preserved == NULL) {
         *p_xidata = NULL;
         *p_obj = NULL;
@@ -2772,10 +2944,8 @@ _pop_preserved(_PyXI_session *session,
     // We did switch interpreters.
     Py_ssize_t len = PyDict_Size(session->_preserved);
     if (len < 0) {
-        if (p_errcode != NULL) {
-            *p_errcode = _PyXI_ERR_PRESERVE_FAILURE;
-        }
-        return -1;
+        failure.code = _PyXI_ERR_PRESERVE_FAILURE;
+        goto error;
     }
     else if (len == 0) {
         *p_xidata = NULL;
@@ -2783,29 +2953,31 @@ _pop_preserved(_PyXI_session *session,
     else {
         _PyXI_namespace *xidata = _create_sharedns(session->_preserved);
         if (xidata == NULL) {
-            if (p_errcode != NULL) {
-                *p_errcode = _PyXI_ERR_PRESERVE_FAILURE;
-            }
-            return -1;
+            failure.code = _PyXI_ERR_PRESERVE_FAILURE;
+            goto error;
         }
-        _PyXI_errcode errcode = _PyXI_ERR_NO_ERROR;
         if (_fill_sharedns(xidata, session->_preserved,
-                           _PyXIDATA_FULL_FALLBACK, &errcode) < 0)
+                           _PyXIDATA_FULL_FALLBACK, &failure) < 0)
         {
-            assert(session->error.info == NULL);
-            if (errcode != _PyXI_ERR_NOT_SHAREABLE) {
-                errcode = _PyXI_ERR_PRESERVE_FAILURE;
+            if (failure.code != _PyXI_ERR_NOT_SHAREABLE) {
+                assert(failure.msg != NULL);
+                failure.code = _PyXI_ERR_PRESERVE_FAILURE;
             }
-            if (p_errcode != NULL) {
-                *p_errcode = errcode;
-            }
-            _destroy_sharedns(xidata);
-            return -1;
+            goto error;
         }
         *p_xidata = xidata;
     }
     Py_CLEAR(session->_preserved);
     return 0;
+
+error:
+    if (p_failure != NULL) {
+        *p_failure = failure;
+    }
+    if (xidata != NULL) {
+        _destroy_sharedns(xidata);
+    }
+    return -1;
 }
 
 static int
@@ -2835,8 +3007,9 @@ finally:
 
 int
 _PyXI_Preserve(_PyXI_session *session, const char *name, PyObject *value,
-               _PyXI_errcode *p_errcode)
+               _PyXI_failure *p_failure)
 {
+    _PyXI_failure failure = XI_FAILURE_INIT;
     if (!_session_is_active(session)) {
         PyErr_SetString(PyExc_RuntimeError, "session not active");
         return -1;
@@ -2846,20 +3019,22 @@ _PyXI_Preserve(_PyXI_session *session, const char *name, PyObject *value,
         if (session->_preserved == NULL) {
             set_exc_with_cause(PyExc_RuntimeError,
                                "failed to initialize preserved objects");
-            if (p_errcode != NULL) {
-                *p_errcode = _PyXI_ERR_PRESERVE_FAILURE;
-            }
-            return -1;
+            failure.code = _PyXI_ERR_PRESERVE_FAILURE;
+            goto error;
         }
     }
     if (PyDict_SetItemString(session->_preserved, name, value) < 0) {
         set_exc_with_cause(PyExc_RuntimeError, "failed to preserve object");
-        if (p_errcode != NULL) {
-            *p_errcode = _PyXI_ERR_PRESERVE_FAILURE;
-        }
-        return -1;
+        failure.code = _PyXI_ERR_PRESERVE_FAILURE;
+        goto error;
     }
     return 0;
+
+error:
+    if (p_failure != NULL) {
+        *p_failure = failure;
+    }
+    return -1;
 }
 
 PyObject *
diff --git a/Python/crossinterp_data_lookup.h b/Python/crossinterp_data_lookup.h
index b16f38b847fc6646c9f700923ced23896956792d..6d0b93eb82ac1e311fabff9cff03df2ac508199b 100644 (file)
--- a/Python/crossinterp_data_lookup.h
+++ b/Python/crossinterp_data_lookup.h
@@ -88,6 +88,33 @@ _PyXIData_FormatNotShareableError(PyThreadState *tstate,
     va_end(vargs);
 }
 
+int
+_PyXI_UnwrapNotShareableError(PyThreadState * tstate, _PyXI_failure *failure)
+{
+    PyObject *exctype = get_notshareableerror_type(tstate);
+    assert(exctype != NULL);
+    if (!_PyErr_ExceptionMatches(tstate, exctype)) {
+        return -1;
+    }
+    PyObject *exc = _PyErr_GetRaisedException(tstate);
+    if (failure != NULL) {
+        _PyXI_errcode code = _PyXI_ERR_NOT_SHAREABLE;
+        if (_PyXI_InitFailure(failure, code, exc) < 0) {
+            return -1;
+        }
+    }
+    PyObject *cause = PyException_GetCause(exc);
+    if (cause != NULL) {
+        Py_DECREF(exc);
+        exc = cause;
+    }
+    else {
+        assert(PyException_GetContext(exc) == NULL);
+    }
+    _PyErr_SetRaisedException(tstate, exc);
+    return 0;
+}
+
 
 _PyXIData_getdata_t
 _PyXIData_Lookup(PyThreadState *tstate, PyObject *obj)
diff --git a/Python/crossinterp_exceptions.h b/Python/crossinterp_exceptions.h
index 12cd61db1b676242912692f118f66ee4478e567b..98411adc5eb3f6f1e2a602c86dc4e02182a04384 100644 (file)
--- a/Python/crossinterp_exceptions.h
+++ b/Python/crossinterp_exceptions.h
@@ -7,13 +7,6 @@ _ensure_current_cause(PyThreadState *tstate, PyObject *cause)
     }
     PyObject *exc = _PyErr_GetRaisedException(tstate);
     assert(exc != NULL);
-    PyObject *ctx = PyException_GetContext(exc);
-    if (ctx == NULL) {
-        PyException_SetContext(exc, Py_NewRef(cause));
-    }
-    else {
-        Py_DECREF(ctx);
-    }
     assert(PyException_GetCause(exc) == NULL);
     PyException_SetCause(exc, Py_NewRef(cause));
     _PyErr_SetRaisedException(tstate, exc);
Mirror of https://github.com/python/cpython.git