diff options
| -rw-r--r-- | Doc/data/python3.11.abi | 317 | ||||
| -rw-r--r-- | Include/cpython/code.h | 1 | ||||
| -rw-r--r-- | Lib/opcode.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst | 2 | ||||
| -rw-r--r-- | Objects/codeobject.c | 6 | ||||
| -rw-r--r-- | Python/ceval.c | 93 | ||||
| -rw-r--r-- | Tools/scripts/deepfreeze.py | 7 |
7 files changed, 218 insertions, 210 deletions
diff --git a/Doc/data/python3.11.abi b/Doc/data/python3.11.abi index 79b3ca3..98cdaf9 100644 --- a/Doc/data/python3.11.abi +++ b/Doc/data/python3.11.abi @@ -5858,122 +5858,125 @@ <var-decl name='bounds' type-id='type-id-445' visibility='default' filepath='./Include/cpython/pystate.h' line='33' column='1'/> </data-member> </class-decl> - <class-decl name='PyCodeObject' size-in-bits='1472' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1' id='type-id-446'> + <class-decl name='PyCodeObject' size-in-bits='1536' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1' id='type-id-446'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ob_base' type-id='type-id-77' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='ob_base' type-id='type-id-77' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='co_consts' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_consts' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='co_names' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_names' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='co_exceptiontable' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_exceptiontable' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='co_flags' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_flags' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='co_warmup' type-id='type-id-232' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_warmup' type-id='type-id-232' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='432'> - <var-decl name='_co_linearray_entry_size' type-id='type-id-232' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='_co_linearray_entry_size' type-id='type-id-232' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='co_argcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_argcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='co_posonlyargcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_posonlyargcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='co_kwonlyargcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_kwonlyargcount' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='544'> - <var-decl name='co_stacksize' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_stacksize' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='co_firstlineno' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_firstlineno' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='co_nlocalsplus' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_nlocalsplus' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='co_nlocals' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_nlocals' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='co_nplaincellvars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_nplaincellvars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='co_ncellvars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_ncellvars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='736'> - <var-decl name='co_nfreevars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_nfreevars' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='co_localsplusnames' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_localsplusnames' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='co_localspluskinds' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_localspluskinds' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='co_filename' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_filename' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='co_name' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_name' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='co_qualname' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_qualname' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='co_linetable' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_linetable' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='co_weakreflist' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_weakreflist' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='_co_code' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='_co_code' type-id='type-id-14' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='_co_linearray' type-id='type-id-115' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='_co_linearray' type-id='type-id-115' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='co_extra' type-id='type-id-18' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='_co_firsttraceable' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='co_code_adaptive' type-id='type-id-262' visibility='default' filepath='./Include/cpython/code.h' line='102' column='1'/> + <var-decl name='co_extra' type-id='type-id-18' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> + </data-member> + <data-member access='public' layout-offset-in-bits='1472'> + <var-decl name='co_code_adaptive' type-id='type-id-262' visibility='default' filepath='./Include/cpython/code.h' line='103' column='1'/> </data-member> </class-decl> <typedef-decl name='PyCodeObject' type-id='type-id-446' filepath='./Include/pytypedefs.h' line='21' column='1' id='type-id-447'/> <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-444'/> - <class-decl name='_line_offsets' size-in-bits='320' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='178' column='1' id='type-id-448'> + <class-decl name='_line_offsets' size-in-bits='320' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='179' column='1' id='type-id-448'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ar_start' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='179' column='1'/> + <var-decl name='ar_start' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='180' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='ar_end' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='180' column='1'/> + <var-decl name='ar_end' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='181' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ar_line' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='181' column='1'/> + <var-decl name='ar_line' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='182' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='opaque' type-id='type-id-449' visibility='default' filepath='./Include/cpython/code.h' line='182' column='1'/> + <var-decl name='opaque' type-id='type-id-449' visibility='default' filepath='./Include/cpython/code.h' line='183' column='1'/> </data-member> </class-decl> - <class-decl name='_opaque' size-in-bits='192' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='172' column='1' id='type-id-449'> + <class-decl name='_opaque' size-in-bits='192' is-struct='yes' visibility='default' filepath='./Include/cpython/code.h' line='173' column='1' id='type-id-449'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='computed_line' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='173' column='1'/> + <var-decl name='computed_line' type-id='type-id-8' visibility='default' filepath='./Include/cpython/code.h' line='174' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='lo_next' type-id='type-id-450' visibility='default' filepath='./Include/cpython/code.h' line='174' column='1'/> + <var-decl name='lo_next' type-id='type-id-450' visibility='default' filepath='./Include/cpython/code.h' line='175' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='limit' type-id='type-id-450' visibility='default' filepath='./Include/cpython/code.h' line='175' column='1'/> + <var-decl name='limit' type-id='type-id-450' visibility='default' filepath='./Include/cpython/code.h' line='176' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='type-id-285' const='yes' id='type-id-451'/> <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-450'/> - <typedef-decl name='PyCodeAddressRange' type-id='type-id-448' filepath='./Include/cpython/code.h' line='183' column='1' id='type-id-445'/> + <typedef-decl name='PyCodeAddressRange' type-id='type-id-448' filepath='./Include/cpython/code.h' line='184' column='1' id='type-id-445'/> <typedef-decl name='PyTraceInfo' type-id='type-id-443' filepath='./Include/cpython/pystate.h' line='34' column='1' id='type-id-20'/> <class-decl name='_stack_chunk' size-in-bits='256' is-struct='yes' visibility='default' filepath='./Include/cpython/pystate.h' line='75' column='1' id='type-id-452'> <data-member access='public' layout-offset-in-bits='0'> @@ -7454,93 +7457,93 @@ </function-decl> </abi-instr> <abi-instr version='1.0' address-size='64' path='Objects/codeobject.c' comp-dir-path='/src' language='LANG_C99'> - <var-decl name='PyCode_Type' type-id='type-id-112' mangled-name='PyCode_Type' visibility='default' filepath='./Include/cpython/code.h' line='139' column='1' elf-symbol-id='PyCode_Type'/> - <function-decl name='_PyCode_ConstantKey' mangled-name='_PyCode_ConstantKey' filepath='Objects/codeobject.c' line='2014' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_ConstantKey'> - <parameter type-id='type-id-14' name='op' filepath='Objects/codeobject.c' line='2014' column='1'/> + <var-decl name='PyCode_Type' type-id='type-id-112' mangled-name='PyCode_Type' visibility='default' filepath='./Include/cpython/code.h' line='140' column='1' elf-symbol-id='PyCode_Type'/> + <function-decl name='_PyCode_ConstantKey' mangled-name='_PyCode_ConstantKey' filepath='Objects/codeobject.c' line='2020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_ConstantKey'> + <parameter type-id='type-id-14' name='op' filepath='Objects/codeobject.c' line='2020' column='1'/> <return type-id='type-id-14'/> </function-decl> - <function-decl name='PyCode_GetCode' mangled-name='PyCode_GetCode' filepath='Objects/codeobject.c' line='1440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_GetCode'> - <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='1440' column='1'/> + <function-decl name='PyCode_GetCode' mangled-name='PyCode_GetCode' filepath='Objects/codeobject.c' line='1446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_GetCode'> + <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='1446' column='1'/> <return type-id='type-id-14'/> </function-decl> - <function-decl name='_PyCode_SetExtra' mangled-name='_PyCode_SetExtra' filepath='Objects/codeobject.c' line='1345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_SetExtra'> - <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='1345' column='1'/> - <parameter type-id='type-id-36' name='index' filepath='Objects/codeobject.c' line='1345' column='1'/> - <parameter type-id='type-id-18' name='extra' filepath='Objects/codeobject.c' line='1345' column='1'/> + <function-decl name='_PyCode_SetExtra' mangled-name='_PyCode_SetExtra' filepath='Objects/codeobject.c' line='1351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_SetExtra'> + <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='1351' column='1'/> + <parameter type-id='type-id-36' name='index' filepath='Objects/codeobject.c' line='1351' column='1'/> + <parameter type-id='type-id-18' name='extra' filepath='Objects/codeobject.c' line='1351' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='_PyCode_GetExtra' mangled-name='_PyCode_GetExtra' filepath='Objects/codeobject.c' line='1324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_GetExtra'> - <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='1324' column='1'/> - <parameter type-id='type-id-36' name='index' filepath='Objects/codeobject.c' line='1324' column='1'/> - <parameter type-id='type-id-482' name='extra' filepath='Objects/codeobject.c' line='1324' column='1'/> + <function-decl name='_PyCode_GetExtra' mangled-name='_PyCode_GetExtra' filepath='Objects/codeobject.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_GetExtra'> + <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='1330' column='1'/> + <parameter type-id='type-id-36' name='index' filepath='Objects/codeobject.c' line='1330' column='1'/> + <parameter type-id='type-id-482' name='extra' filepath='Objects/codeobject.c' line='1330' column='1'/> <return type-id='type-id-8'/> </function-decl> <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-501'/> - <function-decl name='PyCode_Addr2Location' mangled-name='PyCode_Addr2Location' filepath='Objects/codeobject.c' line='960' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Location'> - <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='960' column='1'/> - <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='960' column='1'/> - <parameter type-id='type-id-501' name='start_line' filepath='Objects/codeobject.c' line='961' column='1'/> - <parameter type-id='type-id-501' name='start_column' filepath='Objects/codeobject.c' line='961' column='1'/> - <parameter type-id='type-id-501' name='end_line' filepath='Objects/codeobject.c' line='962' column='1'/> - <parameter type-id='type-id-501' name='end_column' filepath='Objects/codeobject.c' line='962' column='1'/> + <function-decl name='PyCode_Addr2Location' mangled-name='PyCode_Addr2Location' filepath='Objects/codeobject.c' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Location'> + <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='966' column='1'/> + <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='966' column='1'/> + <parameter type-id='type-id-501' name='start_line' filepath='Objects/codeobject.c' line='967' column='1'/> + <parameter type-id='type-id-501' name='start_column' filepath='Objects/codeobject.c' line='967' column='1'/> + <parameter type-id='type-id-501' name='end_line' filepath='Objects/codeobject.c' line='968' column='1'/> + <parameter type-id='type-id-501' name='end_column' filepath='Objects/codeobject.c' line='968' column='1'/> <return type-id='type-id-8'/> </function-decl> <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-502'/> - <function-decl name='_PyCode_CheckLineNumber' mangled-name='_PyCode_CheckLineNumber' filepath='Objects/codeobject.c' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_CheckLineNumber'> - <parameter type-id='type-id-8' name='lasti' filepath='Objects/codeobject.c' line='783' column='1'/> - <parameter type-id='type-id-502' name='bounds' filepath='Objects/codeobject.c' line='783' column='1'/> + <function-decl name='_PyCode_CheckLineNumber' mangled-name='_PyCode_CheckLineNumber' filepath='Objects/codeobject.c' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_CheckLineNumber'> + <parameter type-id='type-id-8' name='lasti' filepath='Objects/codeobject.c' line='789' column='1'/> + <parameter type-id='type-id-502' name='bounds' filepath='Objects/codeobject.c' line='789' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyCode_Addr2Line' mangled-name='PyCode_Addr2Line' filepath='Objects/codeobject.c' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Line'> - <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='745' column='1'/> - <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='745' column='1'/> + <function-decl name='PyCode_Addr2Line' mangled-name='PyCode_Addr2Line' filepath='Objects/codeobject.c' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Line'> + <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='751' column='1'/> + <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='751' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyCode_NewEmpty' mangled-name='PyCode_NewEmpty' filepath='Objects/codeobject.c' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewEmpty'> - <parameter type-id='type-id-3' name='filename' filepath='Objects/codeobject.c' line='641' column='1'/> - <parameter type-id='type-id-3' name='funcname' filepath='Objects/codeobject.c' line='641' column='1'/> - <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='641' column='1'/> + <function-decl name='PyCode_NewEmpty' mangled-name='PyCode_NewEmpty' filepath='Objects/codeobject.c' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewEmpty'> + <parameter type-id='type-id-3' name='filename' filepath='Objects/codeobject.c' line='647' column='1'/> + <parameter type-id='type-id-3' name='funcname' filepath='Objects/codeobject.c' line='647' column='1'/> + <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='647' column='1'/> <return type-id='type-id-444'/> </function-decl> - <function-decl name='PyCode_New' mangled-name='PyCode_New' filepath='Objects/codeobject.c' line='616' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_New'> - <parameter type-id='type-id-8' name='argcount' filepath='Objects/codeobject.c' line='616' column='1'/> - <parameter type-id='type-id-8' name='kwonlyargcount' filepath='Objects/codeobject.c' line='616' column='1'/> - <parameter type-id='type-id-8' name='nlocals' filepath='Objects/codeobject.c' line='617' column='1'/> - <parameter type-id='type-id-8' name='stacksize' filepath='Objects/codeobject.c' line='617' column='1'/> - <parameter type-id='type-id-8' name='flags' filepath='Objects/codeobject.c' line='617' column='1'/> - <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='618' column='1'/> - <parameter type-id='type-id-14' name='consts' filepath='Objects/codeobject.c' line='618' column='1'/> - <parameter type-id='type-id-14' name='names' filepath='Objects/codeobject.c' line='618' column='1'/> - <parameter type-id='type-id-14' name='varnames' filepath='Objects/codeobject.c' line='619' column='1'/> - <parameter type-id='type-id-14' name='freevars' filepath='Objects/codeobject.c' line='619' column='1'/> - <parameter type-id='type-id-14' name='cellvars' filepath='Objects/codeobject.c' line='619' column='1'/> - <parameter type-id='type-id-14' name='filename' filepath='Objects/codeobject.c' line='620' column='1'/> - <parameter type-id='type-id-14' name='name' filepath='Objects/codeobject.c' line='620' column='1'/> - <parameter type-id='type-id-14' name='qualname' filepath='Objects/codeobject.c' line='620' column='1'/> - <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='621' column='1'/> - <parameter type-id='type-id-14' name='linetable' filepath='Objects/codeobject.c' line='622' column='1'/> - <parameter type-id='type-id-14' name='exceptiontable' filepath='Objects/codeobject.c' line='623' column='1'/> + <function-decl name='PyCode_New' mangled-name='PyCode_New' filepath='Objects/codeobject.c' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_New'> + <parameter type-id='type-id-8' name='argcount' filepath='Objects/codeobject.c' line='622' column='1'/> + <parameter type-id='type-id-8' name='kwonlyargcount' filepath='Objects/codeobject.c' line='622' column='1'/> + <parameter type-id='type-id-8' name='nlocals' filepath='Objects/codeobject.c' line='623' column='1'/> + <parameter type-id='type-id-8' name='stacksize' filepath='Objects/codeobject.c' line='623' column='1'/> + <parameter type-id='type-id-8' name='flags' filepath='Objects/codeobject.c' line='623' column='1'/> + <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='624' column='1'/> + <parameter type-id='type-id-14' name='consts' filepath='Objects/codeobject.c' line='624' column='1'/> + <parameter type-id='type-id-14' name='names' filepath='Objects/codeobject.c' line='624' column='1'/> + <parameter type-id='type-id-14' name='varnames' filepath='Objects/codeobject.c' line='625' column='1'/> + <parameter type-id='type-id-14' name='freevars' filepath='Objects/codeobject.c' line='625' column='1'/> + <parameter type-id='type-id-14' name='cellvars' filepath='Objects/codeobject.c' line='625' column='1'/> + <parameter type-id='type-id-14' name='filename' filepath='Objects/codeobject.c' line='626' column='1'/> + <parameter type-id='type-id-14' name='name' filepath='Objects/codeobject.c' line='626' column='1'/> + <parameter type-id='type-id-14' name='qualname' filepath='Objects/codeobject.c' line='626' column='1'/> + <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='627' column='1'/> + <parameter type-id='type-id-14' name='linetable' filepath='Objects/codeobject.c' line='628' column='1'/> + <parameter type-id='type-id-14' name='exceptiontable' filepath='Objects/codeobject.c' line='629' column='1'/> <return type-id='type-id-444'/> </function-decl> - <function-decl name='PyCode_NewWithPosOnlyArgs' mangled-name='PyCode_NewWithPosOnlyArgs' filepath='Objects/codeobject.c' line='492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewWithPosOnlyArgs'> - <parameter type-id='type-id-8' name='argcount' filepath='Objects/codeobject.c' line='492' column='1'/> - <parameter type-id='type-id-8' name='posonlyargcount' filepath='Objects/codeobject.c' line='492' column='1'/> - <parameter type-id='type-id-8' name='kwonlyargcount' filepath='Objects/codeobject.c' line='492' column='1'/> - <parameter type-id='type-id-8' name='nlocals' filepath='Objects/codeobject.c' line='493' column='1'/> - <parameter type-id='type-id-8' name='stacksize' filepath='Objects/codeobject.c' line='493' column='1'/> - <parameter type-id='type-id-8' name='flags' filepath='Objects/codeobject.c' line='493' column='1'/> - <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='494' column='1'/> - <parameter type-id='type-id-14' name='consts' filepath='Objects/codeobject.c' line='494' column='1'/> - <parameter type-id='type-id-14' name='names' filepath='Objects/codeobject.c' line='494' column='1'/> - <parameter type-id='type-id-14' name='varnames' filepath='Objects/codeobject.c' line='495' column='1'/> - <parameter type-id='type-id-14' name='freevars' filepath='Objects/codeobject.c' line='495' column='1'/> - <parameter type-id='type-id-14' name='cellvars' filepath='Objects/codeobject.c' line='495' column='1'/> - <parameter type-id='type-id-14' name='filename' filepath='Objects/codeobject.c' line='496' column='1'/> - <parameter type-id='type-id-14' name='name' filepath='Objects/codeobject.c' line='496' column='1'/> - <parameter type-id='type-id-14' name='qualname' filepath='Objects/codeobject.c' line='497' column='1'/> - <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='497' column='1'/> - <parameter type-id='type-id-14' name='linetable' filepath='Objects/codeobject.c' line='498' column='1'/> - <parameter type-id='type-id-14' name='exceptiontable' filepath='Objects/codeobject.c' line='499' column='1'/> + <function-decl name='PyCode_NewWithPosOnlyArgs' mangled-name='PyCode_NewWithPosOnlyArgs' filepath='Objects/codeobject.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewWithPosOnlyArgs'> + <parameter type-id='type-id-8' name='argcount' filepath='Objects/codeobject.c' line='498' column='1'/> + <parameter type-id='type-id-8' name='posonlyargcount' filepath='Objects/codeobject.c' line='498' column='1'/> + <parameter type-id='type-id-8' name='kwonlyargcount' filepath='Objects/codeobject.c' line='498' column='1'/> + <parameter type-id='type-id-8' name='nlocals' filepath='Objects/codeobject.c' line='499' column='1'/> + <parameter type-id='type-id-8' name='stacksize' filepath='Objects/codeobject.c' line='499' column='1'/> + <parameter type-id='type-id-8' name='flags' filepath='Objects/codeobject.c' line='499' column='1'/> + <parameter type-id='type-id-14' name='code' filepath='Objects/codeobject.c' line='500' column='1'/> + <parameter type-id='type-id-14' name='consts' filepath='Objects/codeobject.c' line='500' column='1'/> + <parameter type-id='type-id-14' name='names' filepath='Objects/codeobject.c' line='500' column='1'/> + <parameter type-id='type-id-14' name='varnames' filepath='Objects/codeobject.c' line='501' column='1'/> + <parameter type-id='type-id-14' name='freevars' filepath='Objects/codeobject.c' line='501' column='1'/> + <parameter type-id='type-id-14' name='cellvars' filepath='Objects/codeobject.c' line='501' column='1'/> + <parameter type-id='type-id-14' name='filename' filepath='Objects/codeobject.c' line='502' column='1'/> + <parameter type-id='type-id-14' name='name' filepath='Objects/codeobject.c' line='502' column='1'/> + <parameter type-id='type-id-14' name='qualname' filepath='Objects/codeobject.c' line='503' column='1'/> + <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='503' column='1'/> + <parameter type-id='type-id-14' name='linetable' filepath='Objects/codeobject.c' line='504' column='1'/> + <parameter type-id='type-id-14' name='exceptiontable' filepath='Objects/codeobject.c' line='505' column='1'/> <return type-id='type-id-444'/> </function-decl> <class-decl name='_PyCodeConstructor' size-in-bits='896' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_code.h' line='168' column='1' id='type-id-503'> @@ -7594,8 +7597,8 @@ </data-member> </class-decl> <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-504'/> - <function-decl name='_PyCode_New' mangled-name='_PyCode_New' filepath='Objects/codeobject.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_New'> - <parameter type-id='type-id-504' name='con' filepath='Objects/codeobject.c' line='440' column='1'/> + <function-decl name='_PyCode_New' mangled-name='_PyCode_New' filepath='Objects/codeobject.c' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_New'> + <parameter type-id='type-id-504' name='con' filepath='Objects/codeobject.c' line='446' column='1'/> <return type-id='type-id-444'/> </function-decl> <function-decl name='_PyCode_Validate' mangled-name='_PyCode_Validate' filepath='Objects/codeobject.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_Validate'> @@ -11172,32 +11175,32 @@ <var-decl name='PyZip_Type' type-id='type-id-112' mangled-name='PyZip_Type' visibility='default' filepath='./Include/bltinmodule.h' line='9' column='1' elf-symbol-id='PyZip_Type'/> </abi-instr> <abi-instr version='1.0' address-size='64' path='Python/ceval.c' comp-dir-path='/src' language='LANG_C99'> - <function-decl name='Py_LeaveRecursiveCall' mangled-name='Py_LeaveRecursiveCall' filepath='Python/ceval.c' line='7919' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_LeaveRecursiveCall'> + <function-decl name='Py_LeaveRecursiveCall' mangled-name='Py_LeaveRecursiveCall' filepath='Python/ceval.c' line='7908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_LeaveRecursiveCall'> <return type-id='type-id-70'/> </function-decl> - <function-decl name='Py_EnterRecursiveCall' mangled-name='Py_EnterRecursiveCall' filepath='Python/ceval.c' line='7912' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_EnterRecursiveCall'> - <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7912' column='1'/> + <function-decl name='Py_EnterRecursiveCall' mangled-name='Py_EnterRecursiveCall' filepath='Python/ceval.c' line='7901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_EnterRecursiveCall'> + <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7901' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='_PyEval_RequestCodeExtraIndex' mangled-name='_PyEval_RequestCodeExtraIndex' filepath='Python/ceval.c' line='7831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_RequestCodeExtraIndex'> - <parameter type-id='type-id-104' name='free' filepath='Python/ceval.c' line='7831' column='1'/> + <function-decl name='_PyEval_RequestCodeExtraIndex' mangled-name='_PyEval_RequestCodeExtraIndex' filepath='Python/ceval.c' line='7820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_RequestCodeExtraIndex'> + <parameter type-id='type-id-104' name='free' filepath='Python/ceval.c' line='7820' column='1'/> <return type-id='type-id-36'/> </function-decl> - <function-decl name='_PyEval_SliceIndexNotNone' mangled-name='_PyEval_SliceIndexNotNone' filepath='Python/ceval.c' line='7351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndexNotNone'> + <function-decl name='_PyEval_SliceIndexNotNone' mangled-name='_PyEval_SliceIndexNotNone' filepath='Python/ceval.c' line='7340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndexNotNone'> <parameter type-id='type-id-14' name='exc' filepath='Objects/exceptions.c' line='2704' column='1'/> <parameter type-id='type-id-168' name='end' filepath='Objects/exceptions.c' line='2704' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='_PyEval_SliceIndex' mangled-name='_PyEval_SliceIndex' filepath='Python/ceval.c' line='7329' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndex'> - <parameter type-id='type-id-14' name='v' filepath='Python/ceval.c' line='7329' column='1'/> - <parameter type-id='type-id-168' name='pi' filepath='Python/ceval.c' line='7329' column='1'/> + <function-decl name='_PyEval_SliceIndex' mangled-name='_PyEval_SliceIndex' filepath='Python/ceval.c' line='7318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndex'> + <parameter type-id='type-id-14' name='v' filepath='Python/ceval.c' line='7318' column='1'/> + <parameter type-id='type-id-168' name='pi' filepath='Python/ceval.c' line='7318' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyEval_GetFuncDesc' mangled-name='PyEval_GetFuncDesc' filepath='Python/ceval.c' line='7202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncDesc'> + <function-decl name='PyEval_GetFuncDesc' mangled-name='PyEval_GetFuncDesc' filepath='Python/ceval.c' line='7191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncDesc'> <parameter type-id='type-id-14' name='ob' filepath='Objects/exceptions.c' line='421' column='1'/> <return type-id='type-id-3'/> </function-decl> - <function-decl name='PyEval_GetFuncName' mangled-name='PyEval_GetFuncName' filepath='Python/ceval.c' line='7189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncName'> + <function-decl name='PyEval_GetFuncName' mangled-name='PyEval_GetFuncName' filepath='Python/ceval.c' line='7178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncName'> <parameter type-id='type-id-14' name='ob' filepath='Objects/exceptions.c' line='421' column='1'/> <return type-id='type-id-3'/> </function-decl> @@ -11211,33 +11214,33 @@ </class-decl> <typedef-decl name='PyCompilerFlags' type-id='type-id-592' filepath='./Include/cpython/compile.h' line='29' column='1' id='type-id-591'/> <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-593'/> - <function-decl name='PyEval_MergeCompilerFlags' mangled-name='PyEval_MergeCompilerFlags' filepath='Python/ceval.c' line='7170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_MergeCompilerFlags'> - <parameter type-id='type-id-593' name='cf' filepath='Python/ceval.c' line='7170' column='1'/> + <function-decl name='PyEval_MergeCompilerFlags' mangled-name='PyEval_MergeCompilerFlags' filepath='Python/ceval.c' line='7159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_MergeCompilerFlags'> + <parameter type-id='type-id-593' name='cf' filepath='Python/ceval.c' line='7159' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyEval_GetGlobals' mangled-name='PyEval_GetGlobals' filepath='Python/ceval.c' line='7159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetGlobals'> + <function-decl name='PyEval_GetGlobals' mangled-name='PyEval_GetGlobals' filepath='Python/ceval.c' line='7148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetGlobals'> <return type-id='type-id-14'/> </function-decl> - <function-decl name='PyEval_GetLocals' mangled-name='PyEval_GetLocals' filepath='Python/ceval.c' line='7140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetLocals'> + <function-decl name='PyEval_GetLocals' mangled-name='PyEval_GetLocals' filepath='Python/ceval.c' line='7129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetLocals'> <return type-id='type-id-14'/> </function-decl> - <function-decl name='_PyEval_GetBuiltinId' mangled-name='_PyEval_GetBuiltinId' filepath='Python/ceval.c' line='7134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltinId'> - <parameter type-id='type-id-499' name='name' filepath='Python/ceval.c' line='7134' column='1'/> + <function-decl name='_PyEval_GetBuiltinId' mangled-name='_PyEval_GetBuiltinId' filepath='Python/ceval.c' line='7123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltinId'> + <parameter type-id='type-id-499' name='name' filepath='Python/ceval.c' line='7123' column='1'/> <return type-id='type-id-14'/> </function-decl> - <function-decl name='_PyEval_GetBuiltin' mangled-name='_PyEval_GetBuiltin' filepath='Python/ceval.c' line='7120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltin'> + <function-decl name='_PyEval_GetBuiltin' mangled-name='_PyEval_GetBuiltin' filepath='Python/ceval.c' line='7109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltin'> <parameter type-id='type-id-14' name='v' filepath='Objects/abstract.c' line='2122' column='1'/> <return type-id='type-id-14'/> </function-decl> - <function-decl name='PyEval_GetBuiltins' mangled-name='PyEval_GetBuiltins' filepath='Python/ceval.c' line='7112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetBuiltins'> + <function-decl name='PyEval_GetBuiltins' mangled-name='PyEval_GetBuiltins' filepath='Python/ceval.c' line='7101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetBuiltins'> <return type-id='type-id-14'/> </function-decl> - <function-decl name='PyEval_GetFrame' mangled-name='PyEval_GetFrame' filepath='Python/ceval.c' line='7088' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFrame'> + <function-decl name='PyEval_GetFrame' mangled-name='PyEval_GetFrame' filepath='Python/ceval.c' line='7077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFrame'> <return type-id='type-id-438'/> </function-decl> - <function-decl name='PyEval_SetTrace' mangled-name='PyEval_SetTrace' filepath='Python/ceval.c' line='7008' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetTrace'> - <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7008' column='1'/> - <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7008' column='1'/> + <function-decl name='PyEval_SetTrace' mangled-name='PyEval_SetTrace' filepath='Python/ceval.c' line='6997' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetTrace'> + <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6997' column='1'/> + <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6997' column='1'/> <return type-id='type-id-70'/> </function-decl> <class-decl name='_ts' size-in-bits='2880' is-struct='yes' visibility='default' filepath='./Include/cpython/pystate.h' line='82' column='1' id='type-id-594'> @@ -11363,43 +11366,43 @@ </data-member> </class-decl> <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-595'/> - <function-decl name='_PyEval_SetTrace' mangled-name='_PyEval_SetTrace' filepath='Python/ceval.c' line='6976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetTrace'> - <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6976' column='1'/> - <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6976' column='1'/> - <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6976' column='1'/> + <function-decl name='_PyEval_SetTrace' mangled-name='_PyEval_SetTrace' filepath='Python/ceval.c' line='6965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetTrace'> + <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6965' column='1'/> + <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6965' column='1'/> + <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6965' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyEval_SetProfile' mangled-name='PyEval_SetProfile' filepath='Python/ceval.c' line='6966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetProfile'> - <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7008' column='1'/> - <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7008' column='1'/> + <function-decl name='PyEval_SetProfile' mangled-name='PyEval_SetProfile' filepath='Python/ceval.c' line='6955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetProfile'> + <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6997' column='1'/> + <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6997' column='1'/> <return type-id='type-id-70'/> </function-decl> - <function-decl name='_PyEval_SetProfile' mangled-name='_PyEval_SetProfile' filepath='Python/ceval.c' line='6935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetProfile'> - <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6976' column='1'/> - <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6976' column='1'/> - <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6976' column='1'/> + <function-decl name='_PyEval_SetProfile' mangled-name='_PyEval_SetProfile' filepath='Python/ceval.c' line='6924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetProfile'> + <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6965' column='1'/> + <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6965' column='1'/> + <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6965' column='1'/> <return type-id='type-id-8'/> </function-decl> - <function-decl name='PyThreadState_LeaveTracing' mangled-name='PyThreadState_LeaveTracing' filepath='Python/ceval.c' line='6834' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_LeaveTracing'> + <function-decl name='PyThreadState_LeaveTracing' mangled-name='PyThreadState_LeaveTracing' filepath='Python/ceval.c' line='6828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_LeaveTracing'> <parameter type-id='type-id-10' name='tstate' filepath='Objects/object.c' line='2291' column='1'/> <return type-id='type-id-70'/> </function-decl> - <function-decl name='PyThreadState_EnterTracing' mangled-name='PyThreadState_EnterTracing' filepath='Python/ceval.c' line='6828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_EnterTracing'> + <function-decl name='PyThreadState_EnterTracing' mangled-name='PyThreadState_EnterTracing' filepath='Python/ceval.c' line='6822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_EnterTracing'> <parameter type-id='type-id-10' name='tstate' filepath='Objects/object.c' line='2291' column='1'/> <return type-id='type-id-70'/> </function-decl> - <function-decl name='PyEval_EvalCodeEx' mangled-name='PyEval_EvalCodeEx' filepath='Python/ceval.c' line='6431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalCodeEx'> - <parameter type-id='type-id-14' name='_co' filepath='Python/ceval.c' line='6431' column='1'/> - <parameter type-id='type-id-14' name='globals' filepath='Python/ceval.c' line='6431' column='1'/> - <parameter type-id='type-id-14' name='locals' filepath='Python/ceval.c' line='6431' column='1'/> - <parameter type-id='type-id-200' name='args' filepath='Python/ceval.c' line='6432' column='1'/> - <parameter type-id='type-id-8' name='argcount' filepath='Python/ceval.c' line='6432' column='1'/> - <parameter type-id='type-id-200' name='kws' filepath='Python/ceval.c' line='6433' column='1'/> - <parameter type-id='type-id-8' name='kwcount' filepath='Python/ceval.c' line='6433' column='1'/> - <parameter type-id='type-id-200' name='defs' filepath='Python/ceval.c' line='6434' column='1'/> - <parameter type-id='type-id-8' name='defcount' filepath='Python/ceval.c' line='6434' column='1'/> - <parameter type-id='type-id-14' name='kwdefs' filepath='Python/ceval.c' line='6435' column='1'/> - <parameter type-id='type-id-14' name='closure' filepath='Python/ceval.c' line='6435' column='1'/> + <function-decl name='PyEval_EvalCodeEx' mangled-name='PyEval_EvalCodeEx' filepath='Python/ceval.c' line='6425' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalCodeEx'> + <parameter type-id='type-id-14' name='_co' filepath='Python/ceval.c' line='6425' column='1'/> + <parameter type-id='type-id-14' name='globals' filepath='Python/ceval.c' line='6425' column='1'/> + <parameter type-id='type-id-14' name='locals' filepath='Python/ceval.c' line='6425' column='1'/> + <parameter type-id='type-id-200' name='args' filepath='Python/ceval.c' line='6426' column='1'/> + <parameter type-id='type-id-8' name='argcount' filepath='Python/ceval.c' line='6426' column='1'/> + <parameter type-id='type-id-200' name='kws' filepath='Python/ceval.c' line='6427' column='1'/> + <parameter type-id='type-id-8' name='kwcount' filepath='Python/ceval.c' line='6427' column='1'/> + <parameter type-id='type-id-200' name='defs' filepath='Python/ceval.c' line='6428' column='1'/> + <parameter type-id='type-id-8' name='defcount' filepath='Python/ceval.c' line='6428' column='1'/> + <parameter type-id='type-id-14' name='kwdefs' filepath='Python/ceval.c' line='6429' column='1'/> + <parameter type-id='type-id-14' name='closure' filepath='Python/ceval.c' line='6429' column='1'/> <return type-id='type-id-14'/> </function-decl> <typedef-decl name='_PyInterpreterFrame' type-id='type-id-375' filepath='./Include/internal/pycore_frame.h' line='67' column='1' id='type-id-596'/> @@ -14919,7 +14922,7 @@ <return type-id='type-id-14'/> </function-decl> <function-decl name='PyRun_SimpleString' mangled-name='PyRun_SimpleString' filepath='Python/pythonrun.c' line='1976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyRun_SimpleString'> - <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7912' column='1'/> + <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7901' column='1'/> <return type-id='type-id-8'/> </function-decl> <function-decl name='PyRun_String' mangled-name='PyRun_String' filepath='Python/pythonrun.c' line='1969' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyRun_String'> diff --git a/Include/cpython/code.h b/Include/cpython/code.h index 66cf4ec..ef8c642 100644 --- a/Include/cpython/code.h +++ b/Include/cpython/code.h @@ -91,6 +91,7 @@ typedef uint16_t _Py_CODEUNIT; PyObject *co_weakreflist; /* to support weakrefs to code objects */ \ PyObject *_co_code; /* cached co_code object/attribute */ \ char *_co_linearray; /* array of line offsets */ \ + int _co_firsttraceable; /* index of first traceable instruction */ \ /* Scratch space for extra data relating to the code object. \ Type is a void* to keep the format private in codeobject.c to force \ people to go through the proper APIs. */ \ diff --git a/Lib/opcode.py b/Lib/opcode.py index 3105828..bc3c02a 100644 --- a/Lib/opcode.py +++ b/Lib/opcode.py @@ -175,7 +175,7 @@ def_op('LOAD_CLASSDEREF', 148) hasfree.append(148) def_op('COPY_FREE_VARS', 149) -def_op('RESUME', 151) +def_op('RESUME', 151) # This must be kept in sync with deepfreeze.py def_op('MATCH_CLASS', 152) def_op('FORMAT_VALUE', 155) diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst new file mode 100644 index 0000000..a324c2d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst @@ -0,0 +1,2 @@ +Store offset of first traceable instruction in code object to avoid having +to recompute it for each instruction when tracing. diff --git a/Objects/codeobject.c b/Objects/codeobject.c index b23756b..2471006 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -341,6 +341,12 @@ init_code(PyCodeObject *co, struct _PyCodeConstructor *con) co->_co_linearray = NULL; memcpy(_PyCode_CODE(co), PyBytes_AS_STRING(con->code), PyBytes_GET_SIZE(con->code)); + int entry_point = 0; + while (entry_point < Py_SIZE(co) && + _Py_OPCODE(_PyCode_CODE(co)[entry_point]) != RESUME) { + entry_point++; + } + co->_co_firsttraceable = entry_point; } static int diff --git a/Python/ceval.c b/Python/ceval.c index 763187a..2d79483 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5608,57 +5608,51 @@ handle_eval_breaker: case DO_TRACING: #endif { - if (tstate->tracing == 0) { + if (tstate->tracing == 0 && + INSTR_OFFSET() >= frame->f_code->_co_firsttraceable + ) { + assert( + _PyOpcode_Deopt[first_instr[frame->f_code->_co_firsttraceable]] + == RESUME + ); int instr_prev = _PyInterpreterFrame_LASTI(frame); frame->prev_instr = next_instr; TRACING_NEXTOPARG(); - switch(opcode) { - case COPY_FREE_VARS: - case MAKE_CELL: - case RETURN_GENERATOR: - /* Frame not fully initialized */ - break; - case RESUME: - if (oparg < 2) { - CHECK_EVAL_BREAKER(); - } - /* Call tracing */ - TRACE_FUNCTION_ENTRY(); - DTRACE_FUNCTION_ENTRY(); - break; - case POP_TOP: - if (_Py_OPCODE(next_instr[-1]) == RETURN_GENERATOR) { - /* Frame not fully initialized */ - break; - } - /* fall through */ - default: - /* line-by-line tracing support */ - if (PyDTrace_LINE_ENABLED()) { - maybe_dtrace_line(frame, &tstate->trace_info, instr_prev); - } - - if (cframe.use_tracing && - tstate->c_tracefunc != NULL && !tstate->tracing) { - int err; - /* see maybe_call_line_trace() - for expository comments */ - _PyFrame_SetStackPointer(frame, stack_pointer); - - err = maybe_call_line_trace(tstate->c_tracefunc, - tstate->c_traceobj, - tstate, frame, instr_prev); - if (err) { - /* trace function raised an exception */ - next_instr++; - goto error; - } - /* Reload possibly changed frame fields */ - next_instr = frame->prev_instr; + if (opcode == RESUME) { + if (oparg < 2) { + CHECK_EVAL_BREAKER(); + } + /* Call tracing */ + TRACE_FUNCTION_ENTRY(); + DTRACE_FUNCTION_ENTRY(); + } + else { + /* line-by-line tracing support */ + if (PyDTrace_LINE_ENABLED()) { + maybe_dtrace_line(frame, &tstate->trace_info, instr_prev); + } - stack_pointer = _PyFrame_GetStackPointer(frame); - frame->stacktop = -1; + if (cframe.use_tracing && + tstate->c_tracefunc != NULL && !tstate->tracing) { + int err; + /* see maybe_call_line_trace() + for expository comments */ + _PyFrame_SetStackPointer(frame, stack_pointer); + + err = maybe_call_line_trace(tstate->c_tracefunc, + tstate->c_traceobj, + tstate, frame, instr_prev); + if (err) { + /* trace function raised an exception */ + next_instr++; + goto error; } + /* Reload possibly changed frame fields */ + next_instr = frame->prev_instr; + + stack_pointer = _PyFrame_GetStackPointer(frame); + frame->stacktop = -1; + } } } TRACING_NEXTOPARG(); @@ -6896,13 +6890,8 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj, if (_PyCode_InitLineArray(frame->f_code)) { return -1; } - int entry_point = 0; - _Py_CODEUNIT *code = _PyCode_CODE(frame->f_code); - while (_PyOpcode_Deopt[_Py_OPCODE(code[entry_point])] != RESUME) { - entry_point++; - } int lastline; - if (instr_prev <= entry_point) { + if (instr_prev <= frame->f_code->_co_firsttraceable) { lastline = -1; } else { diff --git a/Tools/scripts/deepfreeze.py b/Tools/scripts/deepfreeze.py index 5aca79a..5a64c1e 100644 --- a/Tools/scripts/deepfreeze.py +++ b/Tools/scripts/deepfreeze.py @@ -22,6 +22,9 @@ from generate_global_objects import get_identifiers_and_strings verbose = False identifiers, strings = get_identifiers_and_strings() +# This must be kept in sync with opcode.py +RESUME = 151 + def isprintable(b: bytes) -> bool: return all(0x20 <= c < 0x7f for c in b) @@ -284,6 +287,10 @@ class Printer: self.write(f"._co_code = NULL,") self.write("._co_linearray = NULL,") self.write(f".co_code_adaptive = {co_code_adaptive},") + for i, op in enumerate(code.co_code[::2]): + if op == RESUME: + self.write(f"._co_firsttraceable = {i},") + break name_as_code = f"(PyCodeObject *)&{name}" self.deallocs.append(f"_PyStaticCode_Dealloc({name_as_code});") self.interns.append(f"_PyStaticCode_InternStrings({name_as_code})") |