diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst index 8b812c173b5953..e5afa174413541 100644 --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -728,16 +728,18 @@ Finally, we compare the two: >>> from pprint import pprint >>> pprint(result) - [' 1. Beautiful is better than ugly.\n', - '- 2. Explicit is better than implicit.\n', - '- 3. Simple is better than complex.\n', - '+ 3. Simple is better than complex.\n', - '? ++\n', - '- 4. Complex is better than complicated.\n', - '? ^ ---- ^\n', - '+ 4. Complicated is better than complex.\n', - '? ++++ ^ ^\n', - '+ 5. Flat is better than nested.\n'] + [ + ' 1. Beautiful is better than ugly.\n', + '- 2. Explicit is better than implicit.\n', + '- 3. Simple is better than complex.\n', + '+ 3. Simple is better than complex.\n', + '? ++\n', + '- 4. Complex is better than complicated.\n', + '? ^ ---- ^\n', + '+ 4. Complicated is better than complex.\n', + '? ++++ ^ ^\n', + '+ 5. Flat is better than nested.\n', + ] As a single multi-line string it looks like this: diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index 4f043fbb3a46df..0bdbe8c2e2bc97 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -17,7 +17,7 @@ objects which are not representable as Python literals. The formatted representation keeps objects on a single line if it can, and breaks them onto multiple lines if they don't fit within the allowed width, -adjustable by the *width* parameter defaulting to 80 characters. +adjustable by the *width* parameter defaulting to 88 characters. .. versionchanged:: 3.9 Added support for pretty-printing :class:`types.SimpleNamespace`. @@ -30,9 +30,8 @@ adjustable by the *width* parameter defaulting to 80 characters. Functions --------- -.. function:: pp(object, stream=None, indent=1, width=80, depth=None, *, \ - compact=False, expand=False, sort_dicts=False, \ - underscore_numbers=False) +.. function:: pp(object, stream=None, indent=4, width=88, depth=None, *, \ + compact=False, sort_dicts=False, underscore_numbers=False) Prints the formatted representation of *object*, followed by a newline. This function may be used in the interactive interpreter @@ -67,16 +66,11 @@ Functions :param bool compact: Control the way long :term:`sequences ` are formatted. If ``False`` (the default), - each item of a sequence will be formatted on a separate line, - otherwise as many items as will fit within the *width* - will be formatted on each output line. - Incompatible with *expand*. - - :param bool expand: - If ``True``, opening parentheses and brackets will be followed by a newline and the following content will be indented by one level, similar to - pretty-printed JSON. Incompatible with *compact*. + pretty-printed JSON. + If ``True``, as many items as will fit within the *width* + will be formatted on each output line. :param bool sort_dicts: If ``True``, dictionaries will be formatted with @@ -91,32 +85,25 @@ Functions >>> import pprint >>> stuff = ['spam', 'eggs', 'lumberjack', 'knights', 'ni'] >>> stuff.insert(0, stuff) - >>> pprint.pp(stuff) - [, - 'spam', - 'eggs', - 'lumberjack', - 'knights', - 'ni'] + >>> pprint.pp(stuff, width=100) + [, 'spam', 'eggs', 'lumberjack', 'knights', 'ni'] .. versionadded:: 3.8 -.. function:: pprint(object, stream=None, indent=1, width=80, depth=None, *, \ - compact=False, expand=False, sort_dicts=True, \ - underscore_numbers=False) +.. function:: pprint(object, stream=None, indent=4, width=88, depth=None, *, \ + compact=False, sort_dicts=True, underscore_numbers=False) Alias for :func:`~pprint.pp` with *sort_dicts* set to ``True`` by default, which would automatically sort the dictionaries' keys, you might want to use :func:`~pprint.pp` instead where it is ``False`` by default. -.. function:: pformat(object, indent=1, width=80, depth=None, *, \ - compact=False, expand=False, sort_dicts=True, \ - underscore_numbers=False) +.. function:: pformat(object, indent=4, width=88, depth=None, *, \ + compact=False, sort_dicts=True, underscore_numbers=False) Return the formatted representation of *object* as a string. *indent*, - *width*, *depth*, *compact*, *expand*, *sort_dicts* and *underscore_numbers* are + *width*, *depth*, *compact*, *sort_dicts* and *underscore_numbers* are passed to the :class:`PrettyPrinter` constructor as formatting parameters and their meanings are as described in the documentation above. @@ -154,13 +141,13 @@ Functions .. _prettyprinter-objects: -PrettyPrinter Objects +PrettyPrinter objects --------------------- .. index:: single: ...; placeholder -.. class:: PrettyPrinter(indent=1, width=80, depth=None, stream=None, *, \ - compact=False, expand=False, sort_dicts=True, \ +.. class:: PrettyPrinter(indent=4, width=88, depth=None, stream=None, *, \ + compact=False, sort_dicts=True, \ underscore_numbers=False) Construct a :class:`PrettyPrinter` instance. @@ -171,21 +158,23 @@ PrettyPrinter Objects >>> import pprint >>> stuff = ['spam', 'eggs', 'lumberjack', 'knights', 'ni'] >>> stuff.insert(0, stuff[:]) - >>> pp = pprint.PrettyPrinter(indent=4) + >>> pp = pprint.PrettyPrinter() >>> pp.pprint(stuff) - [ ['spam', 'eggs', 'lumberjack', 'knights', 'ni'], + [ + ['spam', 'eggs', 'lumberjack', 'knights', 'ni'], 'spam', 'eggs', 'lumberjack', 'knights', - 'ni'] - >>> pp = pprint.PrettyPrinter(width=41, compact=True) + 'ni', + ] + >>> pp = pprint.PrettyPrinter(indent=1, width=41, compact=True) >>> pp.pprint(stuff) [['spam', 'eggs', 'lumberjack', 'knights', 'ni'], 'spam', 'eggs', 'lumberjack', 'knights', 'ni'] - >>> pp = pprint.PrettyPrinter(width=41, expand=True, indent=3) + >>> pp = pprint.PrettyPrinter(width=41, indent=3) >>> pp.pprint(stuff) [ [ @@ -220,8 +209,12 @@ PrettyPrinter Objects .. versionchanged:: 3.11 No longer attempts to write to :data:`!sys.stdout` if it is ``None``. - .. versionchanged:: 3.15 - Added the *expand* parameter. + .. versionchanged:: next + Changed default *indent* from 1 to 4 + and default *width* from 80 to 88. + The default ``compact=False`` layout is now similar to + pretty-printed JSON, with opening parentheses and brackets + followed by a newline and the contents indented by one level. :class:`PrettyPrinter` instances have the following methods: @@ -298,219 +291,144 @@ let's fetch information about a project from `PyPI `_:: In its basic form, :func:`~pprint.pp` shows the whole object:: >>> pprint.pp(project_info) - {'author': 'The Python Packaging Authority', - 'author_email': 'pypa-dev@googlegroups.com', - 'bugtrack_url': None, - 'classifiers': ['Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Topic :: Software Development :: Build Tools'], - 'description': 'A sample Python project\n' - '=======================\n' - '\n' - 'This is the description file for the project.\n' - '\n' - 'The file should use UTF-8 encoding and be written using ' - 'ReStructured Text. It\n' - 'will be used to generate the project webpage on PyPI, and ' - 'should be written for\n' - 'that purpose.\n' - '\n' - 'Typical contents for this file would include an overview of ' - 'the project, basic\n' - 'usage examples, etc. Generally, including the project ' - 'changelog in here is not\n' - 'a good idea, although a simple "What\'s New" section for the ' - 'most recent version\n' - 'may be appropriate.', - 'description_content_type': None, - 'docs_url': None, - 'download_url': 'UNKNOWN', - 'downloads': {'last_day': -1, 'last_month': -1, 'last_week': -1}, - 'home_page': 'https://github.com/pypa/sampleproject', - 'keywords': 'sample setuptools development', - 'license': 'MIT', - 'maintainer': None, - 'maintainer_email': None, - 'name': 'sampleproject', - 'package_url': 'https://pypi.org/project/sampleproject/', - 'platform': 'UNKNOWN', - 'project_url': 'https://pypi.org/project/sampleproject/', - 'project_urls': {'Download': 'UNKNOWN', - 'Homepage': 'https://github.com/pypa/sampleproject'}, - 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', - 'requires_dist': None, - 'requires_python': None, - 'summary': 'A sample Python project', - 'version': '1.2.0'} + { + 'author': 'The Python Packaging Authority', + 'author_email': 'pypa-dev@googlegroups.com', + 'bugtrack_url': None, + 'classifiers': [ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Topic :: Software Development :: Build Tools', + ], + 'description': 'A sample Python project\n' + '=======================\n' + '\n' + 'This is the description file for the project.\n' + '\n' + 'The file should use UTF-8 encoding and be written using ReStructured Text. It\n' + 'will be used to generate the project webpage on PyPI, and should be written for\n' + 'that purpose.\n' + '\n' + 'Typical contents for this file would include an overview of the project, basic\n' + 'usage examples, etc. Generally, including the project changelog in here is not\n' + 'a good idea, although a simple "What\'s New" section for the most recent version\n' + 'may be appropriate.', + 'description_content_type': None, + 'docs_url': None, + 'download_url': 'UNKNOWN', + 'downloads': {'last_day': -1, 'last_month': -1, 'last_week': -1}, + 'home_page': 'https://github.com/pypa/sampleproject', + 'keywords': 'sample setuptools development', + 'license': 'MIT', + 'maintainer': None, + 'maintainer_email': None, + 'name': 'sampleproject', + 'package_url': 'https://pypi.org/project/sampleproject/', + 'platform': 'UNKNOWN', + 'project_url': 'https://pypi.org/project/sampleproject/', + 'project_urls': {'Download': 'UNKNOWN', 'Homepage': 'https://github.com/pypa/sampleproject'}, + 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', + 'requires_dist': None, + 'requires_python': None, + 'summary': 'A sample Python project', + 'version': '1.2.0', + } The result can be limited to a certain *depth* (ellipsis is used for deeper contents):: >>> pprint.pp(project_info, depth=1) - {'author': 'The Python Packaging Authority', - 'author_email': 'pypa-dev@googlegroups.com', - 'bugtrack_url': None, - 'classifiers': [...], - 'description': 'A sample Python project\n' - '=======================\n' - '\n' - 'This is the description file for the project.\n' - '\n' - 'The file should use UTF-8 encoding and be written using ' - 'ReStructured Text. It\n' - 'will be used to generate the project webpage on PyPI, and ' - 'should be written for\n' - 'that purpose.\n' - '\n' - 'Typical contents for this file would include an overview of ' - 'the project, basic\n' - 'usage examples, etc. Generally, including the project ' - 'changelog in here is not\n' - 'a good idea, although a simple "What\'s New" section for the ' - 'most recent version\n' - 'may be appropriate.', - 'description_content_type': None, - 'docs_url': None, - 'download_url': 'UNKNOWN', - 'downloads': {...}, - 'home_page': 'https://github.com/pypa/sampleproject', - 'keywords': 'sample setuptools development', - 'license': 'MIT', - 'maintainer': None, - 'maintainer_email': None, - 'name': 'sampleproject', - 'package_url': 'https://pypi.org/project/sampleproject/', - 'platform': 'UNKNOWN', - 'project_url': 'https://pypi.org/project/sampleproject/', - 'project_urls': {...}, - 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', - 'requires_dist': None, - 'requires_python': None, - 'summary': 'A sample Python project', - 'version': '1.2.0'} + { + 'author': 'The Python Packaging Authority', + 'author_email': 'pypa-dev@googlegroups.com', + 'bugtrack_url': None, + 'classifiers': [...], + 'description': 'A sample Python project\n' + '=======================\n' + '\n' + 'This is the description file for the project.\n' + '\n' + 'The file should use UTF-8 encoding and be written using ReStructured Text. It\n' + 'will be used to generate the project webpage on PyPI, and should be written for\n' + 'that purpose.\n' + '\n' + 'Typical contents for this file would include an overview of the project, basic\n' + 'usage examples, etc. Generally, including the project changelog in here is not\n' + 'a good idea, although a simple "What\'s New" section for the most recent version\n' + 'may be appropriate.', + 'description_content_type': None, + 'docs_url': None, + 'download_url': 'UNKNOWN', + 'downloads': {...}, + 'home_page': 'https://github.com/pypa/sampleproject', + 'keywords': 'sample setuptools development', + 'license': 'MIT', + 'maintainer': None, + 'maintainer_email': None, + 'name': 'sampleproject', + 'package_url': 'https://pypi.org/project/sampleproject/', + 'platform': 'UNKNOWN', + 'project_url': 'https://pypi.org/project/sampleproject/', + 'project_urls': {...}, + 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', + 'requires_dist': None, + 'requires_python': None, + 'summary': 'A sample Python project', + 'version': '1.2.0', + } Additionally, maximum character *width* can be suggested. If a long object cannot be split, the specified width will be exceeded:: >>> pprint.pp(project_info, depth=1, width=60) - {'author': 'The Python Packaging Authority', - 'author_email': 'pypa-dev@googlegroups.com', - 'bugtrack_url': None, - 'classifiers': [...], - 'description': 'A sample Python project\n' - '=======================\n' - '\n' - 'This is the description file for the ' - 'project.\n' - '\n' - 'The file should use UTF-8 encoding and be ' - 'written using ReStructured Text. It\n' - 'will be used to generate the project ' - 'webpage on PyPI, and should be written ' - 'for\n' - 'that purpose.\n' - '\n' - 'Typical contents for this file would ' - 'include an overview of the project, ' - 'basic\n' - 'usage examples, etc. Generally, including ' - 'the project changelog in here is not\n' - 'a good idea, although a simple "What\'s ' - 'New" section for the most recent version\n' - 'may be appropriate.', - 'description_content_type': None, - 'docs_url': None, - 'download_url': 'UNKNOWN', - 'downloads': {...}, - 'home_page': 'https://github.com/pypa/sampleproject', - 'keywords': 'sample setuptools development', - 'license': 'MIT', - 'maintainer': None, - 'maintainer_email': None, - 'name': 'sampleproject', - 'package_url': 'https://pypi.org/project/sampleproject/', - 'platform': 'UNKNOWN', - 'project_url': 'https://pypi.org/project/sampleproject/', - 'project_urls': {...}, - 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', - 'requires_dist': None, - 'requires_python': None, - 'summary': 'A sample Python project', - 'version': '1.2.0'} - -Lastly, we can format like pretty-printed JSON with the *expand* parameter. -Best results are achieved with a higher *indent* value:: - - >>> pprint.pp(project_info, indent=4, expand=True) { - 'author': 'The Python Packaging Authority', - 'author_email': 'pypa-dev@googlegroups.com', - 'bugtrack_url': None, - 'classifiers': [ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Topic :: Software Development :: Build Tools', - ], - 'description': 'A sample Python project\n' - '=======================\n' - '\n' - 'This is the description file for the project.\n' - '\n' - 'The file should use UTF-8 encoding and be written using ReStructured ' - 'Text. It\n' - 'will be used to generate the project webpage on PyPI, and should be ' - 'written for\n' - 'that purpose.\n' - '\n' - 'Typical contents for this file would include an overview of the project, ' - 'basic\n' - 'usage examples, etc. Generally, including the project changelog in here ' - 'is not\n' - 'a good idea, although a simple "What\'s New" section for the most recent ' - 'version\n' - 'may be appropriate.', - 'description_content_type': None, - 'docs_url': None, - 'download_url': 'UNKNOWN', - 'downloads': {'last_day': -1, 'last_month': -1, 'last_week': -1}, - 'dynamic': None, - 'home_page': 'https://github.com/pypa/sampleproject', - 'keywords': 'sample setuptools development', - 'license': 'MIT', - 'license_expression': None, - 'license_files': None, - 'maintainer': None, - 'maintainer_email': None, - 'name': 'sampleproject', - 'package_url': 'https://pypi.org/project/sampleproject/', - 'platform': 'UNKNOWN', - 'project_url': 'https://pypi.org/project/sampleproject/', - 'project_urls': { - 'Download': 'UNKNOWN', - 'Homepage': 'https://github.com/pypa/sampleproject', - }, - 'provides_extra': None, - 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', - 'requires_dist': None, - 'requires_python': None, - 'summary': 'A sample Python project', - 'version': '1.2.0', - 'yanked': False, - 'yanked_reason': None, + 'author': 'The Python Packaging Authority', + 'author_email': 'pypa-dev@googlegroups.com', + 'bugtrack_url': None, + 'classifiers': [...], + 'description': 'A sample Python project\n' + '=======================\n' + '\n' + 'This is the description file for the project.\n' + '\n' + 'The file should use UTF-8 encoding and be written ' + 'using ReStructured Text. It\n' + 'will be used to generate the project webpage on PyPI, ' + 'and should be written for\n' + 'that purpose.\n' + '\n' + 'Typical contents for this file would include an ' + 'overview of the project, basic\n' + 'usage examples, etc. Generally, including the project ' + 'changelog in here is not\n' + 'a good idea, although a simple "What\'s New" section ' + 'for the most recent version\n' + 'may be appropriate.', + 'description_content_type': None, + 'docs_url': None, + 'download_url': 'UNKNOWN', + 'downloads': {...}, + 'home_page': 'https://github.com/pypa/sampleproject', + 'keywords': 'sample setuptools development', + 'license': 'MIT', + 'maintainer': None, + 'maintainer_email': None, + 'name': 'sampleproject', + 'package_url': 'https://pypi.org/project/sampleproject/', + 'platform': 'UNKNOWN', + 'project_url': 'https://pypi.org/project/sampleproject/', + 'project_urls': {...}, + 'release_url': 'https://pypi.org/project/sampleproject/1.2.0/', + 'requires_dist': None, + 'requires_python': None, + 'summary': 'A sample Python project', + 'version': '1.2.0', } diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index f2c35d1897a77f..d9c736d27dcaec 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -2473,67 +2473,79 @@ Visual inspection shows that the certificate does identify the desired service (that is, the HTTPS host ``www.python.org``):: >>> pprint.pprint(cert) - {'OCSP': ('http://ocsp.digicert.com',), - 'caIssuers': ('http://cacerts.digicert.com/DigiCertSHA2ExtendedValidationServerCA.crt',), - 'crlDistributionPoints': ('http://crl3.digicert.com/sha2-ev-server-g1.crl', - 'http://crl4.digicert.com/sha2-ev-server-g1.crl'), - 'issuer': ((('countryName', 'US'),), - (('organizationName', 'DigiCert Inc'),), - (('organizationalUnitName', 'www.digicert.com'),), - (('commonName', 'DigiCert SHA2 Extended Validation Server CA'),)), - 'notAfter': 'Sep 9 12:00:00 2016 GMT', - 'notBefore': 'Sep 5 00:00:00 2014 GMT', - 'serialNumber': '01BB6F00122B177F36CAB49CEA8B6B26', - 'subject': ((('businessCategory', 'Private Organization'),), - (('1.3.6.1.4.1.311.60.2.1.3', 'US'),), - (('1.3.6.1.4.1.311.60.2.1.2', 'Delaware'),), - (('serialNumber', '3359300'),), - (('streetAddress', '16 Allen Rd'),), - (('postalCode', '03894-4801'),), - (('countryName', 'US'),), - (('stateOrProvinceName', 'NH'),), - (('localityName', 'Wolfeboro'),), - (('organizationName', 'Python Software Foundation'),), - (('commonName', 'www.python.org'),)), - 'subjectAltName': (('DNS', 'www.python.org'), - ('DNS', 'python.org'), - ('DNS', 'pypi.org'), - ('DNS', 'docs.python.org'), - ('DNS', 'testpypi.org'), - ('DNS', 'bugs.python.org'), - ('DNS', 'wiki.python.org'), - ('DNS', 'hg.python.org'), - ('DNS', 'mail.python.org'), - ('DNS', 'packaging.python.org'), - ('DNS', 'pythonhosted.org'), - ('DNS', 'www.pythonhosted.org'), - ('DNS', 'test.pythonhosted.org'), - ('DNS', 'us.pycon.org'), - ('DNS', 'id.python.org')), - 'version': 3} + { + 'OCSP': ('http://ocsp.digicert.com',), + 'caIssuers': ('http://cacerts.digicert.com/DigiCertSHA2ExtendedValidationServerCA.crt',), + 'crlDistributionPoints': ( + 'http://crl3.digicert.com/sha2-ev-server-g1.crl', + 'http://crl4.digicert.com/sha2-ev-server-g1.crl', + ), + 'issuer': ( + (('countryName', 'US'),), + (('organizationName', 'DigiCert Inc'),), + (('organizationalUnitName', 'www.digicert.com'),), + (('commonName', 'DigiCert SHA2 Extended Validation Server CA'),), + ), + 'notAfter': 'Sep 9 12:00:00 2016 GMT', + 'notBefore': 'Sep 5 00:00:00 2014 GMT', + 'serialNumber': '01BB6F00122B177F36CAB49CEA8B6B26', + 'subject': ( + (('businessCategory', 'Private Organization'),), + (('1.3.6.1.4.1.311.60.2.1.3', 'US'),), + (('1.3.6.1.4.1.311.60.2.1.2', 'Delaware'),), + (('serialNumber', '3359300'),), + (('streetAddress', '16 Allen Rd'),), + (('postalCode', '03894-4801'),), + (('countryName', 'US'),), + (('stateOrProvinceName', 'NH'),), + (('localityName', 'Wolfeboro'),), + (('organizationName', 'Python Software Foundation'),), + (('commonName', 'www.python.org'),), + ), + 'subjectAltName': ( + ('DNS', 'www.python.org'), + ('DNS', 'python.org'), + ('DNS', 'pypi.org'), + ('DNS', 'docs.python.org'), + ('DNS', 'testpypi.org'), + ('DNS', 'bugs.python.org'), + ('DNS', 'wiki.python.org'), + ('DNS', 'hg.python.org'), + ('DNS', 'mail.python.org'), + ('DNS', 'packaging.python.org'), + ('DNS', 'pythonhosted.org'), + ('DNS', 'www.pythonhosted.org'), + ('DNS', 'test.pythonhosted.org'), + ('DNS', 'us.pycon.org'), + ('DNS', 'id.python.org'), + ), + 'version': 3, + } Now the SSL channel is established and the certificate verified, you can proceed to talk with the server:: >>> conn.sendall(b"HEAD / HTTP/1.0\r\nHost: linuxfr.org\r\n\r\n") >>> pprint.pprint(conn.recv(1024).split(b"\r\n")) - [b'HTTP/1.1 200 OK', - b'Date: Sat, 18 Oct 2014 18:27:20 GMT', - b'Server: nginx', - b'Content-Type: text/html; charset=utf-8', - b'X-Frame-Options: SAMEORIGIN', - b'Content-Length: 45679', - b'Accept-Ranges: bytes', - b'Via: 1.1 varnish', - b'Age: 2188', - b'X-Served-By: cache-lcy1134-LCY', - b'X-Cache: HIT', - b'X-Cache-Hits: 11', - b'Vary: Cookie', - b'Strict-Transport-Security: max-age=63072000; includeSubDomains', - b'Connection: close', - b'', - b''] + [ + b'HTTP/1.1 200 OK', + b'Date: Sat, 18 Oct 2014 18:27:20 GMT', + b'Server: nginx', + b'Content-Type: text/html; charset=utf-8', + b'X-Frame-Options: SAMEORIGIN', + b'Content-Length: 45679', + b'Accept-Ranges: bytes', + b'Via: 1.1 varnish', + b'Age: 2188', + b'X-Served-By: cache-lcy1134-LCY', + b'X-Cache: HIT', + b'X-Cache-Hits: 11', + b'Vary: Cookie', + b'Strict-Transport-Security: max-age=63072000; includeSubDomains', + b'Connection: close', + b'', + b'', + ] See the discussion of :ref:`ssl-security` below. diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 2ff1015af7a86e..5b9f9eec93aa28 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -2347,10 +2347,12 @@ chained call: >>> kall = call(1).method(arg='foo').other('bar')(2.0) >>> kall.call_list() - [call(1), - call().method(arg='foo'), - call().method().other('bar'), - call().method().other()(2.0)] + [ + call(1), + call().method(arg='foo'), + call().method().other('bar'), + call().method().other()(2.0), + ] >>> m.mock_calls == kall.call_list() True diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst index 6c68ba01081379..2c3ec71cd3de39 100644 --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -30,11 +30,22 @@ and indentation to more clearly reveal data structure:: ... 'yellow'], 'blue']]] ... >>> pprint.pprint(t, width=30) - [[[['black', 'cyan'], - 'white', - ['green', 'red']], - [['magenta', 'yellow'], - 'blue']]] + [ + [ + [ + ['black', 'cyan'], + 'white', + ['green', 'red'], + ], + [ + [ + 'magenta', + 'yellow', + ], + 'blue', + ], + ], + ] The :mod:`textwrap` module formats paragraphs of text to fit a given screen width:: diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst index c34a1bf3c47126..3cf69718e63b28 100644 --- a/Doc/whatsnew/3.15.rst +++ b/Doc/whatsnew/3.15.rst @@ -1210,12 +1210,11 @@ pickletools pprint ------ -* Add an *expand* keyword argument for :func:`pprint.pprint`, - :func:`pprint.pformat`, :func:`pprint.pp`. If true, the output will be - formatted similar to pretty-printed :func:`json.dumps` when - *indent* is supplied. +* :mod:`pprint` now uses modern defaults: ``indent=4, width=88``, + and the default ``compact=False`` output is now formatted similar to + pretty-printed :func:`json.dumps`. (Contributed by Stefan Todoran, Semyon Moroz and Hugo van Kemenade in - :gh:`112632`.) + :gh:`112632` and :gh:`149189`.) * Add t-string support to :mod:`pprint`. (Contributed by Loïc Simon and Hugo van Kemenade in :gh:`134551`.) diff --git a/Include/cpython/object.h b/Include/cpython/object.h index d0b3d0cb14de3d..326254c335b489 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -241,7 +241,11 @@ struct _typeobject { * Otherwise, limited to MAX_VERSIONS_PER_CLASS (defined elsewhere). */ uint16_t tp_versions_used; - _Py_iteritemfunc _tp_iteritem; /* Virtual iterator next function */ + + /* Virtual iterator next function. + * This function must escape to any code that can result in + * the GC being run, such as Py_DECREF. */ + _Py_iteritemfunc _tp_iteritem; }; #define _Py_ATTR_CACHE_UNUSED (30000) // (see tp_versions_used) diff --git a/Include/internal/pycore_abstract.h b/Include/internal/pycore_abstract.h index b9eb4fd9891e66..67c6fa7c0c4ed5 100644 --- a/Include/internal/pycore_abstract.h +++ b/Include/internal/pycore_abstract.h @@ -60,6 +60,14 @@ PyAPI_FUNC(int) _Py_convert_optional_to_non_negative_ssize_t(PyObject *, void *) // Export for 'math' shared extension. PyAPI_FUNC(PyObject*) _PyNumber_Index(PyObject *o); +typedef struct { + PyObject *object; + PySendResult kind; +} PySendResultPair; + +// Same as PyIter_Send but returns a struct for MSVC tailcall support +PyAPI_FUNC(PySendResultPair) _PyIter_Send(PyObject *iter, PyObject *arg); + #ifdef __cplusplus } #endif diff --git a/Include/internal/pycore_genobject.h b/Include/internal/pycore_genobject.h index 2c264c39ae9de0..c86ae242feac1e 100644 --- a/Include/internal/pycore_genobject.h +++ b/Include/internal/pycore_genobject.h @@ -40,6 +40,8 @@ extern PyTypeObject _PyCoroWrapper_Type; extern PyTypeObject _PyAsyncGenWrappedValue_Type; extern PyTypeObject _PyAsyncGenAThrow_Type; +PyAPI_FUNC(PySendResult) _PyAsyncGenASend_Send(PyObject *iter, PyObject *arg, PyObject **result); + #ifdef __cplusplus } #endif diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h index fd918e13f2d1c7..177938e3cdb5eb 100644 --- a/Include/internal/pycore_magic_number.h +++ b/Include/internal/pycore_magic_number.h @@ -296,6 +296,7 @@ Known values: Python 3.15a8 3663 (Merge GET_ITER and GET_YIELD_FROM_ITER. Modify SEND to make it a bit more like FOR_ITER) Python 3.15a8 3664 (Fix __qualname__ for __annotate__ functions) Python 3.15a8 3665 (Add FOR_ITER_VIRTUAL and GET_ITER specializations) + Python 3.15b1 3666 (Add SEND_VIRTUAL and SEND_ASYNC_GEN specializations) Python 3.16 will start with 3700 @@ -309,7 +310,7 @@ PC/launcher.c must also be updated. */ -#define PYC_MAGIC_NUMBER 3665 +#define PYC_MAGIC_NUMBER 3666 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes (little-endian) and then appending b'\r\n'. */ #define PYC_MAGIC_NUMBER_TOKEN \ diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index b82ad991d539d5..d2e29a1b95ede2 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -438,8 +438,12 @@ int _PyOpcode_num_popped(int opcode, int oparg) { return 1; case SEND: return 3; + case SEND_ASYNC_GEN: + return 3; case SEND_GEN: return 3; + case SEND_VIRTUAL: + return 3; case SETUP_ANNOTATIONS: return 0; case SETUP_CLEANUP: @@ -935,8 +939,12 @@ int _PyOpcode_num_pushed(int opcode, int oparg) { return 1; case SEND: return 3; + case SEND_ASYNC_GEN: + return 3; case SEND_GEN: return 2; + case SEND_VIRTUAL: + return 3; case SETUP_ANNOTATIONS: return 0; case SETUP_CLEANUP: @@ -1298,7 +1306,9 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [RETURN_GENERATOR] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [RETURN_VALUE] = { true, INSTR_FMT_IX, HAS_ESCAPES_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [SEND] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, + [SEND_ASYNC_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, [SEND_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, + [SEND_VIRTUAL] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, [SETUP_ANNOTATIONS] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [SET_ADD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [SET_FUNCTION_ATTRIBUTE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, @@ -1443,7 +1453,7 @@ _PyOpcode_macro_expansion[256] = { [FOR_ITER_LIST] = { .nuops = 3, .uops = { { _ITER_CHECK_LIST, OPARG_SIMPLE, 1 }, { _ITER_JUMP_LIST, OPARG_REPLACED, 1 }, { _ITER_NEXT_LIST, OPARG_REPLACED, 1 } } }, [FOR_ITER_RANGE] = { .nuops = 3, .uops = { { _ITER_CHECK_RANGE, OPARG_SIMPLE, 1 }, { _ITER_JUMP_RANGE, OPARG_REPLACED, 1 }, { _ITER_NEXT_RANGE, OPARG_SIMPLE, 1 } } }, [FOR_ITER_TUPLE] = { .nuops = 3, .uops = { { _ITER_CHECK_TUPLE, OPARG_SIMPLE, 1 }, { _ITER_JUMP_TUPLE, OPARG_REPLACED, 1 }, { _ITER_NEXT_TUPLE, OPARG_SIMPLE, 1 } } }, - [FOR_ITER_VIRTUAL] = { .nuops = 2, .uops = { { _GUARD_NOS_ITER_VIRTUAL, OPARG_SIMPLE, 1 }, { _FOR_ITER_VIRTUAL, OPARG_REPLACED, 1 } } }, + [FOR_ITER_VIRTUAL] = { .nuops = 2, .uops = { { _GUARD_TOS_NOT_NULL, OPARG_SIMPLE, 1 }, { _FOR_ITER_VIRTUAL, OPARG_REPLACED, 1 } } }, [GET_AITER] = { .nuops = 1, .uops = { { _GET_AITER, OPARG_SIMPLE, 0 } } }, [GET_ANEXT] = { .nuops = 1, .uops = { { _GET_ANEXT, OPARG_SIMPLE, 0 } } }, [GET_AWAITABLE] = { .nuops = 1, .uops = { { _GET_AWAITABLE, OPARG_SIMPLE, 0 } } }, @@ -1514,7 +1524,9 @@ _PyOpcode_macro_expansion[256] = { [RESUME_CHECK] = { .nuops = 1, .uops = { { _RESUME_CHECK, OPARG_SIMPLE, 1 } } }, [RETURN_GENERATOR] = { .nuops = 1, .uops = { { _RETURN_GENERATOR, OPARG_SIMPLE, 0 } } }, [RETURN_VALUE] = { .nuops = 2, .uops = { { _MAKE_HEAP_SAFE, OPARG_SIMPLE, 0 }, { _RETURN_VALUE, OPARG_SIMPLE, 0 } } }, + [SEND_ASYNC_GEN] = { .nuops = 2, .uops = { { _GUARD_3OS_ASYNC_GEN_ASEND, OPARG_SIMPLE, 1 }, { _SEND_ASYNC_GEN, OPARG_REPLACED, 1 } } }, [SEND_GEN] = { .nuops = 4, .uops = { { _RECORD_3OS_GEN_FUNC, OPARG_SIMPLE, 1 }, { _CHECK_PEP_523, OPARG_SIMPLE, 1 }, { _SEND_GEN_FRAME, OPARG_SIMPLE, 1 }, { _PUSH_FRAME, OPARG_SIMPLE, 1 } } }, + [SEND_VIRTUAL] = { .nuops = 3, .uops = { { _GUARD_TOS_IS_NONE, OPARG_SIMPLE, 1 }, { _GUARD_NOS_NOT_NULL, OPARG_SIMPLE, 1 }, { _SEND_VIRTUAL, OPARG_REPLACED, 1 } } }, [SETUP_ANNOTATIONS] = { .nuops = 1, .uops = { { _SETUP_ANNOTATIONS, OPARG_SIMPLE, 0 } } }, [SET_ADD] = { .nuops = 1, .uops = { { _SET_ADD, OPARG_SIMPLE, 0 } } }, [SET_FUNCTION_ATTRIBUTE] = { .nuops = 1, .uops = { { _SET_FUNCTION_ATTRIBUTE, OPARG_SIMPLE, 0 } } }, @@ -1758,7 +1770,9 @@ const char *_PyOpcode_OpName[267] = { [RETURN_GENERATOR] = "RETURN_GENERATOR", [RETURN_VALUE] = "RETURN_VALUE", [SEND] = "SEND", + [SEND_ASYNC_GEN] = "SEND_ASYNC_GEN", [SEND_GEN] = "SEND_GEN", + [SEND_VIRTUAL] = "SEND_VIRTUAL", [SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS", [SETUP_CLEANUP] = "SETUP_CLEANUP", [SETUP_FINALLY] = "SETUP_FINALLY", @@ -1810,6 +1824,7 @@ const uint8_t _PyOpcode_Caches[256] = { [TO_BOOL] = 3, [STORE_SUBSCR] = 1, [SEND] = 1, + [FOR_ITER] = 1, [UNPACK_SEQUENCE] = 1, [STORE_ATTR] = 4, [LOAD_GLOBAL] = 4, @@ -1823,7 +1838,6 @@ const uint8_t _PyOpcode_Caches[256] = { [POP_JUMP_IF_NONE] = 1, [POP_JUMP_IF_NOT_NONE] = 1, [GET_ITER] = 1, - [FOR_ITER] = 1, [CALL] = 3, [CALL_KW] = 3, [CALL_FUNCTION_EX] = 1, @@ -1842,8 +1856,6 @@ const uint8_t _PyOpcode_Deopt[256] = { [125] = 125, [126] = 126, [127] = 127, - [217] = 217, - [218] = 218, [219] = 219, [220] = 220, [221] = 221, @@ -2052,7 +2064,9 @@ const uint8_t _PyOpcode_Deopt[256] = { [RETURN_GENERATOR] = RETURN_GENERATOR, [RETURN_VALUE] = RETURN_VALUE, [SEND] = SEND, + [SEND_ASYNC_GEN] = SEND, [SEND_GEN] = SEND, + [SEND_VIRTUAL] = SEND, [SETUP_ANNOTATIONS] = SETUP_ANNOTATIONS, [SET_ADD] = SET_ADD, [SET_FUNCTION_ATTRIBUTE] = SET_FUNCTION_ATTRIBUTE, @@ -2103,8 +2117,6 @@ const uint8_t _PyOpcode_Deopt[256] = { case 125: \ case 126: \ case 127: \ - case 217: \ - case 218: \ case 219: \ case 220: \ case 221: \ diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 190d4aba7574fe..7c44c0a430b731 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -153,98 +153,101 @@ extern "C" { #define _GET_ITER 415 #define _GET_ITER_TRAD 416 #define _GET_LEN GET_LEN -#define _GUARD_BINARY_OP_EXTEND 417 -#define _GUARD_BINARY_OP_EXTEND_LHS 418 -#define _GUARD_BINARY_OP_EXTEND_RHS 419 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS 420 -#define _GUARD_BIT_IS_SET_POP 421 -#define _GUARD_BIT_IS_SET_POP_4 422 -#define _GUARD_BIT_IS_SET_POP_5 423 -#define _GUARD_BIT_IS_SET_POP_6 424 -#define _GUARD_BIT_IS_SET_POP_7 425 -#define _GUARD_BIT_IS_UNSET_POP 426 -#define _GUARD_BIT_IS_UNSET_POP_4 427 -#define _GUARD_BIT_IS_UNSET_POP_5 428 -#define _GUARD_BIT_IS_UNSET_POP_6 429 -#define _GUARD_BIT_IS_UNSET_POP_7 430 -#define _GUARD_CALLABLE_BUILTIN_CLASS 431 -#define _GUARD_CALLABLE_BUILTIN_FAST 432 -#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS 433 -#define _GUARD_CALLABLE_BUILTIN_O 434 -#define _GUARD_CALLABLE_ISINSTANCE 435 -#define _GUARD_CALLABLE_LEN 436 -#define _GUARD_CALLABLE_LIST_APPEND 437 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST 438 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 439 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS 440 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O 441 -#define _GUARD_CALLABLE_STR_1 442 -#define _GUARD_CALLABLE_TUPLE_1 443 -#define _GUARD_CALLABLE_TYPE_1 444 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR 445 -#define _GUARD_CODE_VERSION_RETURN_VALUE 446 -#define _GUARD_CODE_VERSION_YIELD_VALUE 447 -#define _GUARD_CODE_VERSION__PUSH_FRAME 448 -#define _GUARD_DORV_NO_DICT 449 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 450 -#define _GUARD_GLOBALS_VERSION 451 -#define _GUARD_IP_RETURN_GENERATOR 452 -#define _GUARD_IP_RETURN_VALUE 453 -#define _GUARD_IP_YIELD_VALUE 454 -#define _GUARD_IP__PUSH_FRAME 455 -#define _GUARD_IS_FALSE_POP 456 -#define _GUARD_IS_NONE_POP 457 -#define _GUARD_IS_NOT_NONE_POP 458 -#define _GUARD_IS_TRUE_POP 459 -#define _GUARD_ITERATOR 460 -#define _GUARD_ITER_VIRTUAL 461 -#define _GUARD_KEYS_VERSION 462 -#define _GUARD_LOAD_SUPER_ATTR_METHOD 463 -#define _GUARD_NOS_COMPACT_ASCII 464 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT 465 -#define _GUARD_NOS_DICT_SUBSCRIPT 466 -#define _GUARD_NOS_FLOAT 467 -#define _GUARD_NOS_INT 468 -#define _GUARD_NOS_ITER_VIRTUAL 469 -#define _GUARD_NOS_LIST 470 -#define _GUARD_NOS_NOT_NULL 471 -#define _GUARD_NOS_NULL 472 -#define _GUARD_NOS_OVERFLOWED 473 -#define _GUARD_NOS_TUPLE 474 -#define _GUARD_NOS_TYPE_VERSION 475 -#define _GUARD_NOS_UNICODE 476 -#define _GUARD_NOT_EXHAUSTED_LIST 477 -#define _GUARD_NOT_EXHAUSTED_RANGE 478 -#define _GUARD_NOT_EXHAUSTED_TUPLE 479 -#define _GUARD_THIRD_NULL 480 -#define _GUARD_TOS_ANY_DICT 481 -#define _GUARD_TOS_ANY_SET 482 -#define _GUARD_TOS_DICT 483 -#define _GUARD_TOS_FLOAT 484 -#define _GUARD_TOS_FROZENDICT 485 -#define _GUARD_TOS_FROZENSET 486 -#define _GUARD_TOS_INT 487 -#define _GUARD_TOS_LIST 488 -#define _GUARD_TOS_OVERFLOWED 489 -#define _GUARD_TOS_SET 490 -#define _GUARD_TOS_SLICE 491 -#define _GUARD_TOS_TUPLE 492 -#define _GUARD_TOS_UNICODE 493 -#define _GUARD_TYPE 494 -#define _GUARD_TYPE_ITER 495 -#define _GUARD_TYPE_VERSION 496 -#define _GUARD_TYPE_VERSION_LOCKED 497 -#define _HANDLE_PENDING_AND_DEOPT 498 +#define _GUARD_3OS_ASYNC_GEN_ASEND 417 +#define _GUARD_BINARY_OP_EXTEND 418 +#define _GUARD_BINARY_OP_EXTEND_LHS 419 +#define _GUARD_BINARY_OP_EXTEND_RHS 420 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS 421 +#define _GUARD_BIT_IS_SET_POP 422 +#define _GUARD_BIT_IS_SET_POP_4 423 +#define _GUARD_BIT_IS_SET_POP_5 424 +#define _GUARD_BIT_IS_SET_POP_6 425 +#define _GUARD_BIT_IS_SET_POP_7 426 +#define _GUARD_BIT_IS_UNSET_POP 427 +#define _GUARD_BIT_IS_UNSET_POP_4 428 +#define _GUARD_BIT_IS_UNSET_POP_5 429 +#define _GUARD_BIT_IS_UNSET_POP_6 430 +#define _GUARD_BIT_IS_UNSET_POP_7 431 +#define _GUARD_CALLABLE_BUILTIN_CLASS 432 +#define _GUARD_CALLABLE_BUILTIN_FAST 433 +#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS 434 +#define _GUARD_CALLABLE_BUILTIN_O 435 +#define _GUARD_CALLABLE_ISINSTANCE 436 +#define _GUARD_CALLABLE_LEN 437 +#define _GUARD_CALLABLE_LIST_APPEND 438 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST 439 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 440 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS 441 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O 442 +#define _GUARD_CALLABLE_STR_1 443 +#define _GUARD_CALLABLE_TUPLE_1 444 +#define _GUARD_CALLABLE_TYPE_1 445 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR 446 +#define _GUARD_CODE_VERSION_RETURN_VALUE 447 +#define _GUARD_CODE_VERSION_YIELD_VALUE 448 +#define _GUARD_CODE_VERSION__PUSH_FRAME 449 +#define _GUARD_DORV_NO_DICT 450 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 451 +#define _GUARD_GLOBALS_VERSION 452 +#define _GUARD_IP_RETURN_GENERATOR 453 +#define _GUARD_IP_RETURN_VALUE 454 +#define _GUARD_IP_YIELD_VALUE 455 +#define _GUARD_IP__PUSH_FRAME 456 +#define _GUARD_IS_FALSE_POP 457 +#define _GUARD_IS_NONE_POP 458 +#define _GUARD_IS_NOT_NONE_POP 459 +#define _GUARD_IS_TRUE_POP 460 +#define _GUARD_ITERATOR 461 +#define _GUARD_ITER_VIRTUAL 462 +#define _GUARD_KEYS_VERSION 463 +#define _GUARD_LOAD_SUPER_ATTR_METHOD 464 +#define _GUARD_NOS_COMPACT_ASCII 465 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT 466 +#define _GUARD_NOS_DICT_SUBSCRIPT 467 +#define _GUARD_NOS_FLOAT 468 +#define _GUARD_NOS_INT 469 +#define _GUARD_NOS_ITER_VIRTUAL 470 +#define _GUARD_NOS_LIST 471 +#define _GUARD_NOS_NOT_NULL 472 +#define _GUARD_NOS_NULL 473 +#define _GUARD_NOS_OVERFLOWED 474 +#define _GUARD_NOS_TUPLE 475 +#define _GUARD_NOS_TYPE_VERSION 476 +#define _GUARD_NOS_UNICODE 477 +#define _GUARD_NOT_EXHAUSTED_LIST 478 +#define _GUARD_NOT_EXHAUSTED_RANGE 479 +#define _GUARD_NOT_EXHAUSTED_TUPLE 480 +#define _GUARD_THIRD_NULL 481 +#define _GUARD_TOS_ANY_DICT 482 +#define _GUARD_TOS_ANY_SET 483 +#define _GUARD_TOS_DICT 484 +#define _GUARD_TOS_FLOAT 485 +#define _GUARD_TOS_FROZENDICT 486 +#define _GUARD_TOS_FROZENSET 487 +#define _GUARD_TOS_INT 488 +#define _GUARD_TOS_IS_NONE 489 +#define _GUARD_TOS_LIST 490 +#define _GUARD_TOS_NOT_NULL 491 +#define _GUARD_TOS_OVERFLOWED 492 +#define _GUARD_TOS_SET 493 +#define _GUARD_TOS_SLICE 494 +#define _GUARD_TOS_TUPLE 495 +#define _GUARD_TOS_UNICODE 496 +#define _GUARD_TYPE 497 +#define _GUARD_TYPE_ITER 498 +#define _GUARD_TYPE_VERSION 499 +#define _GUARD_TYPE_VERSION_LOCKED 500 +#define _HANDLE_PENDING_AND_DEOPT 501 #define _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 499 -#define _INIT_CALL_PY_EXACT_ARGS 500 -#define _INIT_CALL_PY_EXACT_ARGS_0 501 -#define _INIT_CALL_PY_EXACT_ARGS_1 502 -#define _INIT_CALL_PY_EXACT_ARGS_2 503 -#define _INIT_CALL_PY_EXACT_ARGS_3 504 -#define _INIT_CALL_PY_EXACT_ARGS_4 505 -#define _INSERT_NULL 506 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 502 +#define _INIT_CALL_PY_EXACT_ARGS 503 +#define _INIT_CALL_PY_EXACT_ARGS_0 504 +#define _INIT_CALL_PY_EXACT_ARGS_1 505 +#define _INIT_CALL_PY_EXACT_ARGS_2 506 +#define _INIT_CALL_PY_EXACT_ARGS_3 507 +#define _INIT_CALL_PY_EXACT_ARGS_4 508 +#define _INSERT_NULL 509 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -254,1173 +257,1194 @@ extern "C" { #define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE #define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE #define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE -#define _IS_NONE 507 -#define _IS_OP 508 -#define _ITER_CHECK_LIST 509 -#define _ITER_CHECK_RANGE 510 -#define _ITER_CHECK_TUPLE 511 -#define _ITER_JUMP_LIST 512 -#define _ITER_JUMP_RANGE 513 -#define _ITER_JUMP_TUPLE 514 -#define _ITER_NEXT_INLINE 515 -#define _ITER_NEXT_LIST 516 -#define _ITER_NEXT_LIST_TIER_TWO 517 -#define _ITER_NEXT_RANGE 518 -#define _ITER_NEXT_TUPLE 519 +#define _IS_NONE 510 +#define _IS_OP 511 +#define _ITER_CHECK_LIST 512 +#define _ITER_CHECK_RANGE 513 +#define _ITER_CHECK_TUPLE 514 +#define _ITER_JUMP_LIST 515 +#define _ITER_JUMP_RANGE 516 +#define _ITER_JUMP_TUPLE 517 +#define _ITER_NEXT_INLINE 518 +#define _ITER_NEXT_LIST 519 +#define _ITER_NEXT_LIST_TIER_TWO 520 +#define _ITER_NEXT_RANGE 521 +#define _ITER_NEXT_TUPLE 522 #define _JUMP_BACKWARD_NO_INTERRUPT JUMP_BACKWARD_NO_INTERRUPT -#define _JUMP_TO_TOP 520 +#define _JUMP_TO_TOP 523 #define _LIST_APPEND LIST_APPEND -#define _LIST_EXTEND 521 -#define _LOAD_ATTR 522 -#define _LOAD_ATTR_CLASS 523 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME 524 -#define _LOAD_ATTR_INSTANCE_VALUE 525 -#define _LOAD_ATTR_METHOD_LAZY_DICT 526 -#define _LOAD_ATTR_METHOD_NO_DICT 527 -#define _LOAD_ATTR_METHOD_WITH_VALUES 528 -#define _LOAD_ATTR_MODULE 529 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 530 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 531 -#define _LOAD_ATTR_PROPERTY_FRAME 532 -#define _LOAD_ATTR_SLOT 533 -#define _LOAD_ATTR_WITH_HINT 534 +#define _LIST_EXTEND 524 +#define _LOAD_ATTR 525 +#define _LOAD_ATTR_CLASS 526 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME 527 +#define _LOAD_ATTR_INSTANCE_VALUE 528 +#define _LOAD_ATTR_METHOD_LAZY_DICT 529 +#define _LOAD_ATTR_METHOD_NO_DICT 530 +#define _LOAD_ATTR_METHOD_WITH_VALUES 531 +#define _LOAD_ATTR_MODULE 532 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 533 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 534 +#define _LOAD_ATTR_PROPERTY_FRAME 535 +#define _LOAD_ATTR_SLOT 536 +#define _LOAD_ATTR_WITH_HINT 537 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 535 +#define _LOAD_BYTECODE 538 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST -#define _LOAD_CONST_INLINE 536 -#define _LOAD_CONST_INLINE_BORROW 537 +#define _LOAD_CONST_INLINE 539 +#define _LOAD_CONST_INLINE_BORROW 540 #define _LOAD_DEREF LOAD_DEREF -#define _LOAD_FAST 538 -#define _LOAD_FAST_0 539 -#define _LOAD_FAST_1 540 -#define _LOAD_FAST_2 541 -#define _LOAD_FAST_3 542 -#define _LOAD_FAST_4 543 -#define _LOAD_FAST_5 544 -#define _LOAD_FAST_6 545 -#define _LOAD_FAST_7 546 +#define _LOAD_FAST 541 +#define _LOAD_FAST_0 542 +#define _LOAD_FAST_1 543 +#define _LOAD_FAST_2 544 +#define _LOAD_FAST_3 545 +#define _LOAD_FAST_4 546 +#define _LOAD_FAST_5 547 +#define _LOAD_FAST_6 548 +#define _LOAD_FAST_7 549 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 547 -#define _LOAD_FAST_BORROW_0 548 -#define _LOAD_FAST_BORROW_1 549 -#define _LOAD_FAST_BORROW_2 550 -#define _LOAD_FAST_BORROW_3 551 -#define _LOAD_FAST_BORROW_4 552 -#define _LOAD_FAST_BORROW_5 553 -#define _LOAD_FAST_BORROW_6 554 -#define _LOAD_FAST_BORROW_7 555 +#define _LOAD_FAST_BORROW 550 +#define _LOAD_FAST_BORROW_0 551 +#define _LOAD_FAST_BORROW_1 552 +#define _LOAD_FAST_BORROW_2 553 +#define _LOAD_FAST_BORROW_3 554 +#define _LOAD_FAST_BORROW_4 555 +#define _LOAD_FAST_BORROW_5 556 +#define _LOAD_FAST_BORROW_6 557 +#define _LOAD_FAST_BORROW_7 558 #define _LOAD_FAST_CHECK LOAD_FAST_CHECK #define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF #define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS -#define _LOAD_GLOBAL 556 -#define _LOAD_GLOBAL_BUILTINS 557 -#define _LOAD_GLOBAL_MODULE 558 +#define _LOAD_GLOBAL 559 +#define _LOAD_GLOBAL_BUILTINS 560 +#define _LOAD_GLOBAL_MODULE 561 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 559 -#define _LOAD_SMALL_INT_0 560 -#define _LOAD_SMALL_INT_1 561 -#define _LOAD_SMALL_INT_2 562 -#define _LOAD_SMALL_INT_3 563 -#define _LOAD_SPECIAL 564 +#define _LOAD_SMALL_INT 562 +#define _LOAD_SMALL_INT_0 563 +#define _LOAD_SMALL_INT_1 564 +#define _LOAD_SMALL_INT_2 565 +#define _LOAD_SMALL_INT_3 566 +#define _LOAD_SPECIAL 567 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR -#define _LOAD_SUPER_ATTR_METHOD 565 -#define _LOCK_OBJECT 566 -#define _MAKE_CALLARGS_A_TUPLE 567 +#define _LOAD_SUPER_ATTR_METHOD 568 +#define _LOCK_OBJECT 569 +#define _MAKE_CALLARGS_A_TUPLE 570 #define _MAKE_CELL MAKE_CELL -#define _MAKE_FUNCTION 568 -#define _MAKE_HEAP_SAFE 569 -#define _MAKE_WARM 570 +#define _MAKE_FUNCTION 571 +#define _MAKE_HEAP_SAFE 572 +#define _MAKE_WARM 573 #define _MAP_ADD MAP_ADD -#define _MATCH_CLASS 571 +#define _MATCH_CLASS 574 #define _MATCH_KEYS MATCH_KEYS #define _MATCH_MAPPING MATCH_MAPPING #define _MATCH_SEQUENCE MATCH_SEQUENCE -#define _MAYBE_EXPAND_METHOD 572 -#define _MAYBE_EXPAND_METHOD_KW 573 -#define _MONITOR_CALL 574 -#define _MONITOR_CALL_KW 575 -#define _MONITOR_JUMP_BACKWARD 576 -#define _MONITOR_RESUME 577 +#define _MAYBE_EXPAND_METHOD 575 +#define _MAYBE_EXPAND_METHOD_KW 576 +#define _MONITOR_CALL 577 +#define _MONITOR_CALL_KW 578 +#define _MONITOR_JUMP_BACKWARD 579 +#define _MONITOR_RESUME 580 #define _NOP NOP #define _POP_EXCEPT POP_EXCEPT #define _POP_ITER POP_ITER -#define _POP_JUMP_IF_FALSE 578 -#define _POP_JUMP_IF_TRUE 579 +#define _POP_JUMP_IF_FALSE 581 +#define _POP_JUMP_IF_TRUE 582 #define _POP_TOP POP_TOP -#define _POP_TOP_FLOAT 580 -#define _POP_TOP_INT 581 -#define _POP_TOP_NOP 582 -#define _POP_TOP_OPARG 583 -#define _POP_TOP_UNICODE 584 +#define _POP_TOP_FLOAT 583 +#define _POP_TOP_INT 584 +#define _POP_TOP_NOP 585 +#define _POP_TOP_OPARG 586 +#define _POP_TOP_UNICODE 587 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 585 +#define _PUSH_FRAME 588 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 586 -#define _PUSH_TAGGED_ZERO 587 -#define _PY_FRAME_EX 588 -#define _PY_FRAME_GENERAL 589 -#define _PY_FRAME_KW 590 -#define _RECORD_3OS_GEN_FUNC 591 -#define _RECORD_4OS 592 -#define _RECORD_BOUND_METHOD 593 -#define _RECORD_CALLABLE 594 -#define _RECORD_CALLABLE_KW 595 -#define _RECORD_CODE 596 -#define _RECORD_NOS 597 -#define _RECORD_NOS_GEN_FUNC 598 -#define _RECORD_NOS_TYPE 599 -#define _RECORD_TOS 600 -#define _RECORD_TOS_TYPE 601 -#define _REPLACE_WITH_TRUE 602 -#define _RESUME_CHECK 603 +#define _PUSH_NULL_CONDITIONAL 589 +#define _PUSH_TAGGED_ZERO 590 +#define _PY_FRAME_EX 591 +#define _PY_FRAME_GENERAL 592 +#define _PY_FRAME_KW 593 +#define _RECORD_3OS_GEN_FUNC 594 +#define _RECORD_4OS 595 +#define _RECORD_BOUND_METHOD 596 +#define _RECORD_CALLABLE 597 +#define _RECORD_CALLABLE_KW 598 +#define _RECORD_CODE 599 +#define _RECORD_NOS 600 +#define _RECORD_NOS_GEN_FUNC 601 +#define _RECORD_NOS_TYPE 602 +#define _RECORD_TOS 603 +#define _RECORD_TOS_TYPE 604 +#define _REPLACE_WITH_TRUE 605 +#define _RESUME_CHECK 606 #define _RETURN_GENERATOR RETURN_GENERATOR -#define _RETURN_VALUE 604 -#define _RROT_3 605 -#define _SAVE_RETURN_OFFSET 606 -#define _SEND 607 -#define _SEND_GEN_FRAME 608 +#define _RETURN_VALUE 607 +#define _RROT_3 608 +#define _SAVE_RETURN_OFFSET 609 +#define _SEND_ASYNC_GEN 610 +#define _SEND_ASYNC_GEN_TIER_TWO 611 +#define _SEND_GEN_FRAME 612 +#define _SEND_VIRTUAL 613 +#define _SEND_VIRTUAL_TIER_TWO 614 #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS #define _SET_ADD SET_ADD #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE -#define _SET_UPDATE 609 -#define _SPILL_OR_RELOAD 610 -#define _START_EXECUTOR 611 -#define _STORE_ATTR 612 -#define _STORE_ATTR_INSTANCE_VALUE 613 -#define _STORE_ATTR_SLOT 614 -#define _STORE_ATTR_WITH_HINT 615 +#define _SET_UPDATE 615 +#define _SPILL_OR_RELOAD 616 +#define _START_EXECUTOR 617 +#define _STORE_ATTR 618 +#define _STORE_ATTR_INSTANCE_VALUE 619 +#define _STORE_ATTR_SLOT 620 +#define _STORE_ATTR_WITH_HINT 621 #define _STORE_DEREF STORE_DEREF #define _STORE_GLOBAL STORE_GLOBAL #define _STORE_NAME STORE_NAME -#define _STORE_SLICE 616 -#define _STORE_SUBSCR 617 -#define _STORE_SUBSCR_DICT 618 -#define _STORE_SUBSCR_DICT_KNOWN_HASH 619 -#define _STORE_SUBSCR_LIST_INT 620 -#define _SWAP 621 -#define _SWAP_2 622 -#define _SWAP_3 623 -#define _SWAP_FAST 624 -#define _SWAP_FAST_0 625 -#define _SWAP_FAST_1 626 -#define _SWAP_FAST_2 627 -#define _SWAP_FAST_3 628 -#define _SWAP_FAST_4 629 -#define _SWAP_FAST_5 630 -#define _SWAP_FAST_6 631 -#define _SWAP_FAST_7 632 -#define _TIER2_RESUME_CHECK 633 -#define _TO_BOOL 634 +#define _STORE_SLICE 622 +#define _STORE_SUBSCR 623 +#define _STORE_SUBSCR_DICT 624 +#define _STORE_SUBSCR_DICT_KNOWN_HASH 625 +#define _STORE_SUBSCR_LIST_INT 626 +#define _SWAP 627 +#define _SWAP_2 628 +#define _SWAP_3 629 +#define _SWAP_FAST 630 +#define _SWAP_FAST_0 631 +#define _SWAP_FAST_1 632 +#define _SWAP_FAST_2 633 +#define _SWAP_FAST_3 634 +#define _SWAP_FAST_4 635 +#define _SWAP_FAST_5 636 +#define _SWAP_FAST_6 637 +#define _SWAP_FAST_7 638 +#define _TIER2_RESUME_CHECK 639 +#define _TO_BOOL 640 #define _TO_BOOL_BOOL TO_BOOL_BOOL -#define _TO_BOOL_INT 635 -#define _TO_BOOL_LIST 636 +#define _TO_BOOL_INT 641 +#define _TO_BOOL_LIST 642 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 637 +#define _TO_BOOL_STR 643 #define _TRACE_RECORD TRACE_RECORD -#define _UNARY_INVERT 638 -#define _UNARY_NEGATIVE 639 -#define _UNARY_NEGATIVE_FLOAT_INPLACE 640 +#define _UNARY_INVERT 644 +#define _UNARY_NEGATIVE 645 +#define _UNARY_NEGATIVE_FLOAT_INPLACE 646 #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 641 -#define _UNPACK_SEQUENCE_LIST 642 -#define _UNPACK_SEQUENCE_TUPLE 643 -#define _UNPACK_SEQUENCE_TWO_TUPLE 644 -#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE 645 -#define _UNPACK_SEQUENCE_UNIQUE_TUPLE 646 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE 647 +#define _UNPACK_SEQUENCE 647 +#define _UNPACK_SEQUENCE_LIST 648 +#define _UNPACK_SEQUENCE_TUPLE 649 +#define _UNPACK_SEQUENCE_TWO_TUPLE 650 +#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE 651 +#define _UNPACK_SEQUENCE_UNIQUE_TUPLE 652 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE 653 #define _WITH_EXCEPT_START WITH_EXCEPT_START -#define _YIELD_VALUE 648 -#define MAX_UOP_ID 648 -#define _ALLOCATE_OBJECT_r00 649 -#define _BINARY_OP_r23 650 -#define _BINARY_OP_ADD_FLOAT_r03 651 -#define _BINARY_OP_ADD_FLOAT_r13 652 -#define _BINARY_OP_ADD_FLOAT_r23 653 -#define _BINARY_OP_ADD_FLOAT_INPLACE_r03 654 -#define _BINARY_OP_ADD_FLOAT_INPLACE_r13 655 -#define _BINARY_OP_ADD_FLOAT_INPLACE_r23 656 -#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r03 657 -#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r13 658 -#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r23 659 -#define _BINARY_OP_ADD_INT_r03 660 -#define _BINARY_OP_ADD_INT_r13 661 -#define _BINARY_OP_ADD_INT_r23 662 -#define _BINARY_OP_ADD_INT_INPLACE_r03 663 -#define _BINARY_OP_ADD_INT_INPLACE_r13 664 -#define _BINARY_OP_ADD_INT_INPLACE_r23 665 -#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r03 666 -#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r13 667 -#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r23 668 -#define _BINARY_OP_ADD_UNICODE_r03 669 -#define _BINARY_OP_ADD_UNICODE_r13 670 -#define _BINARY_OP_ADD_UNICODE_r23 671 -#define _BINARY_OP_EXTEND_r23 672 -#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 673 -#define _BINARY_OP_MULTIPLY_FLOAT_r03 674 -#define _BINARY_OP_MULTIPLY_FLOAT_r13 675 -#define _BINARY_OP_MULTIPLY_FLOAT_r23 676 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r03 677 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r13 678 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r23 679 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r03 680 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r13 681 -#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r23 682 -#define _BINARY_OP_MULTIPLY_INT_r03 683 -#define _BINARY_OP_MULTIPLY_INT_r13 684 -#define _BINARY_OP_MULTIPLY_INT_r23 685 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_r03 686 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_r13 687 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_r23 688 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r03 689 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r13 690 -#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r23 691 -#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 692 -#define _BINARY_OP_SUBSCR_DICT_r23 693 -#define _BINARY_OP_SUBSCR_DICT_KNOWN_HASH_r23 694 -#define _BINARY_OP_SUBSCR_INIT_CALL_r01 695 -#define _BINARY_OP_SUBSCR_INIT_CALL_r11 696 -#define _BINARY_OP_SUBSCR_INIT_CALL_r21 697 -#define _BINARY_OP_SUBSCR_INIT_CALL_r31 698 -#define _BINARY_OP_SUBSCR_LIST_INT_r23 699 -#define _BINARY_OP_SUBSCR_LIST_SLICE_r23 700 -#define _BINARY_OP_SUBSCR_STR_INT_r23 701 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 702 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 703 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 704 -#define _BINARY_OP_SUBSCR_USTR_INT_r23 705 -#define _BINARY_OP_SUBTRACT_FLOAT_r03 706 -#define _BINARY_OP_SUBTRACT_FLOAT_r13 707 -#define _BINARY_OP_SUBTRACT_FLOAT_r23 708 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r03 709 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r13 710 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r23 711 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r03 712 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r13 713 -#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r23 714 -#define _BINARY_OP_SUBTRACT_INT_r03 715 -#define _BINARY_OP_SUBTRACT_INT_r13 716 -#define _BINARY_OP_SUBTRACT_INT_r23 717 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_r03 718 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_r13 719 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_r23 720 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r03 721 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r13 722 -#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r23 723 -#define _BINARY_OP_TRUEDIV_FLOAT_r23 724 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r03 725 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r13 726 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r23 727 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r03 728 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r13 729 -#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r23 730 -#define _BINARY_SLICE_r31 731 -#define _BUILD_INTERPOLATION_r01 732 -#define _BUILD_LIST_r01 733 -#define _BUILD_MAP_r01 734 -#define _BUILD_SET_r01 735 -#define _BUILD_SLICE_r01 736 -#define _BUILD_STRING_r01 737 -#define _BUILD_TEMPLATE_r21 738 -#define _BUILD_TUPLE_r01 739 -#define _CALL_BUILTIN_CLASS_r00 740 -#define _CALL_BUILTIN_FAST_r00 741 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r00 742 -#define _CALL_BUILTIN_O_r03 743 -#define _CALL_FUNCTION_EX_NON_PY_GENERAL_r31 744 -#define _CALL_INTRINSIC_1_r12 745 -#define _CALL_INTRINSIC_2_r23 746 -#define _CALL_ISINSTANCE_r31 747 -#define _CALL_KW_NON_PY_r11 748 -#define _CALL_LEN_r33 749 -#define _CALL_LIST_APPEND_r03 750 -#define _CALL_LIST_APPEND_r13 751 -#define _CALL_LIST_APPEND_r23 752 -#define _CALL_LIST_APPEND_r33 753 -#define _CALL_METHOD_DESCRIPTOR_FAST_r00 754 -#define _CALL_METHOD_DESCRIPTOR_FAST_INLINE_r00 755 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 756 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r00 757 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_r03 758 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03 759 -#define _CALL_METHOD_DESCRIPTOR_O_r03 760 -#define _CALL_METHOD_DESCRIPTOR_O_INLINE_r03 761 -#define _CALL_NON_PY_GENERAL_r01 762 -#define _CALL_STR_1_r32 763 -#define _CALL_TUPLE_1_r32 764 -#define _CALL_TYPE_1_r02 765 -#define _CALL_TYPE_1_r12 766 -#define _CALL_TYPE_1_r22 767 -#define _CALL_TYPE_1_r32 768 -#define _CHECK_ATTR_CLASS_r01 769 -#define _CHECK_ATTR_CLASS_r11 770 -#define _CHECK_ATTR_CLASS_r22 771 -#define _CHECK_ATTR_CLASS_r33 772 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 773 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 774 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 775 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 776 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 777 -#define _CHECK_EG_MATCH_r22 778 -#define _CHECK_EXC_MATCH_r22 779 -#define _CHECK_FUNCTION_EXACT_ARGS_r00 780 -#define _CHECK_FUNCTION_VERSION_r00 781 -#define _CHECK_FUNCTION_VERSION_INLINE_r00 782 -#define _CHECK_FUNCTION_VERSION_INLINE_r11 783 -#define _CHECK_FUNCTION_VERSION_INLINE_r22 784 -#define _CHECK_FUNCTION_VERSION_INLINE_r33 785 -#define _CHECK_FUNCTION_VERSION_KW_r11 786 -#define _CHECK_IS_NOT_PY_CALLABLE_r00 787 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r03 788 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r13 789 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r23 790 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r33 791 -#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 792 -#define _CHECK_IS_PY_CALLABLE_EX_r03 793 -#define _CHECK_IS_PY_CALLABLE_EX_r13 794 -#define _CHECK_IS_PY_CALLABLE_EX_r23 795 -#define _CHECK_IS_PY_CALLABLE_EX_r33 796 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 797 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 798 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 799 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 800 -#define _CHECK_METHOD_VERSION_r00 801 -#define _CHECK_METHOD_VERSION_KW_r11 802 -#define _CHECK_OBJECT_r00 803 -#define _CHECK_PEP_523_r00 804 -#define _CHECK_PEP_523_r11 805 -#define _CHECK_PEP_523_r22 806 -#define _CHECK_PEP_523_r33 807 -#define _CHECK_PERIODIC_r00 808 -#define _CHECK_PERIODIC_AT_END_r00 809 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 810 -#define _CHECK_RECURSION_LIMIT_r00 811 -#define _CHECK_RECURSION_LIMIT_r11 812 -#define _CHECK_RECURSION_LIMIT_r22 813 -#define _CHECK_RECURSION_LIMIT_r33 814 -#define _CHECK_RECURSION_REMAINING_r00 815 -#define _CHECK_RECURSION_REMAINING_r11 816 -#define _CHECK_RECURSION_REMAINING_r22 817 -#define _CHECK_RECURSION_REMAINING_r33 818 -#define _CHECK_STACK_SPACE_r00 819 -#define _CHECK_STACK_SPACE_OPERAND_r00 820 -#define _CHECK_STACK_SPACE_OPERAND_r11 821 -#define _CHECK_STACK_SPACE_OPERAND_r22 822 -#define _CHECK_STACK_SPACE_OPERAND_r33 823 -#define _CHECK_VALIDITY_r00 824 -#define _CHECK_VALIDITY_r11 825 -#define _CHECK_VALIDITY_r22 826 -#define _CHECK_VALIDITY_r33 827 -#define _COLD_DYNAMIC_EXIT_r00 828 -#define _COLD_EXIT_r00 829 -#define _COMPARE_OP_r21 830 -#define _COMPARE_OP_FLOAT_r03 831 -#define _COMPARE_OP_FLOAT_r13 832 -#define _COMPARE_OP_FLOAT_r23 833 -#define _COMPARE_OP_INT_r23 834 -#define _COMPARE_OP_STR_r23 835 -#define _CONTAINS_OP_r23 836 -#define _CONTAINS_OP_DICT_r23 837 -#define _CONTAINS_OP_SET_r23 838 -#define _CONVERT_VALUE_r11 839 -#define _COPY_r01 840 -#define _COPY_1_r02 841 -#define _COPY_1_r12 842 -#define _COPY_1_r23 843 -#define _COPY_2_r03 844 -#define _COPY_2_r13 845 -#define _COPY_2_r23 846 -#define _COPY_3_r03 847 -#define _COPY_3_r13 848 -#define _COPY_3_r23 849 -#define _COPY_3_r33 850 -#define _COPY_FREE_VARS_r00 851 -#define _COPY_FREE_VARS_r11 852 -#define _COPY_FREE_VARS_r22 853 -#define _COPY_FREE_VARS_r33 854 -#define _CREATE_INIT_FRAME_r01 855 -#define _DELETE_ATTR_r10 856 -#define _DELETE_DEREF_r00 857 -#define _DELETE_FAST_r00 858 -#define _DELETE_GLOBAL_r00 859 -#define _DELETE_NAME_r00 860 -#define _DELETE_SUBSCR_r20 861 -#define _DEOPT_r00 862 -#define _DEOPT_r10 863 -#define _DEOPT_r20 864 -#define _DEOPT_r30 865 -#define _DICT_MERGE_r11 866 -#define _DICT_UPDATE_r11 867 -#define _DO_CALL_r01 868 -#define _DO_CALL_FUNCTION_EX_r31 869 -#define _DO_CALL_KW_r11 870 -#define _DYNAMIC_EXIT_r00 871 -#define _DYNAMIC_EXIT_r10 872 -#define _DYNAMIC_EXIT_r20 873 -#define _DYNAMIC_EXIT_r30 874 -#define _END_FOR_r10 875 -#define _END_SEND_r31 876 -#define _ERROR_POP_N_r00 877 -#define _EXIT_INIT_CHECK_r10 878 -#define _EXIT_TRACE_r00 879 -#define _EXIT_TRACE_r10 880 -#define _EXIT_TRACE_r20 881 -#define _EXIT_TRACE_r30 882 -#define _EXPAND_METHOD_r00 883 -#define _EXPAND_METHOD_KW_r11 884 -#define _FATAL_ERROR_r00 885 -#define _FATAL_ERROR_r11 886 -#define _FATAL_ERROR_r22 887 -#define _FATAL_ERROR_r33 888 -#define _FORMAT_SIMPLE_r11 889 -#define _FORMAT_WITH_SPEC_r21 890 -#define _FOR_ITER_r23 891 -#define _FOR_ITER_GEN_FRAME_r03 892 -#define _FOR_ITER_GEN_FRAME_r13 893 -#define _FOR_ITER_GEN_FRAME_r23 894 -#define _FOR_ITER_TIER_TWO_r23 895 -#define _FOR_ITER_VIRTUAL_r23 896 -#define _FOR_ITER_VIRTUAL_TIER_TWO_r23 897 -#define _GET_AITER_r11 898 -#define _GET_ANEXT_r12 899 -#define _GET_AWAITABLE_r11 900 -#define _GET_ITER_r12 901 -#define _GET_ITER_TRAD_r12 902 -#define _GET_LEN_r12 903 -#define _GUARD_BINARY_OP_EXTEND_r22 904 -#define _GUARD_BINARY_OP_EXTEND_LHS_r02 905 -#define _GUARD_BINARY_OP_EXTEND_LHS_r12 906 -#define _GUARD_BINARY_OP_EXTEND_LHS_r22 907 -#define _GUARD_BINARY_OP_EXTEND_LHS_r33 908 -#define _GUARD_BINARY_OP_EXTEND_RHS_r02 909 -#define _GUARD_BINARY_OP_EXTEND_RHS_r12 910 -#define _GUARD_BINARY_OP_EXTEND_RHS_r22 911 -#define _GUARD_BINARY_OP_EXTEND_RHS_r33 912 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 913 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 914 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 915 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 916 -#define _GUARD_BIT_IS_SET_POP_r00 917 -#define _GUARD_BIT_IS_SET_POP_r10 918 -#define _GUARD_BIT_IS_SET_POP_r21 919 -#define _GUARD_BIT_IS_SET_POP_r32 920 -#define _GUARD_BIT_IS_SET_POP_4_r00 921 -#define _GUARD_BIT_IS_SET_POP_4_r10 922 -#define _GUARD_BIT_IS_SET_POP_4_r21 923 -#define _GUARD_BIT_IS_SET_POP_4_r32 924 -#define _GUARD_BIT_IS_SET_POP_5_r00 925 -#define _GUARD_BIT_IS_SET_POP_5_r10 926 -#define _GUARD_BIT_IS_SET_POP_5_r21 927 -#define _GUARD_BIT_IS_SET_POP_5_r32 928 -#define _GUARD_BIT_IS_SET_POP_6_r00 929 -#define _GUARD_BIT_IS_SET_POP_6_r10 930 -#define _GUARD_BIT_IS_SET_POP_6_r21 931 -#define _GUARD_BIT_IS_SET_POP_6_r32 932 -#define _GUARD_BIT_IS_SET_POP_7_r00 933 -#define _GUARD_BIT_IS_SET_POP_7_r10 934 -#define _GUARD_BIT_IS_SET_POP_7_r21 935 -#define _GUARD_BIT_IS_SET_POP_7_r32 936 -#define _GUARD_BIT_IS_UNSET_POP_r00 937 -#define _GUARD_BIT_IS_UNSET_POP_r10 938 -#define _GUARD_BIT_IS_UNSET_POP_r21 939 -#define _GUARD_BIT_IS_UNSET_POP_r32 940 -#define _GUARD_BIT_IS_UNSET_POP_4_r00 941 -#define _GUARD_BIT_IS_UNSET_POP_4_r10 942 -#define _GUARD_BIT_IS_UNSET_POP_4_r21 943 -#define _GUARD_BIT_IS_UNSET_POP_4_r32 944 -#define _GUARD_BIT_IS_UNSET_POP_5_r00 945 -#define _GUARD_BIT_IS_UNSET_POP_5_r10 946 -#define _GUARD_BIT_IS_UNSET_POP_5_r21 947 -#define _GUARD_BIT_IS_UNSET_POP_5_r32 948 -#define _GUARD_BIT_IS_UNSET_POP_6_r00 949 -#define _GUARD_BIT_IS_UNSET_POP_6_r10 950 -#define _GUARD_BIT_IS_UNSET_POP_6_r21 951 -#define _GUARD_BIT_IS_UNSET_POP_6_r32 952 -#define _GUARD_BIT_IS_UNSET_POP_7_r00 953 -#define _GUARD_BIT_IS_UNSET_POP_7_r10 954 -#define _GUARD_BIT_IS_UNSET_POP_7_r21 955 -#define _GUARD_BIT_IS_UNSET_POP_7_r32 956 -#define _GUARD_CALLABLE_BUILTIN_CLASS_r00 957 -#define _GUARD_CALLABLE_BUILTIN_FAST_r00 958 -#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS_r00 959 -#define _GUARD_CALLABLE_BUILTIN_O_r00 960 -#define _GUARD_CALLABLE_ISINSTANCE_r03 961 -#define _GUARD_CALLABLE_ISINSTANCE_r13 962 -#define _GUARD_CALLABLE_ISINSTANCE_r23 963 -#define _GUARD_CALLABLE_ISINSTANCE_r33 964 -#define _GUARD_CALLABLE_LEN_r03 965 -#define _GUARD_CALLABLE_LEN_r13 966 -#define _GUARD_CALLABLE_LEN_r23 967 -#define _GUARD_CALLABLE_LEN_r33 968 -#define _GUARD_CALLABLE_LIST_APPEND_r03 969 -#define _GUARD_CALLABLE_LIST_APPEND_r13 970 -#define _GUARD_CALLABLE_LIST_APPEND_r23 971 -#define _GUARD_CALLABLE_LIST_APPEND_r33 972 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_r00 973 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 974 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS_r00 975 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O_r00 976 -#define _GUARD_CALLABLE_STR_1_r03 977 -#define _GUARD_CALLABLE_STR_1_r13 978 -#define _GUARD_CALLABLE_STR_1_r23 979 -#define _GUARD_CALLABLE_STR_1_r33 980 -#define _GUARD_CALLABLE_TUPLE_1_r03 981 -#define _GUARD_CALLABLE_TUPLE_1_r13 982 -#define _GUARD_CALLABLE_TUPLE_1_r23 983 -#define _GUARD_CALLABLE_TUPLE_1_r33 984 -#define _GUARD_CALLABLE_TYPE_1_r03 985 -#define _GUARD_CALLABLE_TYPE_1_r13 986 -#define _GUARD_CALLABLE_TYPE_1_r23 987 -#define _GUARD_CALLABLE_TYPE_1_r33 988 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r00 989 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r11 990 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r22 991 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r33 992 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r00 993 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r11 994 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r22 995 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r33 996 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r00 997 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r11 998 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r22 999 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r33 1000 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r00 1001 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r11 1002 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r22 1003 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r33 1004 -#define _GUARD_DORV_NO_DICT_r01 1005 -#define _GUARD_DORV_NO_DICT_r11 1006 -#define _GUARD_DORV_NO_DICT_r22 1007 -#define _GUARD_DORV_NO_DICT_r33 1008 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 1009 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 1010 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 1011 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 1012 -#define _GUARD_GLOBALS_VERSION_r00 1013 -#define _GUARD_GLOBALS_VERSION_r11 1014 -#define _GUARD_GLOBALS_VERSION_r22 1015 -#define _GUARD_GLOBALS_VERSION_r33 1016 -#define _GUARD_IP_RETURN_GENERATOR_r00 1017 -#define _GUARD_IP_RETURN_GENERATOR_r11 1018 -#define _GUARD_IP_RETURN_GENERATOR_r22 1019 -#define _GUARD_IP_RETURN_GENERATOR_r33 1020 -#define _GUARD_IP_RETURN_VALUE_r00 1021 -#define _GUARD_IP_RETURN_VALUE_r11 1022 -#define _GUARD_IP_RETURN_VALUE_r22 1023 -#define _GUARD_IP_RETURN_VALUE_r33 1024 -#define _GUARD_IP_YIELD_VALUE_r00 1025 -#define _GUARD_IP_YIELD_VALUE_r11 1026 -#define _GUARD_IP_YIELD_VALUE_r22 1027 -#define _GUARD_IP_YIELD_VALUE_r33 1028 -#define _GUARD_IP__PUSH_FRAME_r00 1029 -#define _GUARD_IP__PUSH_FRAME_r11 1030 -#define _GUARD_IP__PUSH_FRAME_r22 1031 -#define _GUARD_IP__PUSH_FRAME_r33 1032 -#define _GUARD_IS_FALSE_POP_r00 1033 -#define _GUARD_IS_FALSE_POP_r10 1034 -#define _GUARD_IS_FALSE_POP_r21 1035 -#define _GUARD_IS_FALSE_POP_r32 1036 -#define _GUARD_IS_NONE_POP_r00 1037 -#define _GUARD_IS_NONE_POP_r10 1038 -#define _GUARD_IS_NONE_POP_r21 1039 -#define _GUARD_IS_NONE_POP_r32 1040 -#define _GUARD_IS_NOT_NONE_POP_r10 1041 -#define _GUARD_IS_TRUE_POP_r00 1042 -#define _GUARD_IS_TRUE_POP_r10 1043 -#define _GUARD_IS_TRUE_POP_r21 1044 -#define _GUARD_IS_TRUE_POP_r32 1045 -#define _GUARD_ITERATOR_r01 1046 -#define _GUARD_ITERATOR_r11 1047 -#define _GUARD_ITERATOR_r22 1048 -#define _GUARD_ITERATOR_r33 1049 -#define _GUARD_ITER_VIRTUAL_r01 1050 -#define _GUARD_ITER_VIRTUAL_r11 1051 -#define _GUARD_ITER_VIRTUAL_r22 1052 -#define _GUARD_ITER_VIRTUAL_r33 1053 -#define _GUARD_KEYS_VERSION_r01 1054 -#define _GUARD_KEYS_VERSION_r11 1055 -#define _GUARD_KEYS_VERSION_r22 1056 -#define _GUARD_KEYS_VERSION_r33 1057 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r03 1058 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r13 1059 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r23 1060 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r33 1061 -#define _GUARD_NOS_COMPACT_ASCII_r02 1062 -#define _GUARD_NOS_COMPACT_ASCII_r12 1063 -#define _GUARD_NOS_COMPACT_ASCII_r22 1064 -#define _GUARD_NOS_COMPACT_ASCII_r33 1065 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r03 1066 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r13 1067 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r23 1068 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r33 1069 -#define _GUARD_NOS_DICT_SUBSCRIPT_r02 1070 -#define _GUARD_NOS_DICT_SUBSCRIPT_r12 1071 -#define _GUARD_NOS_DICT_SUBSCRIPT_r22 1072 -#define _GUARD_NOS_DICT_SUBSCRIPT_r33 1073 -#define _GUARD_NOS_FLOAT_r02 1074 -#define _GUARD_NOS_FLOAT_r12 1075 -#define _GUARD_NOS_FLOAT_r22 1076 -#define _GUARD_NOS_FLOAT_r33 1077 -#define _GUARD_NOS_INT_r02 1078 -#define _GUARD_NOS_INT_r12 1079 -#define _GUARD_NOS_INT_r22 1080 -#define _GUARD_NOS_INT_r33 1081 -#define _GUARD_NOS_ITER_VIRTUAL_r02 1082 -#define _GUARD_NOS_ITER_VIRTUAL_r12 1083 -#define _GUARD_NOS_ITER_VIRTUAL_r22 1084 -#define _GUARD_NOS_ITER_VIRTUAL_r33 1085 -#define _GUARD_NOS_LIST_r02 1086 -#define _GUARD_NOS_LIST_r12 1087 -#define _GUARD_NOS_LIST_r22 1088 -#define _GUARD_NOS_LIST_r33 1089 -#define _GUARD_NOS_NOT_NULL_r02 1090 -#define _GUARD_NOS_NOT_NULL_r12 1091 -#define _GUARD_NOS_NOT_NULL_r22 1092 -#define _GUARD_NOS_NOT_NULL_r33 1093 -#define _GUARD_NOS_NULL_r02 1094 -#define _GUARD_NOS_NULL_r12 1095 -#define _GUARD_NOS_NULL_r22 1096 -#define _GUARD_NOS_NULL_r33 1097 -#define _GUARD_NOS_OVERFLOWED_r02 1098 -#define _GUARD_NOS_OVERFLOWED_r12 1099 -#define _GUARD_NOS_OVERFLOWED_r22 1100 -#define _GUARD_NOS_OVERFLOWED_r33 1101 -#define _GUARD_NOS_TUPLE_r02 1102 -#define _GUARD_NOS_TUPLE_r12 1103 -#define _GUARD_NOS_TUPLE_r22 1104 -#define _GUARD_NOS_TUPLE_r33 1105 -#define _GUARD_NOS_TYPE_VERSION_r02 1106 -#define _GUARD_NOS_TYPE_VERSION_r12 1107 -#define _GUARD_NOS_TYPE_VERSION_r22 1108 -#define _GUARD_NOS_TYPE_VERSION_r33 1109 -#define _GUARD_NOS_UNICODE_r02 1110 -#define _GUARD_NOS_UNICODE_r12 1111 -#define _GUARD_NOS_UNICODE_r22 1112 -#define _GUARD_NOS_UNICODE_r33 1113 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 1114 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 1115 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 1116 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 1117 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 1118 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 1119 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 1120 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 1121 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 1122 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 1123 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 1124 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 1125 -#define _GUARD_THIRD_NULL_r03 1126 -#define _GUARD_THIRD_NULL_r13 1127 -#define _GUARD_THIRD_NULL_r23 1128 -#define _GUARD_THIRD_NULL_r33 1129 -#define _GUARD_TOS_ANY_DICT_r01 1130 -#define _GUARD_TOS_ANY_DICT_r11 1131 -#define _GUARD_TOS_ANY_DICT_r22 1132 -#define _GUARD_TOS_ANY_DICT_r33 1133 -#define _GUARD_TOS_ANY_SET_r01 1134 -#define _GUARD_TOS_ANY_SET_r11 1135 -#define _GUARD_TOS_ANY_SET_r22 1136 -#define _GUARD_TOS_ANY_SET_r33 1137 -#define _GUARD_TOS_DICT_r01 1138 -#define _GUARD_TOS_DICT_r11 1139 -#define _GUARD_TOS_DICT_r22 1140 -#define _GUARD_TOS_DICT_r33 1141 -#define _GUARD_TOS_FLOAT_r01 1142 -#define _GUARD_TOS_FLOAT_r11 1143 -#define _GUARD_TOS_FLOAT_r22 1144 -#define _GUARD_TOS_FLOAT_r33 1145 -#define _GUARD_TOS_FROZENDICT_r01 1146 -#define _GUARD_TOS_FROZENDICT_r11 1147 -#define _GUARD_TOS_FROZENDICT_r22 1148 -#define _GUARD_TOS_FROZENDICT_r33 1149 -#define _GUARD_TOS_FROZENSET_r01 1150 -#define _GUARD_TOS_FROZENSET_r11 1151 -#define _GUARD_TOS_FROZENSET_r22 1152 -#define _GUARD_TOS_FROZENSET_r33 1153 -#define _GUARD_TOS_INT_r01 1154 -#define _GUARD_TOS_INT_r11 1155 -#define _GUARD_TOS_INT_r22 1156 -#define _GUARD_TOS_INT_r33 1157 -#define _GUARD_TOS_LIST_r01 1158 -#define _GUARD_TOS_LIST_r11 1159 -#define _GUARD_TOS_LIST_r22 1160 -#define _GUARD_TOS_LIST_r33 1161 -#define _GUARD_TOS_OVERFLOWED_r01 1162 -#define _GUARD_TOS_OVERFLOWED_r11 1163 -#define _GUARD_TOS_OVERFLOWED_r22 1164 -#define _GUARD_TOS_OVERFLOWED_r33 1165 -#define _GUARD_TOS_SET_r01 1166 -#define _GUARD_TOS_SET_r11 1167 -#define _GUARD_TOS_SET_r22 1168 -#define _GUARD_TOS_SET_r33 1169 -#define _GUARD_TOS_SLICE_r01 1170 -#define _GUARD_TOS_SLICE_r11 1171 -#define _GUARD_TOS_SLICE_r22 1172 -#define _GUARD_TOS_SLICE_r33 1173 -#define _GUARD_TOS_TUPLE_r01 1174 -#define _GUARD_TOS_TUPLE_r11 1175 -#define _GUARD_TOS_TUPLE_r22 1176 -#define _GUARD_TOS_TUPLE_r33 1177 -#define _GUARD_TOS_UNICODE_r01 1178 -#define _GUARD_TOS_UNICODE_r11 1179 -#define _GUARD_TOS_UNICODE_r22 1180 -#define _GUARD_TOS_UNICODE_r33 1181 -#define _GUARD_TYPE_r01 1182 -#define _GUARD_TYPE_r11 1183 -#define _GUARD_TYPE_r22 1184 -#define _GUARD_TYPE_r33 1185 -#define _GUARD_TYPE_ITER_r02 1186 -#define _GUARD_TYPE_ITER_r12 1187 -#define _GUARD_TYPE_ITER_r22 1188 -#define _GUARD_TYPE_ITER_r33 1189 -#define _GUARD_TYPE_VERSION_r01 1190 -#define _GUARD_TYPE_VERSION_r11 1191 -#define _GUARD_TYPE_VERSION_r22 1192 -#define _GUARD_TYPE_VERSION_r33 1193 -#define _GUARD_TYPE_VERSION_LOCKED_r01 1194 -#define _GUARD_TYPE_VERSION_LOCKED_r11 1195 -#define _GUARD_TYPE_VERSION_LOCKED_r22 1196 -#define _GUARD_TYPE_VERSION_LOCKED_r33 1197 -#define _HANDLE_PENDING_AND_DEOPT_r00 1198 -#define _HANDLE_PENDING_AND_DEOPT_r10 1199 -#define _HANDLE_PENDING_AND_DEOPT_r20 1200 -#define _HANDLE_PENDING_AND_DEOPT_r30 1201 -#define _IMPORT_FROM_r12 1202 -#define _IMPORT_NAME_r21 1203 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1204 -#define _INIT_CALL_PY_EXACT_ARGS_r01 1205 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1206 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1207 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1208 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1209 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1210 -#define _INSERT_NULL_r10 1211 -#define _INSTRUMENTED_FOR_ITER_r23 1212 -#define _INSTRUMENTED_INSTRUCTION_r00 1213 -#define _INSTRUMENTED_JUMP_FORWARD_r00 1214 -#define _INSTRUMENTED_JUMP_FORWARD_r11 1215 -#define _INSTRUMENTED_JUMP_FORWARD_r22 1216 -#define _INSTRUMENTED_JUMP_FORWARD_r33 1217 -#define _INSTRUMENTED_LINE_r00 1218 -#define _INSTRUMENTED_NOT_TAKEN_r00 1219 -#define _INSTRUMENTED_NOT_TAKEN_r11 1220 -#define _INSTRUMENTED_NOT_TAKEN_r22 1221 -#define _INSTRUMENTED_NOT_TAKEN_r33 1222 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1223 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1224 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1225 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1226 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1227 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1228 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1229 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1230 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1231 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1232 -#define _IS_NONE_r11 1233 -#define _IS_OP_r03 1234 -#define _IS_OP_r13 1235 -#define _IS_OP_r23 1236 -#define _ITER_CHECK_LIST_r02 1237 -#define _ITER_CHECK_LIST_r12 1238 -#define _ITER_CHECK_LIST_r22 1239 -#define _ITER_CHECK_LIST_r33 1240 -#define _ITER_CHECK_RANGE_r02 1241 -#define _ITER_CHECK_RANGE_r12 1242 -#define _ITER_CHECK_RANGE_r22 1243 -#define _ITER_CHECK_RANGE_r33 1244 -#define _ITER_CHECK_TUPLE_r02 1245 -#define _ITER_CHECK_TUPLE_r12 1246 -#define _ITER_CHECK_TUPLE_r22 1247 -#define _ITER_CHECK_TUPLE_r33 1248 -#define _ITER_JUMP_LIST_r02 1249 -#define _ITER_JUMP_LIST_r12 1250 -#define _ITER_JUMP_LIST_r22 1251 -#define _ITER_JUMP_LIST_r33 1252 -#define _ITER_JUMP_RANGE_r02 1253 -#define _ITER_JUMP_RANGE_r12 1254 -#define _ITER_JUMP_RANGE_r22 1255 -#define _ITER_JUMP_RANGE_r33 1256 -#define _ITER_JUMP_TUPLE_r02 1257 -#define _ITER_JUMP_TUPLE_r12 1258 -#define _ITER_JUMP_TUPLE_r22 1259 -#define _ITER_JUMP_TUPLE_r33 1260 -#define _ITER_NEXT_INLINE_r23 1261 -#define _ITER_NEXT_LIST_r23 1262 -#define _ITER_NEXT_LIST_TIER_TWO_r23 1263 -#define _ITER_NEXT_RANGE_r03 1264 -#define _ITER_NEXT_RANGE_r13 1265 -#define _ITER_NEXT_RANGE_r23 1266 -#define _ITER_NEXT_TUPLE_r03 1267 -#define _ITER_NEXT_TUPLE_r13 1268 -#define _ITER_NEXT_TUPLE_r23 1269 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1270 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1271 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1272 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1273 -#define _JUMP_TO_TOP_r00 1274 -#define _LIST_APPEND_r10 1275 -#define _LIST_EXTEND_r11 1276 -#define _LOAD_ATTR_r10 1277 -#define _LOAD_ATTR_CLASS_r11 1278 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME_r11 1279 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 1280 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1281 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1282 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1283 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1284 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1285 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1286 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1287 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1288 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1289 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1290 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1291 -#define _LOAD_ATTR_MODULE_r12 1292 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1293 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1294 -#define _LOAD_ATTR_PROPERTY_FRAME_r01 1295 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1296 -#define _LOAD_ATTR_PROPERTY_FRAME_r22 1297 -#define _LOAD_ATTR_PROPERTY_FRAME_r33 1298 -#define _LOAD_ATTR_SLOT_r02 1299 -#define _LOAD_ATTR_SLOT_r12 1300 -#define _LOAD_ATTR_SLOT_r23 1301 -#define _LOAD_ATTR_WITH_HINT_r12 1302 -#define _LOAD_BUILD_CLASS_r01 1303 -#define _LOAD_BYTECODE_r00 1304 -#define _LOAD_COMMON_CONSTANT_r01 1305 -#define _LOAD_COMMON_CONSTANT_r12 1306 -#define _LOAD_COMMON_CONSTANT_r23 1307 -#define _LOAD_CONST_r01 1308 -#define _LOAD_CONST_r12 1309 -#define _LOAD_CONST_r23 1310 -#define _LOAD_CONST_INLINE_r01 1311 -#define _LOAD_CONST_INLINE_r12 1312 -#define _LOAD_CONST_INLINE_r23 1313 -#define _LOAD_CONST_INLINE_BORROW_r01 1314 -#define _LOAD_CONST_INLINE_BORROW_r12 1315 -#define _LOAD_CONST_INLINE_BORROW_r23 1316 -#define _LOAD_DEREF_r01 1317 -#define _LOAD_FAST_r01 1318 -#define _LOAD_FAST_r12 1319 -#define _LOAD_FAST_r23 1320 -#define _LOAD_FAST_0_r01 1321 -#define _LOAD_FAST_0_r12 1322 -#define _LOAD_FAST_0_r23 1323 -#define _LOAD_FAST_1_r01 1324 -#define _LOAD_FAST_1_r12 1325 -#define _LOAD_FAST_1_r23 1326 -#define _LOAD_FAST_2_r01 1327 -#define _LOAD_FAST_2_r12 1328 -#define _LOAD_FAST_2_r23 1329 -#define _LOAD_FAST_3_r01 1330 -#define _LOAD_FAST_3_r12 1331 -#define _LOAD_FAST_3_r23 1332 -#define _LOAD_FAST_4_r01 1333 -#define _LOAD_FAST_4_r12 1334 -#define _LOAD_FAST_4_r23 1335 -#define _LOAD_FAST_5_r01 1336 -#define _LOAD_FAST_5_r12 1337 -#define _LOAD_FAST_5_r23 1338 -#define _LOAD_FAST_6_r01 1339 -#define _LOAD_FAST_6_r12 1340 -#define _LOAD_FAST_6_r23 1341 -#define _LOAD_FAST_7_r01 1342 -#define _LOAD_FAST_7_r12 1343 -#define _LOAD_FAST_7_r23 1344 -#define _LOAD_FAST_AND_CLEAR_r01 1345 -#define _LOAD_FAST_AND_CLEAR_r12 1346 -#define _LOAD_FAST_AND_CLEAR_r23 1347 -#define _LOAD_FAST_BORROW_r01 1348 -#define _LOAD_FAST_BORROW_r12 1349 -#define _LOAD_FAST_BORROW_r23 1350 -#define _LOAD_FAST_BORROW_0_r01 1351 -#define _LOAD_FAST_BORROW_0_r12 1352 -#define _LOAD_FAST_BORROW_0_r23 1353 -#define _LOAD_FAST_BORROW_1_r01 1354 -#define _LOAD_FAST_BORROW_1_r12 1355 -#define _LOAD_FAST_BORROW_1_r23 1356 -#define _LOAD_FAST_BORROW_2_r01 1357 -#define _LOAD_FAST_BORROW_2_r12 1358 -#define _LOAD_FAST_BORROW_2_r23 1359 -#define _LOAD_FAST_BORROW_3_r01 1360 -#define _LOAD_FAST_BORROW_3_r12 1361 -#define _LOAD_FAST_BORROW_3_r23 1362 -#define _LOAD_FAST_BORROW_4_r01 1363 -#define _LOAD_FAST_BORROW_4_r12 1364 -#define _LOAD_FAST_BORROW_4_r23 1365 -#define _LOAD_FAST_BORROW_5_r01 1366 -#define _LOAD_FAST_BORROW_5_r12 1367 -#define _LOAD_FAST_BORROW_5_r23 1368 -#define _LOAD_FAST_BORROW_6_r01 1369 -#define _LOAD_FAST_BORROW_6_r12 1370 -#define _LOAD_FAST_BORROW_6_r23 1371 -#define _LOAD_FAST_BORROW_7_r01 1372 -#define _LOAD_FAST_BORROW_7_r12 1373 -#define _LOAD_FAST_BORROW_7_r23 1374 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1375 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1376 -#define _LOAD_FAST_CHECK_r01 1377 -#define _LOAD_FAST_CHECK_r12 1378 -#define _LOAD_FAST_CHECK_r23 1379 -#define _LOAD_FAST_LOAD_FAST_r02 1380 -#define _LOAD_FAST_LOAD_FAST_r13 1381 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1382 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1383 -#define _LOAD_GLOBAL_r00 1384 -#define _LOAD_GLOBAL_BUILTINS_r01 1385 -#define _LOAD_GLOBAL_MODULE_r01 1386 -#define _LOAD_LOCALS_r01 1387 -#define _LOAD_LOCALS_r12 1388 -#define _LOAD_LOCALS_r23 1389 -#define _LOAD_NAME_r01 1390 -#define _LOAD_SMALL_INT_r01 1391 -#define _LOAD_SMALL_INT_r12 1392 -#define _LOAD_SMALL_INT_r23 1393 -#define _LOAD_SMALL_INT_0_r01 1394 -#define _LOAD_SMALL_INT_0_r12 1395 -#define _LOAD_SMALL_INT_0_r23 1396 -#define _LOAD_SMALL_INT_1_r01 1397 -#define _LOAD_SMALL_INT_1_r12 1398 -#define _LOAD_SMALL_INT_1_r23 1399 -#define _LOAD_SMALL_INT_2_r01 1400 -#define _LOAD_SMALL_INT_2_r12 1401 -#define _LOAD_SMALL_INT_2_r23 1402 -#define _LOAD_SMALL_INT_3_r01 1403 -#define _LOAD_SMALL_INT_3_r12 1404 -#define _LOAD_SMALL_INT_3_r23 1405 -#define _LOAD_SPECIAL_r00 1406 -#define _LOAD_SUPER_ATTR_ATTR_r31 1407 -#define _LOAD_SUPER_ATTR_METHOD_r32 1408 -#define _LOCK_OBJECT_r01 1409 -#define _LOCK_OBJECT_r11 1410 -#define _LOCK_OBJECT_r22 1411 -#define _LOCK_OBJECT_r33 1412 -#define _MAKE_CALLARGS_A_TUPLE_r33 1413 -#define _MAKE_CELL_r00 1414 -#define _MAKE_FUNCTION_r12 1415 -#define _MAKE_HEAP_SAFE_r01 1416 -#define _MAKE_HEAP_SAFE_r11 1417 -#define _MAKE_HEAP_SAFE_r22 1418 -#define _MAKE_HEAP_SAFE_r33 1419 -#define _MAKE_WARM_r00 1420 -#define _MAKE_WARM_r11 1421 -#define _MAKE_WARM_r22 1422 -#define _MAKE_WARM_r33 1423 -#define _MAP_ADD_r20 1424 -#define _MATCH_CLASS_r33 1425 -#define _MATCH_KEYS_r23 1426 -#define _MATCH_MAPPING_r02 1427 -#define _MATCH_MAPPING_r12 1428 -#define _MATCH_MAPPING_r23 1429 -#define _MATCH_SEQUENCE_r02 1430 -#define _MATCH_SEQUENCE_r12 1431 -#define _MATCH_SEQUENCE_r23 1432 -#define _MAYBE_EXPAND_METHOD_r00 1433 -#define _MAYBE_EXPAND_METHOD_KW_r11 1434 -#define _MONITOR_CALL_r00 1435 -#define _MONITOR_CALL_KW_r11 1436 -#define _MONITOR_JUMP_BACKWARD_r00 1437 -#define _MONITOR_JUMP_BACKWARD_r11 1438 -#define _MONITOR_JUMP_BACKWARD_r22 1439 -#define _MONITOR_JUMP_BACKWARD_r33 1440 -#define _MONITOR_RESUME_r00 1441 -#define _NOP_r00 1442 -#define _NOP_r11 1443 -#define _NOP_r22 1444 -#define _NOP_r33 1445 -#define _POP_EXCEPT_r10 1446 -#define _POP_ITER_r20 1447 -#define _POP_JUMP_IF_FALSE_r00 1448 -#define _POP_JUMP_IF_FALSE_r10 1449 -#define _POP_JUMP_IF_FALSE_r21 1450 -#define _POP_JUMP_IF_FALSE_r32 1451 -#define _POP_JUMP_IF_TRUE_r00 1452 -#define _POP_JUMP_IF_TRUE_r10 1453 -#define _POP_JUMP_IF_TRUE_r21 1454 -#define _POP_JUMP_IF_TRUE_r32 1455 -#define _POP_TOP_r10 1456 -#define _POP_TOP_FLOAT_r00 1457 -#define _POP_TOP_FLOAT_r10 1458 -#define _POP_TOP_FLOAT_r21 1459 -#define _POP_TOP_FLOAT_r32 1460 -#define _POP_TOP_INT_r00 1461 -#define _POP_TOP_INT_r10 1462 -#define _POP_TOP_INT_r21 1463 -#define _POP_TOP_INT_r32 1464 -#define _POP_TOP_NOP_r00 1465 -#define _POP_TOP_NOP_r10 1466 -#define _POP_TOP_NOP_r21 1467 -#define _POP_TOP_NOP_r32 1468 -#define _POP_TOP_OPARG_r00 1469 -#define _POP_TOP_UNICODE_r00 1470 -#define _POP_TOP_UNICODE_r10 1471 -#define _POP_TOP_UNICODE_r21 1472 -#define _POP_TOP_UNICODE_r32 1473 -#define _PUSH_EXC_INFO_r02 1474 -#define _PUSH_EXC_INFO_r12 1475 -#define _PUSH_EXC_INFO_r23 1476 -#define _PUSH_FRAME_r10 1477 -#define _PUSH_NULL_r01 1478 -#define _PUSH_NULL_r12 1479 -#define _PUSH_NULL_r23 1480 -#define _PUSH_NULL_CONDITIONAL_r00 1481 -#define _PUSH_TAGGED_ZERO_r01 1482 -#define _PUSH_TAGGED_ZERO_r12 1483 -#define _PUSH_TAGGED_ZERO_r23 1484 -#define _PY_FRAME_EX_r31 1485 -#define _PY_FRAME_GENERAL_r01 1486 -#define _PY_FRAME_KW_r11 1487 -#define _REPLACE_WITH_TRUE_r02 1488 -#define _REPLACE_WITH_TRUE_r12 1489 -#define _REPLACE_WITH_TRUE_r23 1490 -#define _RESUME_CHECK_r00 1491 -#define _RESUME_CHECK_r11 1492 -#define _RESUME_CHECK_r22 1493 -#define _RESUME_CHECK_r33 1494 -#define _RETURN_GENERATOR_r01 1495 -#define _RETURN_VALUE_r11 1496 -#define _RROT_3_r03 1497 -#define _RROT_3_r13 1498 -#define _RROT_3_r23 1499 -#define _RROT_3_r33 1500 -#define _SAVE_RETURN_OFFSET_r00 1501 -#define _SAVE_RETURN_OFFSET_r11 1502 -#define _SAVE_RETURN_OFFSET_r22 1503 -#define _SAVE_RETURN_OFFSET_r33 1504 -#define _SEND_r33 1505 -#define _SEND_GEN_FRAME_r33 1506 -#define _SETUP_ANNOTATIONS_r00 1507 -#define _SET_ADD_r10 1508 -#define _SET_FUNCTION_ATTRIBUTE_r01 1509 -#define _SET_FUNCTION_ATTRIBUTE_r11 1510 -#define _SET_FUNCTION_ATTRIBUTE_r21 1511 -#define _SET_FUNCTION_ATTRIBUTE_r32 1512 -#define _SET_IP_r00 1513 -#define _SET_IP_r11 1514 -#define _SET_IP_r22 1515 -#define _SET_IP_r33 1516 -#define _SET_UPDATE_r11 1517 -#define _SPILL_OR_RELOAD_r01 1518 -#define _SPILL_OR_RELOAD_r02 1519 -#define _SPILL_OR_RELOAD_r03 1520 -#define _SPILL_OR_RELOAD_r10 1521 -#define _SPILL_OR_RELOAD_r12 1522 -#define _SPILL_OR_RELOAD_r13 1523 -#define _SPILL_OR_RELOAD_r20 1524 -#define _SPILL_OR_RELOAD_r21 1525 -#define _SPILL_OR_RELOAD_r23 1526 -#define _SPILL_OR_RELOAD_r30 1527 -#define _SPILL_OR_RELOAD_r31 1528 -#define _SPILL_OR_RELOAD_r32 1529 -#define _START_EXECUTOR_r00 1530 -#define _STORE_ATTR_r20 1531 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1532 -#define _STORE_ATTR_SLOT_r21 1533 -#define _STORE_ATTR_WITH_HINT_r21 1534 -#define _STORE_DEREF_r10 1535 -#define _STORE_FAST_LOAD_FAST_r11 1536 -#define _STORE_FAST_STORE_FAST_r20 1537 -#define _STORE_GLOBAL_r10 1538 -#define _STORE_NAME_r10 1539 -#define _STORE_SLICE_r30 1540 -#define _STORE_SUBSCR_r30 1541 -#define _STORE_SUBSCR_DICT_r31 1542 -#define _STORE_SUBSCR_DICT_KNOWN_HASH_r31 1543 -#define _STORE_SUBSCR_LIST_INT_r32 1544 -#define _SWAP_r11 1545 -#define _SWAP_2_r02 1546 -#define _SWAP_2_r12 1547 -#define _SWAP_2_r22 1548 -#define _SWAP_2_r33 1549 -#define _SWAP_3_r03 1550 -#define _SWAP_3_r13 1551 -#define _SWAP_3_r23 1552 -#define _SWAP_3_r33 1553 -#define _SWAP_FAST_r01 1554 -#define _SWAP_FAST_r11 1555 -#define _SWAP_FAST_r22 1556 -#define _SWAP_FAST_r33 1557 -#define _SWAP_FAST_0_r01 1558 -#define _SWAP_FAST_0_r11 1559 -#define _SWAP_FAST_0_r22 1560 -#define _SWAP_FAST_0_r33 1561 -#define _SWAP_FAST_1_r01 1562 -#define _SWAP_FAST_1_r11 1563 -#define _SWAP_FAST_1_r22 1564 -#define _SWAP_FAST_1_r33 1565 -#define _SWAP_FAST_2_r01 1566 -#define _SWAP_FAST_2_r11 1567 -#define _SWAP_FAST_2_r22 1568 -#define _SWAP_FAST_2_r33 1569 -#define _SWAP_FAST_3_r01 1570 -#define _SWAP_FAST_3_r11 1571 -#define _SWAP_FAST_3_r22 1572 -#define _SWAP_FAST_3_r33 1573 -#define _SWAP_FAST_4_r01 1574 -#define _SWAP_FAST_4_r11 1575 -#define _SWAP_FAST_4_r22 1576 -#define _SWAP_FAST_4_r33 1577 -#define _SWAP_FAST_5_r01 1578 -#define _SWAP_FAST_5_r11 1579 -#define _SWAP_FAST_5_r22 1580 -#define _SWAP_FAST_5_r33 1581 -#define _SWAP_FAST_6_r01 1582 -#define _SWAP_FAST_6_r11 1583 -#define _SWAP_FAST_6_r22 1584 -#define _SWAP_FAST_6_r33 1585 -#define _SWAP_FAST_7_r01 1586 -#define _SWAP_FAST_7_r11 1587 -#define _SWAP_FAST_7_r22 1588 -#define _SWAP_FAST_7_r33 1589 -#define _TIER2_RESUME_CHECK_r00 1590 -#define _TIER2_RESUME_CHECK_r11 1591 -#define _TIER2_RESUME_CHECK_r22 1592 -#define _TIER2_RESUME_CHECK_r33 1593 -#define _TO_BOOL_r11 1594 -#define _TO_BOOL_BOOL_r01 1595 -#define _TO_BOOL_BOOL_r11 1596 -#define _TO_BOOL_BOOL_r22 1597 -#define _TO_BOOL_BOOL_r33 1598 -#define _TO_BOOL_INT_r02 1599 -#define _TO_BOOL_INT_r12 1600 -#define _TO_BOOL_INT_r23 1601 -#define _TO_BOOL_LIST_r02 1602 -#define _TO_BOOL_LIST_r12 1603 -#define _TO_BOOL_LIST_r23 1604 -#define _TO_BOOL_NONE_r01 1605 -#define _TO_BOOL_NONE_r11 1606 -#define _TO_BOOL_NONE_r22 1607 -#define _TO_BOOL_NONE_r33 1608 -#define _TO_BOOL_STR_r02 1609 -#define _TO_BOOL_STR_r12 1610 -#define _TO_BOOL_STR_r23 1611 -#define _TRACE_RECORD_r00 1612 -#define _UNARY_INVERT_r12 1613 -#define _UNARY_NEGATIVE_r12 1614 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r02 1615 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r12 1616 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r23 1617 -#define _UNARY_NOT_r01 1618 -#define _UNARY_NOT_r11 1619 -#define _UNARY_NOT_r22 1620 -#define _UNARY_NOT_r33 1621 -#define _UNPACK_EX_r10 1622 -#define _UNPACK_SEQUENCE_r10 1623 -#define _UNPACK_SEQUENCE_LIST_r10 1624 -#define _UNPACK_SEQUENCE_TUPLE_r10 1625 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1626 -#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r03 1627 -#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r13 1628 -#define _UNPACK_SEQUENCE_UNIQUE_TUPLE_r10 1629 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r02 1630 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r12 1631 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r23 1632 -#define _WITH_EXCEPT_START_r33 1633 -#define _YIELD_VALUE_r11 1634 -#define MAX_UOP_REGS_ID 1634 +#define _YIELD_VALUE 654 +#define MAX_UOP_ID 654 +#define _ALLOCATE_OBJECT_r00 655 +#define _BINARY_OP_r23 656 +#define _BINARY_OP_ADD_FLOAT_r03 657 +#define _BINARY_OP_ADD_FLOAT_r13 658 +#define _BINARY_OP_ADD_FLOAT_r23 659 +#define _BINARY_OP_ADD_FLOAT_INPLACE_r03 660 +#define _BINARY_OP_ADD_FLOAT_INPLACE_r13 661 +#define _BINARY_OP_ADD_FLOAT_INPLACE_r23 662 +#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r03 663 +#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r13 664 +#define _BINARY_OP_ADD_FLOAT_INPLACE_RIGHT_r23 665 +#define _BINARY_OP_ADD_INT_r03 666 +#define _BINARY_OP_ADD_INT_r13 667 +#define _BINARY_OP_ADD_INT_r23 668 +#define _BINARY_OP_ADD_INT_INPLACE_r03 669 +#define _BINARY_OP_ADD_INT_INPLACE_r13 670 +#define _BINARY_OP_ADD_INT_INPLACE_r23 671 +#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r03 672 +#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r13 673 +#define _BINARY_OP_ADD_INT_INPLACE_RIGHT_r23 674 +#define _BINARY_OP_ADD_UNICODE_r03 675 +#define _BINARY_OP_ADD_UNICODE_r13 676 +#define _BINARY_OP_ADD_UNICODE_r23 677 +#define _BINARY_OP_EXTEND_r23 678 +#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 679 +#define _BINARY_OP_MULTIPLY_FLOAT_r03 680 +#define _BINARY_OP_MULTIPLY_FLOAT_r13 681 +#define _BINARY_OP_MULTIPLY_FLOAT_r23 682 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r03 683 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r13 684 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_r23 685 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r03 686 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r13 687 +#define _BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT_r23 688 +#define _BINARY_OP_MULTIPLY_INT_r03 689 +#define _BINARY_OP_MULTIPLY_INT_r13 690 +#define _BINARY_OP_MULTIPLY_INT_r23 691 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_r03 692 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_r13 693 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_r23 694 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r03 695 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r13 696 +#define _BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT_r23 697 +#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 698 +#define _BINARY_OP_SUBSCR_DICT_r23 699 +#define _BINARY_OP_SUBSCR_DICT_KNOWN_HASH_r23 700 +#define _BINARY_OP_SUBSCR_INIT_CALL_r01 701 +#define _BINARY_OP_SUBSCR_INIT_CALL_r11 702 +#define _BINARY_OP_SUBSCR_INIT_CALL_r21 703 +#define _BINARY_OP_SUBSCR_INIT_CALL_r31 704 +#define _BINARY_OP_SUBSCR_LIST_INT_r23 705 +#define _BINARY_OP_SUBSCR_LIST_SLICE_r23 706 +#define _BINARY_OP_SUBSCR_STR_INT_r23 707 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 708 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 709 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 710 +#define _BINARY_OP_SUBSCR_USTR_INT_r23 711 +#define _BINARY_OP_SUBTRACT_FLOAT_r03 712 +#define _BINARY_OP_SUBTRACT_FLOAT_r13 713 +#define _BINARY_OP_SUBTRACT_FLOAT_r23 714 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r03 715 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r13 716 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_r23 717 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r03 718 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r13 719 +#define _BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT_r23 720 +#define _BINARY_OP_SUBTRACT_INT_r03 721 +#define _BINARY_OP_SUBTRACT_INT_r13 722 +#define _BINARY_OP_SUBTRACT_INT_r23 723 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_r03 724 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_r13 725 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_r23 726 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r03 727 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r13 728 +#define _BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT_r23 729 +#define _BINARY_OP_TRUEDIV_FLOAT_r23 730 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r03 731 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r13 732 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_r23 733 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r03 734 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r13 735 +#define _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT_r23 736 +#define _BINARY_SLICE_r31 737 +#define _BUILD_INTERPOLATION_r01 738 +#define _BUILD_LIST_r01 739 +#define _BUILD_MAP_r01 740 +#define _BUILD_SET_r01 741 +#define _BUILD_SLICE_r01 742 +#define _BUILD_STRING_r01 743 +#define _BUILD_TEMPLATE_r21 744 +#define _BUILD_TUPLE_r01 745 +#define _CALL_BUILTIN_CLASS_r00 746 +#define _CALL_BUILTIN_FAST_r00 747 +#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r00 748 +#define _CALL_BUILTIN_O_r03 749 +#define _CALL_FUNCTION_EX_NON_PY_GENERAL_r31 750 +#define _CALL_INTRINSIC_1_r12 751 +#define _CALL_INTRINSIC_2_r23 752 +#define _CALL_ISINSTANCE_r31 753 +#define _CALL_KW_NON_PY_r11 754 +#define _CALL_LEN_r33 755 +#define _CALL_LIST_APPEND_r03 756 +#define _CALL_LIST_APPEND_r13 757 +#define _CALL_LIST_APPEND_r23 758 +#define _CALL_LIST_APPEND_r33 759 +#define _CALL_METHOD_DESCRIPTOR_FAST_r00 760 +#define _CALL_METHOD_DESCRIPTOR_FAST_INLINE_r00 761 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 762 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r00 763 +#define _CALL_METHOD_DESCRIPTOR_NOARGS_r03 764 +#define _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03 765 +#define _CALL_METHOD_DESCRIPTOR_O_r03 766 +#define _CALL_METHOD_DESCRIPTOR_O_INLINE_r03 767 +#define _CALL_NON_PY_GENERAL_r01 768 +#define _CALL_STR_1_r32 769 +#define _CALL_TUPLE_1_r32 770 +#define _CALL_TYPE_1_r02 771 +#define _CALL_TYPE_1_r12 772 +#define _CALL_TYPE_1_r22 773 +#define _CALL_TYPE_1_r32 774 +#define _CHECK_ATTR_CLASS_r01 775 +#define _CHECK_ATTR_CLASS_r11 776 +#define _CHECK_ATTR_CLASS_r22 777 +#define _CHECK_ATTR_CLASS_r33 778 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 779 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 780 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 781 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 782 +#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 783 +#define _CHECK_EG_MATCH_r22 784 +#define _CHECK_EXC_MATCH_r22 785 +#define _CHECK_FUNCTION_EXACT_ARGS_r00 786 +#define _CHECK_FUNCTION_VERSION_r00 787 +#define _CHECK_FUNCTION_VERSION_INLINE_r00 788 +#define _CHECK_FUNCTION_VERSION_INLINE_r11 789 +#define _CHECK_FUNCTION_VERSION_INLINE_r22 790 +#define _CHECK_FUNCTION_VERSION_INLINE_r33 791 +#define _CHECK_FUNCTION_VERSION_KW_r11 792 +#define _CHECK_IS_NOT_PY_CALLABLE_r00 793 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r03 794 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r13 795 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r23 796 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r33 797 +#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 798 +#define _CHECK_IS_PY_CALLABLE_EX_r03 799 +#define _CHECK_IS_PY_CALLABLE_EX_r13 800 +#define _CHECK_IS_PY_CALLABLE_EX_r23 801 +#define _CHECK_IS_PY_CALLABLE_EX_r33 802 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 803 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 804 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 805 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 806 +#define _CHECK_METHOD_VERSION_r00 807 +#define _CHECK_METHOD_VERSION_KW_r11 808 +#define _CHECK_OBJECT_r00 809 +#define _CHECK_PEP_523_r00 810 +#define _CHECK_PEP_523_r11 811 +#define _CHECK_PEP_523_r22 812 +#define _CHECK_PEP_523_r33 813 +#define _CHECK_PERIODIC_r00 814 +#define _CHECK_PERIODIC_AT_END_r00 815 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 816 +#define _CHECK_RECURSION_LIMIT_r00 817 +#define _CHECK_RECURSION_LIMIT_r11 818 +#define _CHECK_RECURSION_LIMIT_r22 819 +#define _CHECK_RECURSION_LIMIT_r33 820 +#define _CHECK_RECURSION_REMAINING_r00 821 +#define _CHECK_RECURSION_REMAINING_r11 822 +#define _CHECK_RECURSION_REMAINING_r22 823 +#define _CHECK_RECURSION_REMAINING_r33 824 +#define _CHECK_STACK_SPACE_r00 825 +#define _CHECK_STACK_SPACE_OPERAND_r00 826 +#define _CHECK_STACK_SPACE_OPERAND_r11 827 +#define _CHECK_STACK_SPACE_OPERAND_r22 828 +#define _CHECK_STACK_SPACE_OPERAND_r33 829 +#define _CHECK_VALIDITY_r00 830 +#define _CHECK_VALIDITY_r11 831 +#define _CHECK_VALIDITY_r22 832 +#define _CHECK_VALIDITY_r33 833 +#define _COLD_DYNAMIC_EXIT_r00 834 +#define _COLD_EXIT_r00 835 +#define _COMPARE_OP_r21 836 +#define _COMPARE_OP_FLOAT_r03 837 +#define _COMPARE_OP_FLOAT_r13 838 +#define _COMPARE_OP_FLOAT_r23 839 +#define _COMPARE_OP_INT_r23 840 +#define _COMPARE_OP_STR_r23 841 +#define _CONTAINS_OP_r23 842 +#define _CONTAINS_OP_DICT_r23 843 +#define _CONTAINS_OP_SET_r23 844 +#define _CONVERT_VALUE_r11 845 +#define _COPY_r01 846 +#define _COPY_1_r02 847 +#define _COPY_1_r12 848 +#define _COPY_1_r23 849 +#define _COPY_2_r03 850 +#define _COPY_2_r13 851 +#define _COPY_2_r23 852 +#define _COPY_3_r03 853 +#define _COPY_3_r13 854 +#define _COPY_3_r23 855 +#define _COPY_3_r33 856 +#define _COPY_FREE_VARS_r00 857 +#define _COPY_FREE_VARS_r11 858 +#define _COPY_FREE_VARS_r22 859 +#define _COPY_FREE_VARS_r33 860 +#define _CREATE_INIT_FRAME_r01 861 +#define _DELETE_ATTR_r10 862 +#define _DELETE_DEREF_r00 863 +#define _DELETE_FAST_r00 864 +#define _DELETE_GLOBAL_r00 865 +#define _DELETE_NAME_r00 866 +#define _DELETE_SUBSCR_r20 867 +#define _DEOPT_r00 868 +#define _DEOPT_r10 869 +#define _DEOPT_r20 870 +#define _DEOPT_r30 871 +#define _DICT_MERGE_r11 872 +#define _DICT_UPDATE_r11 873 +#define _DO_CALL_r01 874 +#define _DO_CALL_FUNCTION_EX_r31 875 +#define _DO_CALL_KW_r11 876 +#define _DYNAMIC_EXIT_r00 877 +#define _DYNAMIC_EXIT_r10 878 +#define _DYNAMIC_EXIT_r20 879 +#define _DYNAMIC_EXIT_r30 880 +#define _END_FOR_r10 881 +#define _END_SEND_r31 882 +#define _ERROR_POP_N_r00 883 +#define _EXIT_INIT_CHECK_r10 884 +#define _EXIT_TRACE_r00 885 +#define _EXIT_TRACE_r10 886 +#define _EXIT_TRACE_r20 887 +#define _EXIT_TRACE_r30 888 +#define _EXPAND_METHOD_r00 889 +#define _EXPAND_METHOD_KW_r11 890 +#define _FATAL_ERROR_r00 891 +#define _FATAL_ERROR_r11 892 +#define _FATAL_ERROR_r22 893 +#define _FATAL_ERROR_r33 894 +#define _FORMAT_SIMPLE_r11 895 +#define _FORMAT_WITH_SPEC_r21 896 +#define _FOR_ITER_r23 897 +#define _FOR_ITER_GEN_FRAME_r03 898 +#define _FOR_ITER_GEN_FRAME_r13 899 +#define _FOR_ITER_GEN_FRAME_r23 900 +#define _FOR_ITER_TIER_TWO_r23 901 +#define _FOR_ITER_VIRTUAL_r23 902 +#define _FOR_ITER_VIRTUAL_TIER_TWO_r23 903 +#define _GET_AITER_r11 904 +#define _GET_ANEXT_r12 905 +#define _GET_AWAITABLE_r11 906 +#define _GET_ITER_r12 907 +#define _GET_ITER_TRAD_r12 908 +#define _GET_LEN_r12 909 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r03 910 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r13 911 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r23 912 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r33 913 +#define _GUARD_BINARY_OP_EXTEND_r22 914 +#define _GUARD_BINARY_OP_EXTEND_LHS_r02 915 +#define _GUARD_BINARY_OP_EXTEND_LHS_r12 916 +#define _GUARD_BINARY_OP_EXTEND_LHS_r22 917 +#define _GUARD_BINARY_OP_EXTEND_LHS_r33 918 +#define _GUARD_BINARY_OP_EXTEND_RHS_r02 919 +#define _GUARD_BINARY_OP_EXTEND_RHS_r12 920 +#define _GUARD_BINARY_OP_EXTEND_RHS_r22 921 +#define _GUARD_BINARY_OP_EXTEND_RHS_r33 922 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 923 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 924 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 925 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 926 +#define _GUARD_BIT_IS_SET_POP_r00 927 +#define _GUARD_BIT_IS_SET_POP_r10 928 +#define _GUARD_BIT_IS_SET_POP_r21 929 +#define _GUARD_BIT_IS_SET_POP_r32 930 +#define _GUARD_BIT_IS_SET_POP_4_r00 931 +#define _GUARD_BIT_IS_SET_POP_4_r10 932 +#define _GUARD_BIT_IS_SET_POP_4_r21 933 +#define _GUARD_BIT_IS_SET_POP_4_r32 934 +#define _GUARD_BIT_IS_SET_POP_5_r00 935 +#define _GUARD_BIT_IS_SET_POP_5_r10 936 +#define _GUARD_BIT_IS_SET_POP_5_r21 937 +#define _GUARD_BIT_IS_SET_POP_5_r32 938 +#define _GUARD_BIT_IS_SET_POP_6_r00 939 +#define _GUARD_BIT_IS_SET_POP_6_r10 940 +#define _GUARD_BIT_IS_SET_POP_6_r21 941 +#define _GUARD_BIT_IS_SET_POP_6_r32 942 +#define _GUARD_BIT_IS_SET_POP_7_r00 943 +#define _GUARD_BIT_IS_SET_POP_7_r10 944 +#define _GUARD_BIT_IS_SET_POP_7_r21 945 +#define _GUARD_BIT_IS_SET_POP_7_r32 946 +#define _GUARD_BIT_IS_UNSET_POP_r00 947 +#define _GUARD_BIT_IS_UNSET_POP_r10 948 +#define _GUARD_BIT_IS_UNSET_POP_r21 949 +#define _GUARD_BIT_IS_UNSET_POP_r32 950 +#define _GUARD_BIT_IS_UNSET_POP_4_r00 951 +#define _GUARD_BIT_IS_UNSET_POP_4_r10 952 +#define _GUARD_BIT_IS_UNSET_POP_4_r21 953 +#define _GUARD_BIT_IS_UNSET_POP_4_r32 954 +#define _GUARD_BIT_IS_UNSET_POP_5_r00 955 +#define _GUARD_BIT_IS_UNSET_POP_5_r10 956 +#define _GUARD_BIT_IS_UNSET_POP_5_r21 957 +#define _GUARD_BIT_IS_UNSET_POP_5_r32 958 +#define _GUARD_BIT_IS_UNSET_POP_6_r00 959 +#define _GUARD_BIT_IS_UNSET_POP_6_r10 960 +#define _GUARD_BIT_IS_UNSET_POP_6_r21 961 +#define _GUARD_BIT_IS_UNSET_POP_6_r32 962 +#define _GUARD_BIT_IS_UNSET_POP_7_r00 963 +#define _GUARD_BIT_IS_UNSET_POP_7_r10 964 +#define _GUARD_BIT_IS_UNSET_POP_7_r21 965 +#define _GUARD_BIT_IS_UNSET_POP_7_r32 966 +#define _GUARD_CALLABLE_BUILTIN_CLASS_r00 967 +#define _GUARD_CALLABLE_BUILTIN_FAST_r00 968 +#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS_r00 969 +#define _GUARD_CALLABLE_BUILTIN_O_r00 970 +#define _GUARD_CALLABLE_ISINSTANCE_r03 971 +#define _GUARD_CALLABLE_ISINSTANCE_r13 972 +#define _GUARD_CALLABLE_ISINSTANCE_r23 973 +#define _GUARD_CALLABLE_ISINSTANCE_r33 974 +#define _GUARD_CALLABLE_LEN_r03 975 +#define _GUARD_CALLABLE_LEN_r13 976 +#define _GUARD_CALLABLE_LEN_r23 977 +#define _GUARD_CALLABLE_LEN_r33 978 +#define _GUARD_CALLABLE_LIST_APPEND_r03 979 +#define _GUARD_CALLABLE_LIST_APPEND_r13 980 +#define _GUARD_CALLABLE_LIST_APPEND_r23 981 +#define _GUARD_CALLABLE_LIST_APPEND_r33 982 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_r00 983 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 984 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS_r00 985 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O_r00 986 +#define _GUARD_CALLABLE_STR_1_r03 987 +#define _GUARD_CALLABLE_STR_1_r13 988 +#define _GUARD_CALLABLE_STR_1_r23 989 +#define _GUARD_CALLABLE_STR_1_r33 990 +#define _GUARD_CALLABLE_TUPLE_1_r03 991 +#define _GUARD_CALLABLE_TUPLE_1_r13 992 +#define _GUARD_CALLABLE_TUPLE_1_r23 993 +#define _GUARD_CALLABLE_TUPLE_1_r33 994 +#define _GUARD_CALLABLE_TYPE_1_r03 995 +#define _GUARD_CALLABLE_TYPE_1_r13 996 +#define _GUARD_CALLABLE_TYPE_1_r23 997 +#define _GUARD_CALLABLE_TYPE_1_r33 998 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r00 999 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r11 1000 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r22 1001 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r33 1002 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r00 1003 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r11 1004 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r22 1005 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r33 1006 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r00 1007 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r11 1008 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r22 1009 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r33 1010 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r00 1011 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r11 1012 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r22 1013 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r33 1014 +#define _GUARD_DORV_NO_DICT_r01 1015 +#define _GUARD_DORV_NO_DICT_r11 1016 +#define _GUARD_DORV_NO_DICT_r22 1017 +#define _GUARD_DORV_NO_DICT_r33 1018 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 1019 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 1020 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 1021 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 1022 +#define _GUARD_GLOBALS_VERSION_r00 1023 +#define _GUARD_GLOBALS_VERSION_r11 1024 +#define _GUARD_GLOBALS_VERSION_r22 1025 +#define _GUARD_GLOBALS_VERSION_r33 1026 +#define _GUARD_IP_RETURN_GENERATOR_r00 1027 +#define _GUARD_IP_RETURN_GENERATOR_r11 1028 +#define _GUARD_IP_RETURN_GENERATOR_r22 1029 +#define _GUARD_IP_RETURN_GENERATOR_r33 1030 +#define _GUARD_IP_RETURN_VALUE_r00 1031 +#define _GUARD_IP_RETURN_VALUE_r11 1032 +#define _GUARD_IP_RETURN_VALUE_r22 1033 +#define _GUARD_IP_RETURN_VALUE_r33 1034 +#define _GUARD_IP_YIELD_VALUE_r00 1035 +#define _GUARD_IP_YIELD_VALUE_r11 1036 +#define _GUARD_IP_YIELD_VALUE_r22 1037 +#define _GUARD_IP_YIELD_VALUE_r33 1038 +#define _GUARD_IP__PUSH_FRAME_r00 1039 +#define _GUARD_IP__PUSH_FRAME_r11 1040 +#define _GUARD_IP__PUSH_FRAME_r22 1041 +#define _GUARD_IP__PUSH_FRAME_r33 1042 +#define _GUARD_IS_FALSE_POP_r00 1043 +#define _GUARD_IS_FALSE_POP_r10 1044 +#define _GUARD_IS_FALSE_POP_r21 1045 +#define _GUARD_IS_FALSE_POP_r32 1046 +#define _GUARD_IS_NONE_POP_r00 1047 +#define _GUARD_IS_NONE_POP_r10 1048 +#define _GUARD_IS_NONE_POP_r21 1049 +#define _GUARD_IS_NONE_POP_r32 1050 +#define _GUARD_IS_NOT_NONE_POP_r10 1051 +#define _GUARD_IS_TRUE_POP_r00 1052 +#define _GUARD_IS_TRUE_POP_r10 1053 +#define _GUARD_IS_TRUE_POP_r21 1054 +#define _GUARD_IS_TRUE_POP_r32 1055 +#define _GUARD_ITERATOR_r01 1056 +#define _GUARD_ITERATOR_r11 1057 +#define _GUARD_ITERATOR_r22 1058 +#define _GUARD_ITERATOR_r33 1059 +#define _GUARD_ITER_VIRTUAL_r01 1060 +#define _GUARD_ITER_VIRTUAL_r11 1061 +#define _GUARD_ITER_VIRTUAL_r22 1062 +#define _GUARD_ITER_VIRTUAL_r33 1063 +#define _GUARD_KEYS_VERSION_r01 1064 +#define _GUARD_KEYS_VERSION_r11 1065 +#define _GUARD_KEYS_VERSION_r22 1066 +#define _GUARD_KEYS_VERSION_r33 1067 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r03 1068 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r13 1069 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r23 1070 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r33 1071 +#define _GUARD_NOS_COMPACT_ASCII_r02 1072 +#define _GUARD_NOS_COMPACT_ASCII_r12 1073 +#define _GUARD_NOS_COMPACT_ASCII_r22 1074 +#define _GUARD_NOS_COMPACT_ASCII_r33 1075 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r03 1076 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r13 1077 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r23 1078 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r33 1079 +#define _GUARD_NOS_DICT_SUBSCRIPT_r02 1080 +#define _GUARD_NOS_DICT_SUBSCRIPT_r12 1081 +#define _GUARD_NOS_DICT_SUBSCRIPT_r22 1082 +#define _GUARD_NOS_DICT_SUBSCRIPT_r33 1083 +#define _GUARD_NOS_FLOAT_r02 1084 +#define _GUARD_NOS_FLOAT_r12 1085 +#define _GUARD_NOS_FLOAT_r22 1086 +#define _GUARD_NOS_FLOAT_r33 1087 +#define _GUARD_NOS_INT_r02 1088 +#define _GUARD_NOS_INT_r12 1089 +#define _GUARD_NOS_INT_r22 1090 +#define _GUARD_NOS_INT_r33 1091 +#define _GUARD_NOS_ITER_VIRTUAL_r02 1092 +#define _GUARD_NOS_ITER_VIRTUAL_r12 1093 +#define _GUARD_NOS_ITER_VIRTUAL_r22 1094 +#define _GUARD_NOS_ITER_VIRTUAL_r33 1095 +#define _GUARD_NOS_LIST_r02 1096 +#define _GUARD_NOS_LIST_r12 1097 +#define _GUARD_NOS_LIST_r22 1098 +#define _GUARD_NOS_LIST_r33 1099 +#define _GUARD_NOS_NOT_NULL_r02 1100 +#define _GUARD_NOS_NOT_NULL_r12 1101 +#define _GUARD_NOS_NOT_NULL_r22 1102 +#define _GUARD_NOS_NOT_NULL_r33 1103 +#define _GUARD_NOS_NULL_r02 1104 +#define _GUARD_NOS_NULL_r12 1105 +#define _GUARD_NOS_NULL_r22 1106 +#define _GUARD_NOS_NULL_r33 1107 +#define _GUARD_NOS_OVERFLOWED_r02 1108 +#define _GUARD_NOS_OVERFLOWED_r12 1109 +#define _GUARD_NOS_OVERFLOWED_r22 1110 +#define _GUARD_NOS_OVERFLOWED_r33 1111 +#define _GUARD_NOS_TUPLE_r02 1112 +#define _GUARD_NOS_TUPLE_r12 1113 +#define _GUARD_NOS_TUPLE_r22 1114 +#define _GUARD_NOS_TUPLE_r33 1115 +#define _GUARD_NOS_TYPE_VERSION_r02 1116 +#define _GUARD_NOS_TYPE_VERSION_r12 1117 +#define _GUARD_NOS_TYPE_VERSION_r22 1118 +#define _GUARD_NOS_TYPE_VERSION_r33 1119 +#define _GUARD_NOS_UNICODE_r02 1120 +#define _GUARD_NOS_UNICODE_r12 1121 +#define _GUARD_NOS_UNICODE_r22 1122 +#define _GUARD_NOS_UNICODE_r33 1123 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 1124 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 1125 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 1126 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 1127 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 1128 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 1129 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 1130 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 1131 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 1132 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 1133 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 1134 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 1135 +#define _GUARD_THIRD_NULL_r03 1136 +#define _GUARD_THIRD_NULL_r13 1137 +#define _GUARD_THIRD_NULL_r23 1138 +#define _GUARD_THIRD_NULL_r33 1139 +#define _GUARD_TOS_ANY_DICT_r01 1140 +#define _GUARD_TOS_ANY_DICT_r11 1141 +#define _GUARD_TOS_ANY_DICT_r22 1142 +#define _GUARD_TOS_ANY_DICT_r33 1143 +#define _GUARD_TOS_ANY_SET_r01 1144 +#define _GUARD_TOS_ANY_SET_r11 1145 +#define _GUARD_TOS_ANY_SET_r22 1146 +#define _GUARD_TOS_ANY_SET_r33 1147 +#define _GUARD_TOS_DICT_r01 1148 +#define _GUARD_TOS_DICT_r11 1149 +#define _GUARD_TOS_DICT_r22 1150 +#define _GUARD_TOS_DICT_r33 1151 +#define _GUARD_TOS_FLOAT_r01 1152 +#define _GUARD_TOS_FLOAT_r11 1153 +#define _GUARD_TOS_FLOAT_r22 1154 +#define _GUARD_TOS_FLOAT_r33 1155 +#define _GUARD_TOS_FROZENDICT_r01 1156 +#define _GUARD_TOS_FROZENDICT_r11 1157 +#define _GUARD_TOS_FROZENDICT_r22 1158 +#define _GUARD_TOS_FROZENDICT_r33 1159 +#define _GUARD_TOS_FROZENSET_r01 1160 +#define _GUARD_TOS_FROZENSET_r11 1161 +#define _GUARD_TOS_FROZENSET_r22 1162 +#define _GUARD_TOS_FROZENSET_r33 1163 +#define _GUARD_TOS_INT_r01 1164 +#define _GUARD_TOS_INT_r11 1165 +#define _GUARD_TOS_INT_r22 1166 +#define _GUARD_TOS_INT_r33 1167 +#define _GUARD_TOS_IS_NONE_r01 1168 +#define _GUARD_TOS_IS_NONE_r11 1169 +#define _GUARD_TOS_IS_NONE_r22 1170 +#define _GUARD_TOS_IS_NONE_r33 1171 +#define _GUARD_TOS_LIST_r01 1172 +#define _GUARD_TOS_LIST_r11 1173 +#define _GUARD_TOS_LIST_r22 1174 +#define _GUARD_TOS_LIST_r33 1175 +#define _GUARD_TOS_NOT_NULL_r01 1176 +#define _GUARD_TOS_NOT_NULL_r11 1177 +#define _GUARD_TOS_NOT_NULL_r22 1178 +#define _GUARD_TOS_NOT_NULL_r33 1179 +#define _GUARD_TOS_OVERFLOWED_r01 1180 +#define _GUARD_TOS_OVERFLOWED_r11 1181 +#define _GUARD_TOS_OVERFLOWED_r22 1182 +#define _GUARD_TOS_OVERFLOWED_r33 1183 +#define _GUARD_TOS_SET_r01 1184 +#define _GUARD_TOS_SET_r11 1185 +#define _GUARD_TOS_SET_r22 1186 +#define _GUARD_TOS_SET_r33 1187 +#define _GUARD_TOS_SLICE_r01 1188 +#define _GUARD_TOS_SLICE_r11 1189 +#define _GUARD_TOS_SLICE_r22 1190 +#define _GUARD_TOS_SLICE_r33 1191 +#define _GUARD_TOS_TUPLE_r01 1192 +#define _GUARD_TOS_TUPLE_r11 1193 +#define _GUARD_TOS_TUPLE_r22 1194 +#define _GUARD_TOS_TUPLE_r33 1195 +#define _GUARD_TOS_UNICODE_r01 1196 +#define _GUARD_TOS_UNICODE_r11 1197 +#define _GUARD_TOS_UNICODE_r22 1198 +#define _GUARD_TOS_UNICODE_r33 1199 +#define _GUARD_TYPE_r01 1200 +#define _GUARD_TYPE_r11 1201 +#define _GUARD_TYPE_r22 1202 +#define _GUARD_TYPE_r33 1203 +#define _GUARD_TYPE_ITER_r02 1204 +#define _GUARD_TYPE_ITER_r12 1205 +#define _GUARD_TYPE_ITER_r22 1206 +#define _GUARD_TYPE_ITER_r33 1207 +#define _GUARD_TYPE_VERSION_r01 1208 +#define _GUARD_TYPE_VERSION_r11 1209 +#define _GUARD_TYPE_VERSION_r22 1210 +#define _GUARD_TYPE_VERSION_r33 1211 +#define _GUARD_TYPE_VERSION_LOCKED_r01 1212 +#define _GUARD_TYPE_VERSION_LOCKED_r11 1213 +#define _GUARD_TYPE_VERSION_LOCKED_r22 1214 +#define _GUARD_TYPE_VERSION_LOCKED_r33 1215 +#define _HANDLE_PENDING_AND_DEOPT_r00 1216 +#define _HANDLE_PENDING_AND_DEOPT_r10 1217 +#define _HANDLE_PENDING_AND_DEOPT_r20 1218 +#define _HANDLE_PENDING_AND_DEOPT_r30 1219 +#define _IMPORT_FROM_r12 1220 +#define _IMPORT_NAME_r21 1221 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1222 +#define _INIT_CALL_PY_EXACT_ARGS_r01 1223 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1224 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1225 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1226 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1227 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1228 +#define _INSERT_NULL_r10 1229 +#define _INSTRUMENTED_FOR_ITER_r23 1230 +#define _INSTRUMENTED_INSTRUCTION_r00 1231 +#define _INSTRUMENTED_JUMP_FORWARD_r00 1232 +#define _INSTRUMENTED_JUMP_FORWARD_r11 1233 +#define _INSTRUMENTED_JUMP_FORWARD_r22 1234 +#define _INSTRUMENTED_JUMP_FORWARD_r33 1235 +#define _INSTRUMENTED_LINE_r00 1236 +#define _INSTRUMENTED_NOT_TAKEN_r00 1237 +#define _INSTRUMENTED_NOT_TAKEN_r11 1238 +#define _INSTRUMENTED_NOT_TAKEN_r22 1239 +#define _INSTRUMENTED_NOT_TAKEN_r33 1240 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1241 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1242 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1243 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1244 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1245 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1246 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1247 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1248 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1249 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1250 +#define _IS_NONE_r11 1251 +#define _IS_OP_r03 1252 +#define _IS_OP_r13 1253 +#define _IS_OP_r23 1254 +#define _ITER_CHECK_LIST_r02 1255 +#define _ITER_CHECK_LIST_r12 1256 +#define _ITER_CHECK_LIST_r22 1257 +#define _ITER_CHECK_LIST_r33 1258 +#define _ITER_CHECK_RANGE_r02 1259 +#define _ITER_CHECK_RANGE_r12 1260 +#define _ITER_CHECK_RANGE_r22 1261 +#define _ITER_CHECK_RANGE_r33 1262 +#define _ITER_CHECK_TUPLE_r02 1263 +#define _ITER_CHECK_TUPLE_r12 1264 +#define _ITER_CHECK_TUPLE_r22 1265 +#define _ITER_CHECK_TUPLE_r33 1266 +#define _ITER_JUMP_LIST_r02 1267 +#define _ITER_JUMP_LIST_r12 1268 +#define _ITER_JUMP_LIST_r22 1269 +#define _ITER_JUMP_LIST_r33 1270 +#define _ITER_JUMP_RANGE_r02 1271 +#define _ITER_JUMP_RANGE_r12 1272 +#define _ITER_JUMP_RANGE_r22 1273 +#define _ITER_JUMP_RANGE_r33 1274 +#define _ITER_JUMP_TUPLE_r02 1275 +#define _ITER_JUMP_TUPLE_r12 1276 +#define _ITER_JUMP_TUPLE_r22 1277 +#define _ITER_JUMP_TUPLE_r33 1278 +#define _ITER_NEXT_INLINE_r23 1279 +#define _ITER_NEXT_LIST_r23 1280 +#define _ITER_NEXT_LIST_TIER_TWO_r23 1281 +#define _ITER_NEXT_RANGE_r03 1282 +#define _ITER_NEXT_RANGE_r13 1283 +#define _ITER_NEXT_RANGE_r23 1284 +#define _ITER_NEXT_TUPLE_r03 1285 +#define _ITER_NEXT_TUPLE_r13 1286 +#define _ITER_NEXT_TUPLE_r23 1287 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1288 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1289 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1290 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1291 +#define _JUMP_TO_TOP_r00 1292 +#define _LIST_APPEND_r10 1293 +#define _LIST_EXTEND_r11 1294 +#define _LOAD_ATTR_r10 1295 +#define _LOAD_ATTR_CLASS_r11 1296 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME_r11 1297 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 1298 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 1299 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 1300 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1301 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1302 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1303 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 1304 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 1305 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 1306 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1307 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1308 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1309 +#define _LOAD_ATTR_MODULE_r12 1310 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1311 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1312 +#define _LOAD_ATTR_PROPERTY_FRAME_r01 1313 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1314 +#define _LOAD_ATTR_PROPERTY_FRAME_r22 1315 +#define _LOAD_ATTR_PROPERTY_FRAME_r33 1316 +#define _LOAD_ATTR_SLOT_r02 1317 +#define _LOAD_ATTR_SLOT_r12 1318 +#define _LOAD_ATTR_SLOT_r23 1319 +#define _LOAD_ATTR_WITH_HINT_r12 1320 +#define _LOAD_BUILD_CLASS_r01 1321 +#define _LOAD_BYTECODE_r00 1322 +#define _LOAD_COMMON_CONSTANT_r01 1323 +#define _LOAD_COMMON_CONSTANT_r12 1324 +#define _LOAD_COMMON_CONSTANT_r23 1325 +#define _LOAD_CONST_r01 1326 +#define _LOAD_CONST_r12 1327 +#define _LOAD_CONST_r23 1328 +#define _LOAD_CONST_INLINE_r01 1329 +#define _LOAD_CONST_INLINE_r12 1330 +#define _LOAD_CONST_INLINE_r23 1331 +#define _LOAD_CONST_INLINE_BORROW_r01 1332 +#define _LOAD_CONST_INLINE_BORROW_r12 1333 +#define _LOAD_CONST_INLINE_BORROW_r23 1334 +#define _LOAD_DEREF_r01 1335 +#define _LOAD_FAST_r01 1336 +#define _LOAD_FAST_r12 1337 +#define _LOAD_FAST_r23 1338 +#define _LOAD_FAST_0_r01 1339 +#define _LOAD_FAST_0_r12 1340 +#define _LOAD_FAST_0_r23 1341 +#define _LOAD_FAST_1_r01 1342 +#define _LOAD_FAST_1_r12 1343 +#define _LOAD_FAST_1_r23 1344 +#define _LOAD_FAST_2_r01 1345 +#define _LOAD_FAST_2_r12 1346 +#define _LOAD_FAST_2_r23 1347 +#define _LOAD_FAST_3_r01 1348 +#define _LOAD_FAST_3_r12 1349 +#define _LOAD_FAST_3_r23 1350 +#define _LOAD_FAST_4_r01 1351 +#define _LOAD_FAST_4_r12 1352 +#define _LOAD_FAST_4_r23 1353 +#define _LOAD_FAST_5_r01 1354 +#define _LOAD_FAST_5_r12 1355 +#define _LOAD_FAST_5_r23 1356 +#define _LOAD_FAST_6_r01 1357 +#define _LOAD_FAST_6_r12 1358 +#define _LOAD_FAST_6_r23 1359 +#define _LOAD_FAST_7_r01 1360 +#define _LOAD_FAST_7_r12 1361 +#define _LOAD_FAST_7_r23 1362 +#define _LOAD_FAST_AND_CLEAR_r01 1363 +#define _LOAD_FAST_AND_CLEAR_r12 1364 +#define _LOAD_FAST_AND_CLEAR_r23 1365 +#define _LOAD_FAST_BORROW_r01 1366 +#define _LOAD_FAST_BORROW_r12 1367 +#define _LOAD_FAST_BORROW_r23 1368 +#define _LOAD_FAST_BORROW_0_r01 1369 +#define _LOAD_FAST_BORROW_0_r12 1370 +#define _LOAD_FAST_BORROW_0_r23 1371 +#define _LOAD_FAST_BORROW_1_r01 1372 +#define _LOAD_FAST_BORROW_1_r12 1373 +#define _LOAD_FAST_BORROW_1_r23 1374 +#define _LOAD_FAST_BORROW_2_r01 1375 +#define _LOAD_FAST_BORROW_2_r12 1376 +#define _LOAD_FAST_BORROW_2_r23 1377 +#define _LOAD_FAST_BORROW_3_r01 1378 +#define _LOAD_FAST_BORROW_3_r12 1379 +#define _LOAD_FAST_BORROW_3_r23 1380 +#define _LOAD_FAST_BORROW_4_r01 1381 +#define _LOAD_FAST_BORROW_4_r12 1382 +#define _LOAD_FAST_BORROW_4_r23 1383 +#define _LOAD_FAST_BORROW_5_r01 1384 +#define _LOAD_FAST_BORROW_5_r12 1385 +#define _LOAD_FAST_BORROW_5_r23 1386 +#define _LOAD_FAST_BORROW_6_r01 1387 +#define _LOAD_FAST_BORROW_6_r12 1388 +#define _LOAD_FAST_BORROW_6_r23 1389 +#define _LOAD_FAST_BORROW_7_r01 1390 +#define _LOAD_FAST_BORROW_7_r12 1391 +#define _LOAD_FAST_BORROW_7_r23 1392 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1393 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1394 +#define _LOAD_FAST_CHECK_r01 1395 +#define _LOAD_FAST_CHECK_r12 1396 +#define _LOAD_FAST_CHECK_r23 1397 +#define _LOAD_FAST_LOAD_FAST_r02 1398 +#define _LOAD_FAST_LOAD_FAST_r13 1399 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1400 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1401 +#define _LOAD_GLOBAL_r00 1402 +#define _LOAD_GLOBAL_BUILTINS_r01 1403 +#define _LOAD_GLOBAL_MODULE_r01 1404 +#define _LOAD_LOCALS_r01 1405 +#define _LOAD_LOCALS_r12 1406 +#define _LOAD_LOCALS_r23 1407 +#define _LOAD_NAME_r01 1408 +#define _LOAD_SMALL_INT_r01 1409 +#define _LOAD_SMALL_INT_r12 1410 +#define _LOAD_SMALL_INT_r23 1411 +#define _LOAD_SMALL_INT_0_r01 1412 +#define _LOAD_SMALL_INT_0_r12 1413 +#define _LOAD_SMALL_INT_0_r23 1414 +#define _LOAD_SMALL_INT_1_r01 1415 +#define _LOAD_SMALL_INT_1_r12 1416 +#define _LOAD_SMALL_INT_1_r23 1417 +#define _LOAD_SMALL_INT_2_r01 1418 +#define _LOAD_SMALL_INT_2_r12 1419 +#define _LOAD_SMALL_INT_2_r23 1420 +#define _LOAD_SMALL_INT_3_r01 1421 +#define _LOAD_SMALL_INT_3_r12 1422 +#define _LOAD_SMALL_INT_3_r23 1423 +#define _LOAD_SPECIAL_r00 1424 +#define _LOAD_SUPER_ATTR_ATTR_r31 1425 +#define _LOAD_SUPER_ATTR_METHOD_r32 1426 +#define _LOCK_OBJECT_r01 1427 +#define _LOCK_OBJECT_r11 1428 +#define _LOCK_OBJECT_r22 1429 +#define _LOCK_OBJECT_r33 1430 +#define _MAKE_CALLARGS_A_TUPLE_r33 1431 +#define _MAKE_CELL_r00 1432 +#define _MAKE_FUNCTION_r12 1433 +#define _MAKE_HEAP_SAFE_r01 1434 +#define _MAKE_HEAP_SAFE_r11 1435 +#define _MAKE_HEAP_SAFE_r22 1436 +#define _MAKE_HEAP_SAFE_r33 1437 +#define _MAKE_WARM_r00 1438 +#define _MAKE_WARM_r11 1439 +#define _MAKE_WARM_r22 1440 +#define _MAKE_WARM_r33 1441 +#define _MAP_ADD_r20 1442 +#define _MATCH_CLASS_r33 1443 +#define _MATCH_KEYS_r23 1444 +#define _MATCH_MAPPING_r02 1445 +#define _MATCH_MAPPING_r12 1446 +#define _MATCH_MAPPING_r23 1447 +#define _MATCH_SEQUENCE_r02 1448 +#define _MATCH_SEQUENCE_r12 1449 +#define _MATCH_SEQUENCE_r23 1450 +#define _MAYBE_EXPAND_METHOD_r00 1451 +#define _MAYBE_EXPAND_METHOD_KW_r11 1452 +#define _MONITOR_CALL_r00 1453 +#define _MONITOR_CALL_KW_r11 1454 +#define _MONITOR_JUMP_BACKWARD_r00 1455 +#define _MONITOR_JUMP_BACKWARD_r11 1456 +#define _MONITOR_JUMP_BACKWARD_r22 1457 +#define _MONITOR_JUMP_BACKWARD_r33 1458 +#define _MONITOR_RESUME_r00 1459 +#define _NOP_r00 1460 +#define _NOP_r11 1461 +#define _NOP_r22 1462 +#define _NOP_r33 1463 +#define _POP_EXCEPT_r10 1464 +#define _POP_ITER_r20 1465 +#define _POP_JUMP_IF_FALSE_r00 1466 +#define _POP_JUMP_IF_FALSE_r10 1467 +#define _POP_JUMP_IF_FALSE_r21 1468 +#define _POP_JUMP_IF_FALSE_r32 1469 +#define _POP_JUMP_IF_TRUE_r00 1470 +#define _POP_JUMP_IF_TRUE_r10 1471 +#define _POP_JUMP_IF_TRUE_r21 1472 +#define _POP_JUMP_IF_TRUE_r32 1473 +#define _POP_TOP_r10 1474 +#define _POP_TOP_FLOAT_r00 1475 +#define _POP_TOP_FLOAT_r10 1476 +#define _POP_TOP_FLOAT_r21 1477 +#define _POP_TOP_FLOAT_r32 1478 +#define _POP_TOP_INT_r00 1479 +#define _POP_TOP_INT_r10 1480 +#define _POP_TOP_INT_r21 1481 +#define _POP_TOP_INT_r32 1482 +#define _POP_TOP_NOP_r00 1483 +#define _POP_TOP_NOP_r10 1484 +#define _POP_TOP_NOP_r21 1485 +#define _POP_TOP_NOP_r32 1486 +#define _POP_TOP_OPARG_r00 1487 +#define _POP_TOP_UNICODE_r00 1488 +#define _POP_TOP_UNICODE_r10 1489 +#define _POP_TOP_UNICODE_r21 1490 +#define _POP_TOP_UNICODE_r32 1491 +#define _PUSH_EXC_INFO_r02 1492 +#define _PUSH_EXC_INFO_r12 1493 +#define _PUSH_EXC_INFO_r23 1494 +#define _PUSH_FRAME_r10 1495 +#define _PUSH_NULL_r01 1496 +#define _PUSH_NULL_r12 1497 +#define _PUSH_NULL_r23 1498 +#define _PUSH_NULL_CONDITIONAL_r00 1499 +#define _PUSH_TAGGED_ZERO_r01 1500 +#define _PUSH_TAGGED_ZERO_r12 1501 +#define _PUSH_TAGGED_ZERO_r23 1502 +#define _PY_FRAME_EX_r31 1503 +#define _PY_FRAME_GENERAL_r01 1504 +#define _PY_FRAME_KW_r11 1505 +#define _REPLACE_WITH_TRUE_r02 1506 +#define _REPLACE_WITH_TRUE_r12 1507 +#define _REPLACE_WITH_TRUE_r23 1508 +#define _RESUME_CHECK_r00 1509 +#define _RESUME_CHECK_r11 1510 +#define _RESUME_CHECK_r22 1511 +#define _RESUME_CHECK_r33 1512 +#define _RETURN_GENERATOR_r01 1513 +#define _RETURN_VALUE_r11 1514 +#define _RROT_3_r03 1515 +#define _RROT_3_r13 1516 +#define _RROT_3_r23 1517 +#define _RROT_3_r33 1518 +#define _SAVE_RETURN_OFFSET_r00 1519 +#define _SAVE_RETURN_OFFSET_r11 1520 +#define _SAVE_RETURN_OFFSET_r22 1521 +#define _SAVE_RETURN_OFFSET_r33 1522 +#define _SEND_ASYNC_GEN_r33 1523 +#define _SEND_ASYNC_GEN_TIER_TWO_r33 1524 +#define _SEND_GEN_FRAME_r33 1525 +#define _SEND_VIRTUAL_r33 1526 +#define _SEND_VIRTUAL_TIER_TWO_r03 1527 +#define _SEND_VIRTUAL_TIER_TWO_r13 1528 +#define _SEND_VIRTUAL_TIER_TWO_r23 1529 +#define _SEND_VIRTUAL_TIER_TWO_r33 1530 +#define _SETUP_ANNOTATIONS_r00 1531 +#define _SET_ADD_r10 1532 +#define _SET_FUNCTION_ATTRIBUTE_r01 1533 +#define _SET_FUNCTION_ATTRIBUTE_r11 1534 +#define _SET_FUNCTION_ATTRIBUTE_r21 1535 +#define _SET_FUNCTION_ATTRIBUTE_r32 1536 +#define _SET_IP_r00 1537 +#define _SET_IP_r11 1538 +#define _SET_IP_r22 1539 +#define _SET_IP_r33 1540 +#define _SET_UPDATE_r11 1541 +#define _SPILL_OR_RELOAD_r01 1542 +#define _SPILL_OR_RELOAD_r02 1543 +#define _SPILL_OR_RELOAD_r03 1544 +#define _SPILL_OR_RELOAD_r10 1545 +#define _SPILL_OR_RELOAD_r12 1546 +#define _SPILL_OR_RELOAD_r13 1547 +#define _SPILL_OR_RELOAD_r20 1548 +#define _SPILL_OR_RELOAD_r21 1549 +#define _SPILL_OR_RELOAD_r23 1550 +#define _SPILL_OR_RELOAD_r30 1551 +#define _SPILL_OR_RELOAD_r31 1552 +#define _SPILL_OR_RELOAD_r32 1553 +#define _START_EXECUTOR_r00 1554 +#define _STORE_ATTR_r20 1555 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1556 +#define _STORE_ATTR_SLOT_r21 1557 +#define _STORE_ATTR_WITH_HINT_r21 1558 +#define _STORE_DEREF_r10 1559 +#define _STORE_FAST_LOAD_FAST_r11 1560 +#define _STORE_FAST_STORE_FAST_r20 1561 +#define _STORE_GLOBAL_r10 1562 +#define _STORE_NAME_r10 1563 +#define _STORE_SLICE_r30 1564 +#define _STORE_SUBSCR_r30 1565 +#define _STORE_SUBSCR_DICT_r31 1566 +#define _STORE_SUBSCR_DICT_KNOWN_HASH_r31 1567 +#define _STORE_SUBSCR_LIST_INT_r32 1568 +#define _SWAP_r11 1569 +#define _SWAP_2_r02 1570 +#define _SWAP_2_r12 1571 +#define _SWAP_2_r22 1572 +#define _SWAP_2_r33 1573 +#define _SWAP_3_r03 1574 +#define _SWAP_3_r13 1575 +#define _SWAP_3_r23 1576 +#define _SWAP_3_r33 1577 +#define _SWAP_FAST_r01 1578 +#define _SWAP_FAST_r11 1579 +#define _SWAP_FAST_r22 1580 +#define _SWAP_FAST_r33 1581 +#define _SWAP_FAST_0_r01 1582 +#define _SWAP_FAST_0_r11 1583 +#define _SWAP_FAST_0_r22 1584 +#define _SWAP_FAST_0_r33 1585 +#define _SWAP_FAST_1_r01 1586 +#define _SWAP_FAST_1_r11 1587 +#define _SWAP_FAST_1_r22 1588 +#define _SWAP_FAST_1_r33 1589 +#define _SWAP_FAST_2_r01 1590 +#define _SWAP_FAST_2_r11 1591 +#define _SWAP_FAST_2_r22 1592 +#define _SWAP_FAST_2_r33 1593 +#define _SWAP_FAST_3_r01 1594 +#define _SWAP_FAST_3_r11 1595 +#define _SWAP_FAST_3_r22 1596 +#define _SWAP_FAST_3_r33 1597 +#define _SWAP_FAST_4_r01 1598 +#define _SWAP_FAST_4_r11 1599 +#define _SWAP_FAST_4_r22 1600 +#define _SWAP_FAST_4_r33 1601 +#define _SWAP_FAST_5_r01 1602 +#define _SWAP_FAST_5_r11 1603 +#define _SWAP_FAST_5_r22 1604 +#define _SWAP_FAST_5_r33 1605 +#define _SWAP_FAST_6_r01 1606 +#define _SWAP_FAST_6_r11 1607 +#define _SWAP_FAST_6_r22 1608 +#define _SWAP_FAST_6_r33 1609 +#define _SWAP_FAST_7_r01 1610 +#define _SWAP_FAST_7_r11 1611 +#define _SWAP_FAST_7_r22 1612 +#define _SWAP_FAST_7_r33 1613 +#define _TIER2_RESUME_CHECK_r00 1614 +#define _TIER2_RESUME_CHECK_r11 1615 +#define _TIER2_RESUME_CHECK_r22 1616 +#define _TIER2_RESUME_CHECK_r33 1617 +#define _TO_BOOL_r11 1618 +#define _TO_BOOL_BOOL_r01 1619 +#define _TO_BOOL_BOOL_r11 1620 +#define _TO_BOOL_BOOL_r22 1621 +#define _TO_BOOL_BOOL_r33 1622 +#define _TO_BOOL_INT_r02 1623 +#define _TO_BOOL_INT_r12 1624 +#define _TO_BOOL_INT_r23 1625 +#define _TO_BOOL_LIST_r02 1626 +#define _TO_BOOL_LIST_r12 1627 +#define _TO_BOOL_LIST_r23 1628 +#define _TO_BOOL_NONE_r01 1629 +#define _TO_BOOL_NONE_r11 1630 +#define _TO_BOOL_NONE_r22 1631 +#define _TO_BOOL_NONE_r33 1632 +#define _TO_BOOL_STR_r02 1633 +#define _TO_BOOL_STR_r12 1634 +#define _TO_BOOL_STR_r23 1635 +#define _TRACE_RECORD_r00 1636 +#define _UNARY_INVERT_r12 1637 +#define _UNARY_NEGATIVE_r12 1638 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r02 1639 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r12 1640 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r23 1641 +#define _UNARY_NOT_r01 1642 +#define _UNARY_NOT_r11 1643 +#define _UNARY_NOT_r22 1644 +#define _UNARY_NOT_r33 1645 +#define _UNPACK_EX_r10 1646 +#define _UNPACK_SEQUENCE_r10 1647 +#define _UNPACK_SEQUENCE_LIST_r10 1648 +#define _UNPACK_SEQUENCE_TUPLE_r10 1649 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1650 +#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r03 1651 +#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r13 1652 +#define _UNPACK_SEQUENCE_UNIQUE_TUPLE_r10 1653 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r02 1654 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r12 1655 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r23 1656 +#define _WITH_EXCEPT_START_r33 1657 +#define _YIELD_VALUE_r11 1658 +#define MAX_UOP_REGS_ID 1658 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 688e6b0112b554..6713e9bc95f942 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -168,6 +168,11 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_GET_ANEXT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_GET_AWAITABLE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_SEND_GEN_FRAME] = HAS_ARG_FLAG | HAS_EXIT_FLAG, + [_GUARD_TOS_IS_NONE] = HAS_EXIT_FLAG, + [_GUARD_NOS_NOT_NULL] = HAS_EXIT_FLAG, + [_SEND_VIRTUAL_TIER_TWO] = HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG, + [_GUARD_3OS_ASYNC_GEN_ASEND] = HAS_EXIT_FLAG, + [_SEND_ASYNC_GEN_TIER_TWO] = HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_YIELD_VALUE] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG | HAS_NEEDS_GUARD_IP_FLAG, [_POP_EXCEPT] = HAS_ESCAPES_FLAG, [_LOAD_COMMON_CONSTANT] = HAS_ARG_FLAG, @@ -265,6 +270,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_GUARD_TYPE_ITER] = HAS_EXIT_FLAG, [_ITER_NEXT_INLINE] = HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_GUARD_NOS_ITER_VIRTUAL] = HAS_EXIT_FLAG, + [_GUARD_TOS_NOT_NULL] = HAS_EXIT_FLAG, [_FOR_ITER_VIRTUAL_TIER_TWO] = HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_ITER_CHECK_LIST] = HAS_EXIT_FLAG, [_GUARD_NOT_EXHAUSTED_LIST] = HAS_EXIT_FLAG, @@ -310,7 +316,6 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_INIT_CALL_PY_EXACT_ARGS] = HAS_ARG_FLAG | HAS_PURE_FLAG, [_PUSH_FRAME] = HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG, [_GUARD_NOS_NULL] = HAS_EXIT_FLAG, - [_GUARD_NOS_NOT_NULL] = HAS_EXIT_FLAG, [_GUARD_THIRD_NULL] = HAS_EXIT_FLAG, [_GUARD_CALLABLE_TYPE_1] = HAS_EXIT_FLAG, [_CALL_TYPE_1] = HAS_ARG_FLAG, @@ -1641,6 +1646,51 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _SEND_GEN_FRAME_r33 }, }, }, + [_GUARD_TOS_IS_NONE] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 1, 0, _GUARD_TOS_IS_NONE_r01 }, + { 1, 1, _GUARD_TOS_IS_NONE_r11 }, + { 2, 2, _GUARD_TOS_IS_NONE_r22 }, + { 3, 3, _GUARD_TOS_IS_NONE_r33 }, + }, + }, + [_GUARD_NOS_NOT_NULL] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 2, 0, _GUARD_NOS_NOT_NULL_r02 }, + { 2, 1, _GUARD_NOS_NOT_NULL_r12 }, + { 2, 2, _GUARD_NOS_NOT_NULL_r22 }, + { 3, 3, _GUARD_NOS_NOT_NULL_r33 }, + }, + }, + [_SEND_VIRTUAL_TIER_TWO] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 3, 0, _SEND_VIRTUAL_TIER_TWO_r03 }, + { 3, 1, _SEND_VIRTUAL_TIER_TWO_r13 }, + { 3, 2, _SEND_VIRTUAL_TIER_TWO_r23 }, + { 3, 3, _SEND_VIRTUAL_TIER_TWO_r33 }, + }, + }, + [_GUARD_3OS_ASYNC_GEN_ASEND] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 3, 0, _GUARD_3OS_ASYNC_GEN_ASEND_r03 }, + { 3, 1, _GUARD_3OS_ASYNC_GEN_ASEND_r13 }, + { 3, 2, _GUARD_3OS_ASYNC_GEN_ASEND_r23 }, + { 3, 3, _GUARD_3OS_ASYNC_GEN_ASEND_r33 }, + }, + }, + [_SEND_ASYNC_GEN_TIER_TWO] = { + .best = { 3, 3, 3, 3 }, + .entries = { + { -1, -1, -1 }, + { -1, -1, -1 }, + { -1, -1, -1 }, + { 3, 3, _SEND_ASYNC_GEN_TIER_TWO_r33 }, + }, + }, [_YIELD_VALUE] = { .best = { 1, 1, 1, 1 }, .entries = { @@ -2514,6 +2564,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _GUARD_NOS_ITER_VIRTUAL_r33 }, }, }, + [_GUARD_TOS_NOT_NULL] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 1, 0, _GUARD_TOS_NOT_NULL_r01 }, + { 1, 1, _GUARD_TOS_NOT_NULL_r11 }, + { 2, 2, _GUARD_TOS_NOT_NULL_r22 }, + { 3, 3, _GUARD_TOS_NOT_NULL_r33 }, + }, + }, [_FOR_ITER_VIRTUAL_TIER_TWO] = { .best = { 2, 2, 2, 2 }, .entries = { @@ -2919,15 +2978,6 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _GUARD_NOS_NULL_r33 }, }, }, - [_GUARD_NOS_NOT_NULL] = { - .best = { 0, 1, 2, 3 }, - .entries = { - { 2, 0, _GUARD_NOS_NOT_NULL_r02 }, - { 2, 1, _GUARD_NOS_NOT_NULL_r12 }, - { 2, 2, _GUARD_NOS_NOT_NULL_r22 }, - { 3, 3, _GUARD_NOS_NOT_NULL_r33 }, - }, - }, [_GUARD_THIRD_NULL] = { .best = { 0, 1, 2, 3 }, .entries = { @@ -4252,6 +4302,23 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GET_ANEXT_r12] = _GET_ANEXT, [_GET_AWAITABLE_r11] = _GET_AWAITABLE, [_SEND_GEN_FRAME_r33] = _SEND_GEN_FRAME, + [_GUARD_TOS_IS_NONE_r01] = _GUARD_TOS_IS_NONE, + [_GUARD_TOS_IS_NONE_r11] = _GUARD_TOS_IS_NONE, + [_GUARD_TOS_IS_NONE_r22] = _GUARD_TOS_IS_NONE, + [_GUARD_TOS_IS_NONE_r33] = _GUARD_TOS_IS_NONE, + [_GUARD_NOS_NOT_NULL_r02] = _GUARD_NOS_NOT_NULL, + [_GUARD_NOS_NOT_NULL_r12] = _GUARD_NOS_NOT_NULL, + [_GUARD_NOS_NOT_NULL_r22] = _GUARD_NOS_NOT_NULL, + [_GUARD_NOS_NOT_NULL_r33] = _GUARD_NOS_NOT_NULL, + [_SEND_VIRTUAL_TIER_TWO_r03] = _SEND_VIRTUAL_TIER_TWO, + [_SEND_VIRTUAL_TIER_TWO_r13] = _SEND_VIRTUAL_TIER_TWO, + [_SEND_VIRTUAL_TIER_TWO_r23] = _SEND_VIRTUAL_TIER_TWO, + [_SEND_VIRTUAL_TIER_TWO_r33] = _SEND_VIRTUAL_TIER_TWO, + [_GUARD_3OS_ASYNC_GEN_ASEND_r03] = _GUARD_3OS_ASYNC_GEN_ASEND, + [_GUARD_3OS_ASYNC_GEN_ASEND_r13] = _GUARD_3OS_ASYNC_GEN_ASEND, + [_GUARD_3OS_ASYNC_GEN_ASEND_r23] = _GUARD_3OS_ASYNC_GEN_ASEND, + [_GUARD_3OS_ASYNC_GEN_ASEND_r33] = _GUARD_3OS_ASYNC_GEN_ASEND, + [_SEND_ASYNC_GEN_TIER_TWO_r33] = _SEND_ASYNC_GEN_TIER_TWO, [_YIELD_VALUE_r11] = _YIELD_VALUE, [_POP_EXCEPT_r10] = _POP_EXCEPT, [_LOAD_COMMON_CONSTANT_r01] = _LOAD_COMMON_CONSTANT, @@ -4427,6 +4494,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GUARD_NOS_ITER_VIRTUAL_r12] = _GUARD_NOS_ITER_VIRTUAL, [_GUARD_NOS_ITER_VIRTUAL_r22] = _GUARD_NOS_ITER_VIRTUAL, [_GUARD_NOS_ITER_VIRTUAL_r33] = _GUARD_NOS_ITER_VIRTUAL, + [_GUARD_TOS_NOT_NULL_r01] = _GUARD_TOS_NOT_NULL, + [_GUARD_TOS_NOT_NULL_r11] = _GUARD_TOS_NOT_NULL, + [_GUARD_TOS_NOT_NULL_r22] = _GUARD_TOS_NOT_NULL, + [_GUARD_TOS_NOT_NULL_r33] = _GUARD_TOS_NOT_NULL, [_FOR_ITER_VIRTUAL_TIER_TWO_r23] = _FOR_ITER_VIRTUAL_TIER_TWO, [_ITER_CHECK_LIST_r02] = _ITER_CHECK_LIST, [_ITER_CHECK_LIST_r12] = _ITER_CHECK_LIST, @@ -4525,10 +4596,6 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GUARD_NOS_NULL_r12] = _GUARD_NOS_NULL, [_GUARD_NOS_NULL_r22] = _GUARD_NOS_NULL, [_GUARD_NOS_NULL_r33] = _GUARD_NOS_NULL, - [_GUARD_NOS_NOT_NULL_r02] = _GUARD_NOS_NOT_NULL, - [_GUARD_NOS_NOT_NULL_r12] = _GUARD_NOS_NOT_NULL, - [_GUARD_NOS_NOT_NULL_r22] = _GUARD_NOS_NOT_NULL, - [_GUARD_NOS_NOT_NULL_r33] = _GUARD_NOS_NOT_NULL, [_GUARD_THIRD_NULL_r03] = _GUARD_THIRD_NULL, [_GUARD_THIRD_NULL_r13] = _GUARD_THIRD_NULL, [_GUARD_THIRD_NULL_r23] = _GUARD_THIRD_NULL, @@ -5206,6 +5273,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_GET_ITER_TRAD_r12] = "_GET_ITER_TRAD_r12", [_GET_LEN] = "_GET_LEN", [_GET_LEN_r12] = "_GET_LEN_r12", + [_GUARD_3OS_ASYNC_GEN_ASEND] = "_GUARD_3OS_ASYNC_GEN_ASEND", + [_GUARD_3OS_ASYNC_GEN_ASEND_r03] = "_GUARD_3OS_ASYNC_GEN_ASEND_r03", + [_GUARD_3OS_ASYNC_GEN_ASEND_r13] = "_GUARD_3OS_ASYNC_GEN_ASEND_r13", + [_GUARD_3OS_ASYNC_GEN_ASEND_r23] = "_GUARD_3OS_ASYNC_GEN_ASEND_r23", + [_GUARD_3OS_ASYNC_GEN_ASEND_r33] = "_GUARD_3OS_ASYNC_GEN_ASEND_r33", [_GUARD_BINARY_OP_EXTEND] = "_GUARD_BINARY_OP_EXTEND", [_GUARD_BINARY_OP_EXTEND_r22] = "_GUARD_BINARY_OP_EXTEND_r22", [_GUARD_BINARY_OP_EXTEND_LHS] = "_GUARD_BINARY_OP_EXTEND_LHS", @@ -5531,11 +5603,21 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_GUARD_TOS_INT_r11] = "_GUARD_TOS_INT_r11", [_GUARD_TOS_INT_r22] = "_GUARD_TOS_INT_r22", [_GUARD_TOS_INT_r33] = "_GUARD_TOS_INT_r33", + [_GUARD_TOS_IS_NONE] = "_GUARD_TOS_IS_NONE", + [_GUARD_TOS_IS_NONE_r01] = "_GUARD_TOS_IS_NONE_r01", + [_GUARD_TOS_IS_NONE_r11] = "_GUARD_TOS_IS_NONE_r11", + [_GUARD_TOS_IS_NONE_r22] = "_GUARD_TOS_IS_NONE_r22", + [_GUARD_TOS_IS_NONE_r33] = "_GUARD_TOS_IS_NONE_r33", [_GUARD_TOS_LIST] = "_GUARD_TOS_LIST", [_GUARD_TOS_LIST_r01] = "_GUARD_TOS_LIST_r01", [_GUARD_TOS_LIST_r11] = "_GUARD_TOS_LIST_r11", [_GUARD_TOS_LIST_r22] = "_GUARD_TOS_LIST_r22", [_GUARD_TOS_LIST_r33] = "_GUARD_TOS_LIST_r33", + [_GUARD_TOS_NOT_NULL] = "_GUARD_TOS_NOT_NULL", + [_GUARD_TOS_NOT_NULL_r01] = "_GUARD_TOS_NOT_NULL_r01", + [_GUARD_TOS_NOT_NULL_r11] = "_GUARD_TOS_NOT_NULL_r11", + [_GUARD_TOS_NOT_NULL_r22] = "_GUARD_TOS_NOT_NULL_r22", + [_GUARD_TOS_NOT_NULL_r33] = "_GUARD_TOS_NOT_NULL_r33", [_GUARD_TOS_OVERFLOWED] = "_GUARD_TOS_OVERFLOWED", [_GUARD_TOS_OVERFLOWED_r01] = "_GUARD_TOS_OVERFLOWED_r01", [_GUARD_TOS_OVERFLOWED_r11] = "_GUARD_TOS_OVERFLOWED_r11", @@ -5952,8 +6034,15 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_SAVE_RETURN_OFFSET_r11] = "_SAVE_RETURN_OFFSET_r11", [_SAVE_RETURN_OFFSET_r22] = "_SAVE_RETURN_OFFSET_r22", [_SAVE_RETURN_OFFSET_r33] = "_SAVE_RETURN_OFFSET_r33", + [_SEND_ASYNC_GEN_TIER_TWO] = "_SEND_ASYNC_GEN_TIER_TWO", + [_SEND_ASYNC_GEN_TIER_TWO_r33] = "_SEND_ASYNC_GEN_TIER_TWO_r33", [_SEND_GEN_FRAME] = "_SEND_GEN_FRAME", [_SEND_GEN_FRAME_r33] = "_SEND_GEN_FRAME_r33", + [_SEND_VIRTUAL_TIER_TWO] = "_SEND_VIRTUAL_TIER_TWO", + [_SEND_VIRTUAL_TIER_TWO_r03] = "_SEND_VIRTUAL_TIER_TWO_r03", + [_SEND_VIRTUAL_TIER_TWO_r13] = "_SEND_VIRTUAL_TIER_TWO_r13", + [_SEND_VIRTUAL_TIER_TWO_r23] = "_SEND_VIRTUAL_TIER_TWO_r23", + [_SEND_VIRTUAL_TIER_TWO_r33] = "_SEND_VIRTUAL_TIER_TWO_r33", [_SETUP_ANNOTATIONS] = "_SETUP_ANNOTATIONS", [_SETUP_ANNOTATIONS_r00] = "_SETUP_ANNOTATIONS_r00", [_SET_ADD] = "_SET_ADD", @@ -6401,6 +6490,16 @@ int _PyUop_num_popped(int opcode, int oparg) return 1; case _SEND_GEN_FRAME: return 1; + case _GUARD_TOS_IS_NONE: + return 0; + case _GUARD_NOS_NOT_NULL: + return 0; + case _SEND_VIRTUAL_TIER_TWO: + return 1; + case _GUARD_3OS_ASYNC_GEN_ASEND: + return 0; + case _SEND_ASYNC_GEN_TIER_TWO: + return 3; case _YIELD_VALUE: return 1; case _POP_EXCEPT: @@ -6595,6 +6694,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _GUARD_NOS_ITER_VIRTUAL: return 0; + case _GUARD_TOS_NOT_NULL: + return 0; case _FOR_ITER_VIRTUAL_TIER_TWO: return 0; case _ITER_CHECK_LIST: @@ -6685,8 +6786,6 @@ int _PyUop_num_popped(int opcode, int oparg) return 1; case _GUARD_NOS_NULL: return 0; - case _GUARD_NOS_NOT_NULL: - return 0; case _GUARD_THIRD_NULL: return 0; case _GUARD_CALLABLE_TYPE_1: diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h index 53a7eaf0de57eb..758542720acf31 100644 --- a/Include/opcode_ids.h +++ b/Include/opcode_ids.h @@ -204,21 +204,23 @@ extern "C" { #define LOAD_SUPER_ATTR_METHOD 199 #define RESUME_CHECK 200 #define RESUME_CHECK_JIT 201 -#define SEND_GEN 202 -#define STORE_ATTR_INSTANCE_VALUE 203 -#define STORE_ATTR_SLOT 204 -#define STORE_ATTR_WITH_HINT 205 -#define STORE_SUBSCR_DICT 206 -#define STORE_SUBSCR_LIST_INT 207 -#define TO_BOOL_ALWAYS_TRUE 208 -#define TO_BOOL_BOOL 209 -#define TO_BOOL_INT 210 -#define TO_BOOL_LIST 211 -#define TO_BOOL_NONE 212 -#define TO_BOOL_STR 213 -#define UNPACK_SEQUENCE_LIST 214 -#define UNPACK_SEQUENCE_TUPLE 215 -#define UNPACK_SEQUENCE_TWO_TUPLE 216 +#define SEND_ASYNC_GEN 202 +#define SEND_GEN 203 +#define SEND_VIRTUAL 204 +#define STORE_ATTR_INSTANCE_VALUE 205 +#define STORE_ATTR_SLOT 206 +#define STORE_ATTR_WITH_HINT 207 +#define STORE_SUBSCR_DICT 208 +#define STORE_SUBSCR_LIST_INT 209 +#define TO_BOOL_ALWAYS_TRUE 210 +#define TO_BOOL_BOOL 211 +#define TO_BOOL_INT 212 +#define TO_BOOL_LIST 213 +#define TO_BOOL_NONE 214 +#define TO_BOOL_STR 215 +#define UNPACK_SEQUENCE_LIST 216 +#define UNPACK_SEQUENCE_TUPLE 217 +#define UNPACK_SEQUENCE_TWO_TUPLE 218 #define INSTRUMENTED_END_FOR 233 #define INSTRUMENTED_POP_ITER 234 #define INSTRUMENTED_END_SEND 235 diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py index 6b5357a3151190..183d0af30acf43 100644 --- a/Lib/_opcode_metadata.py +++ b/Lib/_opcode_metadata.py @@ -39,6 +39,8 @@ ), SEND=( "SEND_GEN", + "SEND_VIRTUAL", + "SEND_ASYNC_GEN", ), UNPACK_SEQUENCE=( "UNPACK_SEQUENCE_TWO_TUPLE", @@ -205,21 +207,23 @@ LOAD_SUPER_ATTR_METHOD=199, RESUME_CHECK=200, RESUME_CHECK_JIT=201, - SEND_GEN=202, - STORE_ATTR_INSTANCE_VALUE=203, - STORE_ATTR_SLOT=204, - STORE_ATTR_WITH_HINT=205, - STORE_SUBSCR_DICT=206, - STORE_SUBSCR_LIST_INT=207, - TO_BOOL_ALWAYS_TRUE=208, - TO_BOOL_BOOL=209, - TO_BOOL_INT=210, - TO_BOOL_LIST=211, - TO_BOOL_NONE=212, - TO_BOOL_STR=213, - UNPACK_SEQUENCE_LIST=214, - UNPACK_SEQUENCE_TUPLE=215, - UNPACK_SEQUENCE_TWO_TUPLE=216, + SEND_ASYNC_GEN=202, + SEND_GEN=203, + SEND_VIRTUAL=204, + STORE_ATTR_INSTANCE_VALUE=205, + STORE_ATTR_SLOT=206, + STORE_ATTR_WITH_HINT=207, + STORE_SUBSCR_DICT=208, + STORE_SUBSCR_LIST_INT=209, + TO_BOOL_ALWAYS_TRUE=210, + TO_BOOL_BOOL=211, + TO_BOOL_INT=212, + TO_BOOL_LIST=213, + TO_BOOL_NONE=214, + TO_BOOL_STR=215, + UNPACK_SEQUENCE_LIST=216, + UNPACK_SEQUENCE_TUPLE=217, + UNPACK_SEQUENCE_TWO_TUPLE=218, ) opmap = frozendict( diff --git a/Lib/difflib.py b/Lib/difflib.py index 8f3cdaed9564d8..eb249e3e288923 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -559,15 +559,17 @@ def get_grouped_opcodes(self, n=3): >>> b[23:28] = [] # Make a deletion >>> b[30] += 'y' # Make another replacement >>> pprint(list(SequenceMatcher(None,a,b).get_grouped_opcodes())) - [[('equal', 5, 8, 5, 8), ('insert', 8, 8, 8, 9), ('equal', 8, 11, 9, 12)], - [('equal', 16, 19, 17, 20), - ('replace', 19, 20, 20, 21), - ('equal', 20, 22, 21, 23), - ('delete', 22, 27, 23, 23), - ('equal', 27, 30, 23, 26)], - [('equal', 31, 34, 27, 30), - ('replace', 34, 35, 30, 31), - ('equal', 35, 38, 31, 34)]] + [ + [('equal', 5, 8, 5, 8), ('insert', 8, 8, 8, 9), ('equal', 8, 11, 9, 12)], + [ + ('equal', 16, 19, 17, 20), + ('replace', 19, 20, 20, 21), + ('equal', 20, 22, 21, 23), + ('delete', 22, 27, 23, 23), + ('equal', 27, 30, 23, 26), + ], + [('equal', 31, 34, 27, 30), ('replace', 34, 35, 30, 31), ('equal', 35, 38, 31, 34)], + ] """ codes = self.get_opcodes() @@ -784,16 +786,18 @@ class Differ: >>> from pprint import pprint as _pprint >>> _pprint(result) - [' 1. Beautiful is better than ugly.\n', - '- 2. Explicit is better than implicit.\n', - '- 3. Simple is better than complex.\n', - '+ 3. Simple is better than complex.\n', - '? ++\n', - '- 4. Complex is better than complicated.\n', - '? ^ ---- ^\n', - '+ 4. Complicated is better than complex.\n', - '? ++++ ^ ^\n', - '+ 5. Flat is better than nested.\n'] + [ + ' 1. Beautiful is better than ugly.\n', + '- 2. Explicit is better than implicit.\n', + '- 3. Simple is better than complex.\n', + '+ 3. Simple is better than complex.\n', + '? ++\n', + '- 4. Complex is better than complicated.\n', + '? ^ ---- ^\n', + '+ 4. Complicated is better than complex.\n', + '? ++++ ^ ^\n', + '+ 5. Flat is better than nested.\n', + ] As a single multi-line string it looks like this: diff --git a/Lib/pathlib/__init__.py b/Lib/pathlib/__init__.py index 44f967eb12dd4f..a32e4b5320ff6d 100644 --- a/Lib/pathlib/__init__.py +++ b/Lib/pathlib/__init__.py @@ -12,12 +12,13 @@ import posixpath import sys from errno import * -from glob import _StringGlobber, _no_recurse_symlinks from itertools import chain from stat import ( S_IMODE, S_ISDIR, S_ISREG, S_ISLNK, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO, ) from _collections_abc import Sequence +lazy import shutil +lazy from glob import _StringGlobber, _no_recurse_symlinks try: import pwd @@ -1255,8 +1256,6 @@ def _delete(self): if self.is_symlink() or self.is_junction(): self.unlink() elif self.is_dir(): - # Lazy import to improve module import time - import shutil shutil.rmtree(self) else: self.unlink() diff --git a/Lib/pprint.py b/Lib/pprint.py index 7355021998081d..1fd7e3ec95a073 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -43,23 +43,38 @@ "PrettyPrinter", "pp"] -def pprint(object, stream=None, indent=1, width=80, depth=None, *, - compact=False, expand=False, sort_dicts=True, - underscore_numbers=False): +def pprint( + object, + stream=None, + indent=4, + width=88, + depth=None, + *, + compact=False, + sort_dicts=True, + underscore_numbers=False, +): """Pretty-print a Python object to a stream [default is sys.stdout].""" printer = PrettyPrinter( stream=stream, indent=indent, width=width, depth=depth, - compact=compact, expand=expand, sort_dicts=sort_dicts, + compact=compact, sort_dicts=sort_dicts, underscore_numbers=underscore_numbers) printer.pprint(object) -def pformat(object, indent=1, width=80, depth=None, *, - compact=False, expand=False, sort_dicts=True, - underscore_numbers=False): +def pformat( + object, + indent=4, + width=88, + depth=None, + *, + compact=False, + sort_dicts=True, + underscore_numbers=False, +): """Format a Python object into a pretty-printed representation.""" return PrettyPrinter(indent=indent, width=width, depth=depth, - compact=compact, expand=expand, sort_dicts=sort_dicts, + compact=compact, sort_dicts=sort_dicts, underscore_numbers=underscore_numbers).pformat(object) @@ -112,9 +127,17 @@ def _safe_tuple(t): class PrettyPrinter: - def __init__(self, indent=1, width=80, depth=None, stream=None, *, - compact=False, expand=False, sort_dicts=True, - underscore_numbers=False): + def __init__( + self, + indent=4, + width=88, + depth=None, + stream=None, + *, + compact=False, + sort_dicts=True, + underscore_numbers=False, + ): """Handle pretty printing operations onto a stream using a set of configured parameters. @@ -133,12 +156,6 @@ def __init__(self, indent=1, width=80, depth=None, stream=None, *, compact If true, several items will be combined in one line. - Incompatible with expand mode. - - expand - If true, the output will be formatted similar to - pretty-printed json.dumps() when ``indent`` is supplied. - Incompatible with compact mode. sort_dicts If true, dict keys are sorted. @@ -155,8 +172,6 @@ def __init__(self, indent=1, width=80, depth=None, stream=None, *, raise ValueError('depth must be > 0') if not width: raise ValueError('width must be != 0') - if compact and expand: - raise ValueError('compact and expand are incompatible') self._depth = depth self._indent_per_level = indent self._width = width @@ -165,7 +180,6 @@ def __init__(self, indent=1, width=80, depth=None, stream=None, *, else: self._stream = _sys.stdout self._compact = bool(compact) - self._expand = bool(expand) self._sort_dicts = sort_dicts self._underscore_numbers = underscore_numbers @@ -218,36 +232,36 @@ def _format(self, object, stream, indent, allowance, context, level): stream.write(rep) def _format_block_start(self, start_str, indent): - if self._expand: - return f"{start_str}\n{' ' * indent}" - return start_str + if self._compact: + return start_str + return f"{start_str}\n{' ' * indent}" def _format_block_end(self, end_str, indent): - if self._expand: - return f"\n{' ' * indent}{end_str}" - return end_str + if self._compact: + return end_str + return f"\n{' ' * indent}{end_str}" def _child_indent(self, indent, prefix_len): - if self._expand: - return indent - return indent + prefix_len + if self._compact: + return indent + prefix_len + return indent def _write_indent_padding(self, write): - if self._expand: - if self._indent_per_level > 0: - write(self._indent_per_level * " ") - elif self._indent_per_level > 1: - write((self._indent_per_level - 1) * " ") + if self._compact: + if self._indent_per_level > 1: + write((self._indent_per_level - 1) * " ") + elif self._indent_per_level > 0: + write(self._indent_per_level * " ") def _pprint_dataclass(self, object, stream, indent, allowance, context, level): # Lazy import to improve module import time from dataclasses import fields as dataclass_fields cls_name = object.__class__.__name__ - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += len(cls_name) + 1 + else: + indent += self._indent_per_level items = [(f.name, getattr(object, f.name)) for f in dataclass_fields(object) if f.repr] stream.write(self._format_block_start(cls_name + '(', indent)) self._format_namespace_items(items, stream, indent, allowance, context, level) @@ -370,7 +384,7 @@ def _pprint_list(self, object, stream, indent, allowance, context, level): def _pprint_tuple(self, object, stream, indent, allowance, context, level): stream.write(self._format_block_start('(', indent)) - if len(object) == 1 and not self._expand: + if len(object) == 1 and self._compact: endchar = ',)' else: endchar = ')' @@ -391,7 +405,7 @@ def _pprint_set(self, object, stream, indent, allowance, context, level): else: stream.write(self._format_block_start(typ.__name__ + '({', indent)) endchar = '})' - if not self._expand: + if self._compact: indent += len(typ.__name__) + 1 object = sorted(object, key=_safe_key) self._format_items(object, stream, indent, allowance + len(endchar), @@ -409,10 +423,10 @@ def _pprint_str(self, object, stream, indent, allowance, context, level): chunks = [] lines = object.splitlines(True) if level == 1: - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += 1 + else: + indent += self._indent_per_level allowance += 1 max_width1 = max_width = self._width - indent for i, line in enumerate(lines): @@ -465,10 +479,10 @@ def _pprint_bytes(self, object, stream, indent, allowance, context, level): return parens = level == 1 if parens: - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += 1 + else: + indent += self._indent_per_level allowance += 1 write(self._format_block_start('(', indent)) delim = '' @@ -485,11 +499,11 @@ def _pprint_bytes(self, object, stream, indent, allowance, context, level): def _pprint_bytearray(self, object, stream, indent, allowance, context, level): write = stream.write write(self._format_block_start('bytearray(', indent)) - if self._expand: + if self._compact: + recursive_indent = indent + 10 + else: write(' ' * self._indent_per_level) recursive_indent = indent + self._indent_per_level - else: - recursive_indent = indent + 10 self._pprint_bytes(bytes(object), stream, recursive_indent, allowance + 1, context, level + 1) write(self._format_block_end(')', indent)) @@ -517,10 +531,10 @@ def _pprint_simplenamespace(self, object, stream, indent, allowance, context, le cls_name = 'namespace' else: cls_name = object.__class__.__name__ - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += len(cls_name) + 1 + else: + indent += self._indent_per_level items = object.__dict__.items() stream.write(self._format_block_start(cls_name + '(', indent)) self._format_namespace_items(items, stream, indent, allowance, context, @@ -550,7 +564,7 @@ def _format_dict_items(self, items, stream, indent, allowance, context, ) if not last: write(delimnl) - elif self._expand: + elif not self._compact: write(',') def _format_namespace_items(self, items, stream, indent, allowance, context, level): @@ -576,7 +590,7 @@ def _format_namespace_items(self, items, stream, indent, allowance, context, lev ) if not last: write(delimnl) - elif self._expand: + elif not self._compact: write(',') def _format_items(self, items, stream, indent, allowance, context, level): @@ -618,7 +632,7 @@ def _format_items(self, items, stream, indent, allowance, context, level): self._format(ent, stream, indent, allowance if last else 1, context, level) - if last and self._expand: + if last and not self._compact: write(',') def _repr(self, object, context, level): @@ -643,11 +657,11 @@ def _pprint_default_dict(self, object, stream, indent, allowance, context, level return rdf = self._repr(object.default_factory, context, level) cls = object.__class__ - if self._expand: - stream.write('%s(%s, ' % (cls.__name__, rdf)) - else: + if self._compact: indent += len(cls.__name__) + 1 stream.write('%s(%s,\n%s' % (cls.__name__, rdf, ' ' * indent)) + else: + stream.write('%s(%s, ' % (cls.__name__, rdf)) self._pprint_dict(object, stream, indent, allowance + 1, context, level) stream.write(')') @@ -681,14 +695,14 @@ def _pprint_chain_map(self, object, stream, indent, allowance, context, level): cls = object.__class__ stream.write(self._format_block_start(cls.__name__ + '(', indent + self._indent_per_level)) - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += len(cls.__name__) + 1 + else: + indent += self._indent_per_level for i, m in enumerate(object.maps): if i == len(object.maps) - 1: self._format(m, stream, indent, allowance + 1, context, level) - if self._expand: + if not self._compact: stream.write(',') stream.write(self._format_block_end(')', indent - self._indent_per_level)) else: @@ -703,7 +717,7 @@ def _pprint_deque(self, object, stream, indent, allowance, context, level): return cls = object.__class__ stream.write(self._format_block_start(cls.__name__ + '([', indent)) - if not self._expand: + if self._compact: indent += len(cls.__name__) + 1 if object.maxlen is None: self._format_items(object, stream, indent, allowance + 2, @@ -713,10 +727,10 @@ def _pprint_deque(self, object, stream, indent, allowance, context, level): self._format_items(object, stream, indent, 2, context, level) rml = self._repr(object.maxlen, context, level) - if self._expand: - stream.write('%s], maxlen=%s)' % ('\n' + ' ' * indent, rml)) - else: + if self._compact: stream.write('],\n%smaxlen=%s)' % (' ' * indent, rml)) + else: + stream.write('%s], maxlen=%s)' % ('\n' + ' ' * indent, rml)) _dispatch[_collections.deque.__repr__] = _pprint_deque @@ -737,10 +751,10 @@ def _pprint_user_string(self, object, stream, indent, allowance, context, level) def _pprint_template(self, object, stream, indent, allowance, context, level): cls_name = object.__class__.__name__ - if self._expand: - indent += self._indent_per_level - else: + if self._compact: indent += len(cls_name) + 1 + else: + indent += self._indent_per_level items = ( ("strings", object.strings), @@ -756,7 +770,20 @@ def _pprint_template(self, object, stream, indent, allowance, context, level): def _pprint_interpolation(self, object, stream, indent, allowance, context, level): cls_name = object.__class__.__name__ - if self._expand: + if self._compact: + indent += len(cls_name) + items = ( + object.value, + object.expression, + object.conversion, + object.format_spec, + ) + stream.write(cls_name + "(") + self._format_items( + items, stream, indent, allowance, context, level + ) + stream.write(")") + else: indent += self._indent_per_level items = ( ("value", object.value), @@ -771,19 +798,6 @@ def _pprint_interpolation(self, object, stream, indent, allowance, context, leve stream.write( self._format_block_end(")", indent - self._indent_per_level) ) - else: - indent += len(cls_name) - items = ( - object.value, - object.expression, - object.conversion, - object.format_spec, - ) - stream.write(cls_name + "(") - self._format_items( - items, stream, indent, allowance, context, level - ) - stream.write(")") t = t"{0}" _dispatch[type(t).__repr__] = _pprint_template diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 6c2e33b27951ca..d80fec9a8a0d2b 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -5524,6 +5524,24 @@ def testfunc(n): # _POP_TOP_NOP is a sign the optimizer ran and didn't hit bottom. self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 1) + def test_send_virtual(self): + + def send_list(n): + yield from list(range(n)) + def testfunc(n): + for _ in send_list(n): + pass + + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): + # Ensure SEND is specialized to SEND_VIRTUAL + send_list(10) + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD*2) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + + self.assertIn("_FOR_ITER_GEN_FRAME", uops) + self.assertIn("_SEND_VIRTUAL_TIER_TWO", uops) + def test_binary_op_subscr_init_frame(self): class B: def __getitem__(self, other): diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index 828440a993a975..425fb85e93558d 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -168,54 +168,56 @@ def merge(self, other): >>> import pprint >>> pprint.pprint(dir(list)) # like list.__dict__.keys(), but sorted - ['__add__', - '__class__', - '__class_getitem__', - '__contains__', - '__delattr__', - '__delitem__', - '__dir__', - '__doc__', - '__eq__', - '__format__', - '__ge__', - '__getattribute__', - '__getitem__', - '__getstate__', - '__gt__', - '__hash__', - '__iadd__', - '__imul__', - '__init__', - '__init_subclass__', - '__iter__', - '__le__', - '__len__', - '__lt__', - '__mul__', - '__ne__', - '__new__', - '__reduce__', - '__reduce_ex__', - '__repr__', - '__reversed__', - '__rmul__', - '__setattr__', - '__setitem__', - '__sizeof__', - '__str__', - '__subclasshook__', - 'append', - 'clear', - 'copy', - 'count', - 'extend', - 'index', - 'insert', - 'pop', - 'remove', - 'reverse', - 'sort'] + [ + '__add__', + '__class__', + '__class_getitem__', + '__contains__', + '__delattr__', + '__delitem__', + '__dir__', + '__doc__', + '__eq__', + '__format__', + '__ge__', + '__getattribute__', + '__getitem__', + '__getstate__', + '__gt__', + '__hash__', + '__iadd__', + '__imul__', + '__init__', + '__init_subclass__', + '__iter__', + '__le__', + '__len__', + '__lt__', + '__mul__', + '__ne__', + '__new__', + '__reduce__', + '__reduce_ex__', + '__repr__', + '__reversed__', + '__rmul__', + '__setattr__', + '__setitem__', + '__sizeof__', + '__str__', + '__subclasshook__', + 'append', + 'clear', + 'copy', + 'count', + 'extend', + 'index', + 'insert', + 'pop', + 'remove', + 'reverse', + 'sort', + ] The new introspection API gives more information than the old one: in addition to the regular methods, it also shows the methods that are diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py index 9480bf8b87baf3..bd97b0b4d61474 100644 --- a/Lib/test/test_opcache.py +++ b/Lib/test/test_opcache.py @@ -1637,6 +1637,37 @@ def send_yield_from(): self.assert_specialized(send_yield_from, "SEND_GEN") self.assert_no_opcode(send_yield_from, "SEND") + @cpython_only + @requires_specialization + def test_send_yield_from_iter(self): + L = list(range(100)) + def send_yield_from(): + yield from L + + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): + list(send_yield_from()) + + self.assert_specialized(send_yield_from, "SEND_VIRTUAL") + self.assert_no_opcode(send_yield_from, "SEND") + + @cpython_only + @requires_specialization + def test_send_async_for(self): + async def g(): + yield None + + async def send_for(): + async for _ in g(): + break + + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): + try: + send_for().send(None) + except StopIteration: + pass + self.assert_specialized(send_for, "SEND_ASYNC_GEN") + self.assert_no_opcode(send_for, "SEND") + @cpython_only @requires_specialization def test_store_attr_slot(self): @@ -2154,6 +2185,17 @@ def load_module_attr_missing(): finally: sys.modules.pop("test_module_with_getattr", None) + @cpython_only + @requires_specialization + def test_specialized_iter_doesnt_skip_send_check(self): + def gen_func(seq): + yield from seq + gen = gen_func(list(range(10))) + for _ in range(3): + gen.send(None) + with self.assertRaises(AttributeError): + gen.send(1) + @cpython_only @requires_specialization diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py index 19f4506c109c14..09d1b5d725e5ba 100644 --- a/Lib/test/test_pathlib/test_pathlib.py +++ b/Lib/test/test_pathlib/test_pathlib.py @@ -81,7 +81,7 @@ def test_is_notimplemented(self): class LazyImportTest(unittest.TestCase): @cpython_only def test_lazy_import(self): - import_helper.ensure_lazy_imports("pathlib", {"shutil"}) + import_helper.ensure_lazy_imports("pathlib", {"glob", "shutil"}) # diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index 48375cf459ea0b..55a3c654aa0a47 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -786,11 +786,7 @@ def test_invocation(self): 'b': ('character string', b'byte string'), 'c': 'string' } - expect = ''' - {'a': [1, 2.0, (3+4j)], - 'b': ('character string', b'byte string'), - 'c': 'string'} - ''' + expect = "{'a': [1, 2.0, (3+4j)], 'b': ('character string', b'byte string'), 'c': 'string'}" self.set_pickle_data(data) with self.subTest(data=data): diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index 041c2072b9e253..f439782f53e6fb 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -3,6 +3,7 @@ import collections import contextlib import dataclasses +import functools import io import itertools import pprint @@ -15,6 +16,10 @@ from test.support import cpython_only from test.support.import_helper import ensure_lazy_imports +# Pin pre-3.15 width/indent for existing formatting tests. +# compact=True keeps the legacy non-JSON-style container wrapping. +_pformat = functools.partial(pprint.pformat, indent=1, width=80, compact=True) + # list, tuple and dict subclasses that do or don't overwrite __repr__ class list2(list): pass @@ -164,7 +169,6 @@ def test_init(self): self.assertRaises(ValueError, pprint.PrettyPrinter, depth=0) self.assertRaises(ValueError, pprint.PrettyPrinter, depth=-1) self.assertRaises(ValueError, pprint.PrettyPrinter, width=0) - self.assertRaises(ValueError, pprint.PrettyPrinter, compact=True, expand=True) def test_basic(self): # Verify .isrecursive() and .isreadable() w/o recursion @@ -284,10 +288,10 @@ def test_same_as_repr(self): True, False, None, ..., ): native = repr(simple) - self.assertEqual(pprint.pformat(simple), native) - self.assertEqual(pprint.pformat(simple, width=1, indent=0) + self.assertEqual(_pformat(simple), native) + self.assertEqual(_pformat(simple, width=1, indent=0) .replace('\n', ' '), native) - self.assertEqual(pprint.pformat(simple, underscore_numbers=True), native) + self.assertEqual(_pformat(simple, underscore_numbers=True), native) self.assertEqual(pprint.saferepr(simple), native) def test_container_repr_override_called(self): @@ -318,8 +322,8 @@ def test_container_repr_override_called(self): ): native = repr(cont) expected = '*' * len(native) - self.assertEqual(pprint.pformat(cont), expected) - self.assertEqual(pprint.pformat(cont, width=1, indent=0), expected) + self.assertEqual(_pformat(cont), expected) + self.assertEqual(_pformat(cont, width=1, indent=0), expected) self.assertEqual(pprint.saferepr(cont), expected) def test_basic_line_wrap(self): @@ -340,7 +344,7 @@ def test_basic_line_wrap(self): 'read_io_runtime_us': 0, 'write_io_runtime_us': 43690}""" for type in [dict, dict2]: - self.assertEqual(pprint.pformat(type(o)), exp) + self.assertEqual(_pformat(type(o)), exp) exp = """\ frozendict({'RPM_cal': 0, @@ -350,7 +354,7 @@ def test_basic_line_wrap(self): 'main_code_runtime_us': 0, 'read_io_runtime_us': 0, 'write_io_runtime_us': 43690})""" - self.assertEqual(pprint.pformat(frozendict(o)), exp) + self.assertEqual(_pformat(frozendict(o)), exp) exp = """\ frozendict2({'RPM_cal': 0, 'RPM_cal2': 48059, @@ -359,79 +363,79 @@ def test_basic_line_wrap(self): 'main_code_runtime_us': 0, 'read_io_runtime_us': 0, 'write_io_runtime_us': 43690})""" - self.assertEqual(pprint.pformat(frozendict2(o)), exp) + self.assertEqual(_pformat(frozendict2(o)), exp) o = range(100) exp = 'dict_keys([%s])' % ',\n '.join(map(str, o)) keys = dict.fromkeys(o).keys() - self.assertEqual(pprint.pformat(keys), exp) + self.assertEqual(_pformat(keys, width=1), exp) keys = frozendict.fromkeys(o).keys() - self.assertEqual(pprint.pformat(keys), exp) + self.assertEqual(_pformat(keys, width=1), exp) o = range(100) exp = 'dict_values([%s])' % ',\n '.join(map(str, o)) values = {v: v for v in o}.values() - self.assertEqual(pprint.pformat(values), exp) + self.assertEqual(_pformat(values, width=1), exp) values = frozendict({v: v for v in o}).values() - self.assertEqual(pprint.pformat(values), exp) + self.assertEqual(_pformat(values, width=1), exp) o = range(100) exp = 'dict_items([%s])' % ',\n '.join("(%s, %s)" % (i, i) for i in o) items = {v: v for v in o}.items() - self.assertEqual(pprint.pformat(items), exp) + self.assertEqual(_pformat(items, width=11), exp) items = frozendict({v: v for v in o}).items() - self.assertEqual(pprint.pformat(items), exp) + self.assertEqual(_pformat(items, width=11), exp) o = range(100) exp = 'odict_keys([%s])' % ',\n '.join(map(str, o)) keys = collections.OrderedDict.fromkeys(o).keys() - self.assertEqual(pprint.pformat(keys), exp) + self.assertEqual(_pformat(keys, width=1), exp) o = range(100) exp = 'odict_values([%s])' % ',\n '.join(map(str, o)) values = collections.OrderedDict({v: v for v in o}).values() - self.assertEqual(pprint.pformat(values), exp) + self.assertEqual(_pformat(values, width=1), exp) o = range(100) exp = 'odict_items([%s])' % ',\n '.join("(%s, %s)" % (i, i) for i in o) items = collections.OrderedDict({v: v for v in o}).items() - self.assertEqual(pprint.pformat(items), exp) + self.assertEqual(_pformat(items, width=11), exp) o = range(100) exp = 'KeysView({%s})' % (': None,\n '.join(map(str, o)) + ': None') keys_view = KeysView(dict.fromkeys(o)) - self.assertEqual(pprint.pformat(keys_view), exp) + self.assertEqual(_pformat(keys_view), exp) o = range(100) exp = 'ItemsView({%s})' % (': None,\n '.join(map(str, o)) + ': None') items_view = ItemsView(dict.fromkeys(o)) - self.assertEqual(pprint.pformat(items_view), exp) + self.assertEqual(_pformat(items_view), exp) o = range(100) exp = 'MappingView({%s})' % (': None,\n '.join(map(str, o)) + ': None') mapping_view = MappingView(dict.fromkeys(o)) - self.assertEqual(pprint.pformat(mapping_view), exp) + self.assertEqual(_pformat(mapping_view), exp) o = range(100) exp = 'ValuesView({%s})' % (': None,\n '.join(map(str, o)) + ': None') values_view = ValuesView(dict.fromkeys(o)) - self.assertEqual(pprint.pformat(values_view), exp) + self.assertEqual(_pformat(values_view), exp) o = range(100) exp = '[%s]' % ',\n '.join(map(str, o)) for type in [list, list2]: - self.assertEqual(pprint.pformat(type(o)), exp) + self.assertEqual(_pformat(type(o), width=1), exp) o = tuple(range(100)) exp = '(%s)' % ',\n '.join(map(str, o)) for type in [tuple, tuple2]: - self.assertEqual(pprint.pformat(type(o)), exp) + self.assertEqual(_pformat(type(o), width=1), exp) # indent parameter o = range(100) exp = '[ %s]' % ',\n '.join(map(str, o)) for type in [list, list2]: - self.assertEqual(pprint.pformat(type(o), indent=4), exp) + self.assertEqual(_pformat(type(o), indent=4, width=1), exp) def test_nested_indentations(self): o1 = list(range(10)) @@ -440,13 +444,13 @@ def test_nested_indentations(self): expected = """\ [ [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], {'first': 1, 'second': 2, 'third': 3}]""" - self.assertEqual(pprint.pformat(o, indent=4, width=42), expected) + self.assertEqual(pprint.pformat(o, indent=4, width=42, compact=True), expected) expected = """\ [ [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], { 'first': 1, 'second': 2, 'third': 3}]""" - self.assertEqual(pprint.pformat(o, indent=4, width=41), expected) + self.assertEqual(pprint.pformat(o, indent=4, width=41, compact=True), expected) def test_width(self): expected = """\ @@ -460,17 +464,15 @@ def test_width(self): [[[[[1, 2, 3], '1 2']]]]]""" o = eval(expected) - self.assertEqual(pprint.pformat(o, width=15), expected) - self.assertEqual(pprint.pformat(o, width=16), expected) - self.assertEqual(pprint.pformat(o, width=25), expected) - self.assertEqual(pprint.pformat(o, width=14), """\ -[[[[[[1, - 2, + self.assertEqual(_pformat(o, width=15), expected) + self.assertEqual(_pformat(o, width=16), expected) + self.assertEqual(_pformat(o, width=25), expected) + self.assertEqual(_pformat(o, width=14), """\ +[[[[[[1, 2, 3], '1 ' '2']]]], - {1: [1, - 2, + {1: [1, 2, 3], 2: [12, 34]}, @@ -480,15 +482,14 @@ def test_width(self): 'ef',), set2({1, 23}), - [[[[[1, - 2, + [[[[[1, 2, 3], '1 ' '2']]]]]""") def test_integer(self): - self.assertEqual(pprint.pformat(1234567), '1234567') - self.assertEqual(pprint.pformat(1234567, underscore_numbers=True), '1_234_567') + self.assertEqual(_pformat(1234567), '1234567') + self.assertEqual(_pformat(1234567, underscore_numbers=True), '1_234_567') class Temperature(int): def __new__(cls, celsius_degrees): @@ -496,7 +497,7 @@ def __new__(cls, celsius_degrees): def __repr__(self): kelvin_degrees = self + 273.15 return f"{kelvin_degrees:.2f}°K" - self.assertEqual(pprint.pformat(Temperature(1000)), '1273.15°K') + self.assertEqual(_pformat(Temperature(1000)), '1273.15°K') def test_sorted_dict(self): # Starting in Python 2.5, pprint sorts dict displays by key regardless @@ -504,8 +505,8 @@ def test_sorted_dict(self): # Before the change, on 32-bit Windows pformat() gave order # 'a', 'c', 'b' here, so this test failed. d = {'a': 1, 'b': 1, 'c': 1} - self.assertEqual(pprint.pformat(d), "{'a': 1, 'b': 1, 'c': 1}") - self.assertEqual(pprint.pformat([d, d]), + self.assertEqual(_pformat(d), "{'a': 1, 'b': 1, 'c': 1}") + self.assertEqual(_pformat([d, d]), "[{'a': 1, 'b': 1, 'c': 1}, {'a': 1, 'b': 1, 'c': 1}]") # The next one is kind of goofy. The sorted order depends on the @@ -513,63 +514,42 @@ def test_sorted_dict(self): # Python 2.5, this was in the test_same_as_repr() test. It's worth # keeping around for now because it's one of few tests of pprint # against a crazy mix of types. - self.assertEqual(pprint.pformat({"xy\tab\n": (3,), 5: [[]], (): {}}), + self.assertEqual(_pformat({"xy\tab\n": (3,), 5: [[]], (): {}}), r"{5: [[]], 'xy\tab\n': (3,), (): {}}") def test_sort_dict(self): d = dict.fromkeys('cba') - self.assertEqual(pprint.pformat(d, sort_dicts=False), "{'c': None, 'b': None, 'a': None}") - self.assertEqual(pprint.pformat([d, d], sort_dicts=False), + self.assertEqual(_pformat(d, sort_dicts=False), "{'c': None, 'b': None, 'a': None}") + self.assertEqual(_pformat([d, d], sort_dicts=False), "[{'c': None, 'b': None, 'a': None}, {'c': None, 'b': None, 'a': None}]") def test_ordered_dict(self): d = collections.OrderedDict() - self.assertEqual(pprint.pformat(d, width=1), 'OrderedDict()') + self.assertEqual(_pformat(d, width=1), 'OrderedDict()') d = collections.OrderedDict([]) - self.assertEqual(pprint.pformat(d, width=1), 'OrderedDict()') + self.assertEqual(_pformat(d, width=1), 'OrderedDict()') words = 'the quick brown fox jumped over a lazy dog'.split() d = collections.OrderedDict(zip(words, itertools.count())) - self.assertEqual(pprint.pformat(d), -"""\ -OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), - ('dog', 8)])""") - self.assertEqual(pprint.pformat(d.keys(), sort_dicts=False), + self.assertEqual(_pformat(d), """\ -odict_keys(['the', - 'quick', - 'brown', - 'fox', - 'jumped', - 'over', - 'a', - 'lazy', - 'dog'])""") - self.assertEqual(pprint.pformat(d.items(), sort_dicts=False), +OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), ('jumped', 4), + ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)])""") + self.assertEqual( + _pformat(d.keys(), sort_dicts=False), + "odict_keys(['the', 'quick', 'brown', 'fox', 'jumped', 'over', 'a', 'lazy', 'dog'])", + ) + self.assertEqual(_pformat(d.items(), sort_dicts=False), """\ -odict_items([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), - ('dog', 8)])""") - self.assertEqual(pprint.pformat(d.values(), sort_dicts=False), +odict_items([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), ('jumped', 4), ('over', 5), + ('a', 6), ('lazy', 7), ('dog', 8)])""") + self.assertEqual(_pformat(d.values(), sort_dicts=False), "odict_values([0, 1, 2, 3, 4, 5, 6, 7, 8])") def test_mapping_proxy(self): words = 'the quick brown fox jumped over a lazy dog'.split() d = dict(zip(words, itertools.count())) m = types.MappingProxyType(d) - self.assertEqual(pprint.pformat(m), """\ + self.assertEqual(_pformat(m), """\ mappingproxy({'a': 6, 'brown': 2, 'dog': 8, @@ -581,49 +561,81 @@ def test_mapping_proxy(self): 'the': 0})""") d = collections.OrderedDict(zip(words, itertools.count())) m = types.MappingProxyType(d) - self.assertEqual(pprint.pformat(m), """\ -mappingproxy(OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), + self.assertEqual(_pformat(m), """\ +mappingproxy(OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), + ('jumped', 4), ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)]))""") def test_dict_views(self): for dict_class in (dict, collections.OrderedDict, collections.Counter): empty = dict_class({}) short = dict_class(dict(zip('edcba', 'edcba'))) - long = dict_class(dict((chr(x), chr(x)) for x in range(90, 64, -1))) - lengths = {"empty": empty, "short": short, "long": long} + lengths = {"empty": empty, "short": short} prefix = "odict" if dict_class is collections.OrderedDict else "dict" for name, d in lengths.items(): with self.subTest(length=name, prefix=prefix): - is_short = len(d) < 6 - joiner = ", " if is_short else ",\n " k = d.keys() v = d.values() i = d.items() - self.assertEqual(pprint.pformat(k, sort_dicts=True), + self.assertEqual(_pformat(k, sort_dicts=True), prefix + "_keys([%s])" % - joiner.join(repr(key) for key in sorted(k))) - self.assertEqual(pprint.pformat(v, sort_dicts=True), + ", ".join(repr(key) for key in sorted(k))) + self.assertEqual(_pformat(v, sort_dicts=True), prefix + "_values([%s])" % - joiner.join(repr(val) for val in sorted(v))) - self.assertEqual(pprint.pformat(i, sort_dicts=True), + ", ".join(repr(val) for val in sorted(v))) + self.assertEqual(_pformat(i, sort_dicts=True), prefix + "_items([%s])" % - joiner.join(repr(item) for item in sorted(i))) - self.assertEqual(pprint.pformat(k, sort_dicts=False), + ", ".join(repr(item) for item in sorted(i))) + self.assertEqual(_pformat(k, sort_dicts=False), prefix + "_keys([%s])" % - joiner.join(repr(key) for key in k)) - self.assertEqual(pprint.pformat(v, sort_dicts=False), + ", ".join(repr(key) for key in k)) + self.assertEqual(_pformat(v, sort_dicts=False), prefix + "_values([%s])" % - joiner.join(repr(val) for val in v)) - self.assertEqual(pprint.pformat(i, sort_dicts=False), + ", ".join(repr(val) for val in v)) + self.assertEqual(_pformat(i, sort_dicts=False), prefix + "_items([%s])" % - joiner.join(repr(item) for item in i)) + ", ".join(repr(item) for item in i)) + + # Long case: views wrap with compact-mode packing. + long = dict((chr(x), chr(x)) for x in range(90, 64, -1)) + sorted_keys = ( + "['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',\n" + " 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']" + ) + unsorted_keys = ( + "['Z', 'Y', 'X', 'W', 'V', 'U', 'T', 'S', 'R', 'Q', 'P', 'O', 'N', 'M', 'L', 'K',\n" + " 'J', 'I', 'H', 'G', 'F', 'E', 'D', 'C', 'B', 'A']" + ) + sorted_items = ( + "[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D'), ('E', 'E'), ('F', 'F'),\n" + " ('G', 'G'), ('H', 'H'), ('I', 'I'), ('J', 'J'), ('K', 'K'), ('L', 'L'),\n" + " ('M', 'M'), ('N', 'N'), ('O', 'O'), ('P', 'P'), ('Q', 'Q'), ('R', 'R'),\n" + " ('S', 'S'), ('T', 'T'), ('U', 'U'), ('V', 'V'), ('W', 'W'), ('X', 'X'),\n" + " ('Y', 'Y'), ('Z', 'Z')]" + ) + unsorted_items = ( + "[('Z', 'Z'), ('Y', 'Y'), ('X', 'X'), ('W', 'W'), ('V', 'V'), ('U', 'U'),\n" + " ('T', 'T'), ('S', 'S'), ('R', 'R'), ('Q', 'Q'), ('P', 'P'), ('O', 'O'),\n" + " ('N', 'N'), ('M', 'M'), ('L', 'L'), ('K', 'K'), ('J', 'J'), ('I', 'I'),\n" + " ('H', 'H'), ('G', 'G'), ('F', 'F'), ('E', 'E'), ('D', 'D'), ('C', 'C'),\n" + " ('B', 'B'), ('A', 'A')]" + ) + for dict_class in (dict, collections.OrderedDict, collections.Counter): + d = dict_class(long) + prefix = "odict" if dict_class is collections.OrderedDict else "dict" + with self.subTest(length="long", prefix=prefix): + self.assertEqual(_pformat(d.keys(), sort_dicts=True), + f"{prefix}_keys({sorted_keys})") + self.assertEqual(_pformat(d.values(), sort_dicts=True), + f"{prefix}_values({sorted_keys})") + self.assertEqual(_pformat(d.items(), sort_dicts=True), + f"{prefix}_items({sorted_items})") + self.assertEqual(_pformat(d.keys(), sort_dicts=False), + f"{prefix}_keys({unsorted_keys})") + self.assertEqual(_pformat(d.values(), sort_dicts=False), + f"{prefix}_values({unsorted_keys})") + self.assertEqual(_pformat(d.items(), sort_dicts=False), + f"{prefix}_items({unsorted_items})") def test_abc_views(self): empty = {} @@ -641,55 +653,55 @@ class MV(MappingView): pass s = sorted(i) joined_items = "({%s})" % joiner.join(["%r: %r" % (k, v) for (k, v) in i]) sorted_items = "({%s})" % joiner.join(["%r: %r" % (k, v) for (k, v) in s]) - self.assertEqual(pprint.pformat(KeysView(d), sort_dicts=True), + self.assertEqual(_pformat(KeysView(d), sort_dicts=True), KeysView.__name__ + sorted_items) - self.assertEqual(pprint.pformat(ItemsView(d), sort_dicts=True), + self.assertEqual(_pformat(ItemsView(d), sort_dicts=True), ItemsView.__name__ + sorted_items) - self.assertEqual(pprint.pformat(MappingView(d), sort_dicts=True), + self.assertEqual(_pformat(MappingView(d), sort_dicts=True), MappingView.__name__ + sorted_items) - self.assertEqual(pprint.pformat(MV(d), sort_dicts=True), + self.assertEqual(_pformat(MV(d), sort_dicts=True), MV.__name__ + sorted_items) - self.assertEqual(pprint.pformat(ValuesView(d), sort_dicts=True), + self.assertEqual(_pformat(ValuesView(d), sort_dicts=True), ValuesView.__name__ + sorted_items) - self.assertEqual(pprint.pformat(KeysView(d), sort_dicts=False), + self.assertEqual(_pformat(KeysView(d), sort_dicts=False), KeysView.__name__ + joined_items) - self.assertEqual(pprint.pformat(ItemsView(d), sort_dicts=False), + self.assertEqual(_pformat(ItemsView(d), sort_dicts=False), ItemsView.__name__ + joined_items) - self.assertEqual(pprint.pformat(MappingView(d), sort_dicts=False), + self.assertEqual(_pformat(MappingView(d), sort_dicts=False), MappingView.__name__ + joined_items) - self.assertEqual(pprint.pformat(MV(d), sort_dicts=False), + self.assertEqual(_pformat(MV(d), sort_dicts=False), MV.__name__ + joined_items) - self.assertEqual(pprint.pformat(ValuesView(d), sort_dicts=False), + self.assertEqual(_pformat(ValuesView(d), sort_dicts=False), ValuesView.__name__ + joined_items) def test_nested_views(self): d = {1: MappingView({1: MappingView({1: MappingView({1: 2})})})} self.assertEqual(repr(d), "{1: MappingView({1: MappingView({1: MappingView({1: 2})})})}") - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), "{1: MappingView({1: MappingView({1: MappingView({1: 2})})})}") - self.assertEqual(pprint.pformat(d, depth=2), + self.assertEqual(_pformat(d, depth=2), "{1: MappingView({1: {...}})}") d = {} d1 = {1: d.values()} d2 = {1: d1.values()} d3 = {1: d2.values()} - self.assertEqual(pprint.pformat(d3), + self.assertEqual(_pformat(d3), "{1: dict_values([dict_values([dict_values([])])])}") - self.assertEqual(pprint.pformat(d3, depth=2), + self.assertEqual(_pformat(d3, depth=2), "{1: dict_values([{...}])}") def test_unorderable_items_views(self): """Check that views with unorderable items have stable sorting.""" d = dict((((3+1j), 3), ((1+1j), (1+0j)), (1j, 0j), (500, None), (499, None))) iv = ItemsView(d) - self.assertEqual(pprint.pformat(iv), - pprint.pformat(iv)) - self.assertTrue(pprint.pformat(iv).endswith(", 499: None, 500: None})"), - pprint.pformat(iv)) - self.assertEqual(pprint.pformat(d.items()), # Won't be equal unless _safe_tuple - pprint.pformat(d.items())) # is used in _safe_repr - self.assertTrue(pprint.pformat(d.items()).endswith(", (499, None), (500, None)])")) + self.assertEqual(_pformat(iv), + _pformat(iv)) + self.assertTrue(_pformat(iv).endswith(", 499: None, 500: None})"), + _pformat(iv)) + self.assertEqual(_pformat(d.items()), # Won't be equal unless _safe_tuple + _pformat(d.items())) # is used in _safe_repr + self.assertTrue(_pformat(d.items()).endswith(", (499, None), (500, None)])")) def test_mapping_view_subclass_no_mapping(self): class BMV(MappingView): @@ -698,7 +710,7 @@ def __init__(self, d): self.mapping = self._mapping del self._mapping - self.assertRaises(AttributeError, pprint.pformat, BMV({})) + self.assertRaises(AttributeError, _pformat, BMV({})) def test_mapping_subclass_repr(self): """Test that mapping ABC views use their ._mapping's __repr__.""" @@ -722,10 +734,10 @@ def __repr__(self): self.assertEqual(repr(m), "MyMapping(['test', 1])") short_view_repr = "%s(MyMapping(['test', 1]))" self.assertEqual(repr(m.keys()), short_view_repr % "KeysView") - self.assertEqual(pprint.pformat(m.items()), short_view_repr % "ItemsView") - self.assertEqual(pprint.pformat(m.keys()), short_view_repr % "KeysView") - self.assertEqual(pprint.pformat(MappingView(m)), short_view_repr % "MappingView") - self.assertEqual(pprint.pformat(m.values()), short_view_repr % "ValuesView") + self.assertEqual(_pformat(m.items()), short_view_repr % "ItemsView") + self.assertEqual(_pformat(m.keys()), short_view_repr % "KeysView") + self.assertEqual(_pformat(MappingView(m)), short_view_repr % "MappingView") + self.assertEqual(_pformat(m.values()), short_view_repr % "ValuesView") alpha = "abcdefghijklmnopqrstuvwxyz" m = MyMapping(alpha) @@ -733,19 +745,19 @@ def __repr__(self): long_view_repr = "%%s(MyMapping([%s]))" % alpha_repr self.assertEqual(repr(m), "MyMapping([%s])" % alpha_repr) self.assertEqual(repr(m.keys()), long_view_repr % "KeysView") - self.assertEqual(pprint.pformat(m.items()), long_view_repr % "ItemsView") - self.assertEqual(pprint.pformat(m.keys()), long_view_repr % "KeysView") - self.assertEqual(pprint.pformat(MappingView(m)), long_view_repr % "MappingView") - self.assertEqual(pprint.pformat(m.values()), long_view_repr % "ValuesView") + self.assertEqual(_pformat(m.items()), long_view_repr % "ItemsView") + self.assertEqual(_pformat(m.keys()), long_view_repr % "KeysView") + self.assertEqual(_pformat(MappingView(m)), long_view_repr % "MappingView") + self.assertEqual(_pformat(m.values()), long_view_repr % "ValuesView") def test_empty_simple_namespace(self): ns = types.SimpleNamespace() - formatted = pprint.pformat(ns) + formatted = _pformat(ns) self.assertEqual(formatted, "namespace()") def test_small_simple_namespace(self): ns = types.SimpleNamespace(a=1, b=2) - formatted = pprint.pformat(ns) + formatted = _pformat(ns) self.assertEqual(formatted, "namespace(a=1, b=2)") def test_simple_namespace(self): @@ -760,7 +772,7 @@ def test_simple_namespace(self): lazy=7, dog=8, ) - formatted = pprint.pformat(ns, width=60, indent=4) + formatted = pprint.pformat(ns, width=60, indent=4, compact=True) self.assertEqual(formatted, """\ namespace(the=0, quick=1, @@ -785,7 +797,7 @@ class AdvancedNamespace(types.SimpleNamespace): pass lazy=7, dog=8, ) - formatted = pprint.pformat(ns, width=60) + formatted = _pformat(ns, width=60) self.assertEqual(formatted, """\ AdvancedNamespace(the=0, quick=1, @@ -799,17 +811,17 @@ class AdvancedNamespace(types.SimpleNamespace): pass def test_empty_dataclass(self): dc = dataclasses.make_dataclass("MyDataclass", ())() - formatted = pprint.pformat(dc) + formatted = _pformat(dc) self.assertEqual(formatted, "MyDataclass()") def test_small_dataclass(self): dc = dataclass1("text", 123) - formatted = pprint.pformat(dc) + formatted = _pformat(dc) self.assertEqual(formatted, "dataclass1(field1='text', field2=123, field3=False)") def test_larger_dataclass(self): dc = dataclass1("some fairly long text", int(1e10), True) - formatted = pprint.pformat([dc, dc], width=60, indent=4) + formatted = pprint.pformat([dc, dc], width=60, indent=4, compact=True) self.assertEqual(formatted, """\ [ dataclass1(field1='some fairly long text', field2=10000000000, @@ -820,12 +832,12 @@ def test_larger_dataclass(self): def test_dataclass_with_repr(self): dc = dataclass2() - formatted = pprint.pformat(dc, width=20) + formatted = _pformat(dc, width=20) self.assertEqual(formatted, "custom repr that doesn't fit within pprint width") def test_dataclass_no_repr(self): dc = dataclass3() - formatted = pprint.pformat(dc, width=10) + formatted = _pformat(dc, width=10) self.assertRegex( formatted, fr"<{re.escape(__name__)}.dataclass3 object at \w+>", @@ -834,7 +846,7 @@ def test_dataclass_no_repr(self): def test_recursive_dataclass(self): dc = dataclass4(None) dc.a = dc - formatted = pprint.pformat(dc, width=10) + formatted = _pformat(dc, width=10) self.assertEqual(formatted, """\ dataclass4(a=..., b=1)""") @@ -844,7 +856,7 @@ def test_cyclic_dataclass(self): dc6 = dataclass6(None) dc5.a = dc6 dc6.c = dc5 - formatted = pprint.pformat(dc5, width=10) + formatted = _pformat(dc5, width=10) self.assertEqual(formatted, """\ dataclass5(a=dataclass6(c=..., d=1), @@ -858,7 +870,7 @@ def test_subclassing(self): {'names with spaces': 'should be presented using repr()', others.should.not.be: like.this}""" - dotted_printer = DottedPrettyPrinter() + dotted_printer = DottedPrettyPrinter(indent=1, compact=True) self.assertEqual(dotted_printer.pformat(o), exp) # length(repr(obj)) < width @@ -870,47 +882,29 @@ def test_subclassing(self): self.assertEqual(dotted_printer.pformat(o2), exp2) def test_set_reprs(self): - self.assertEqual(pprint.pformat(set()), 'set()') - self.assertEqual(pprint.pformat(set(range(3))), '{0, 1, 2}') - self.assertEqual(pprint.pformat(set(range(7)), width=20), '''\ -{0, - 1, - 2, - 3, - 4, - 5, + self.assertEqual(_pformat(set()), 'set()') + self.assertEqual(_pformat(set(range(3))), '{0, 1, 2}') + self.assertEqual(_pformat(set(range(7)), width=20), '''\ +{0, 1, 2, 3, 4, 5, 6}''') - self.assertEqual(pprint.pformat(set2(range(7)), width=20), '''\ -set2({0, - 1, - 2, - 3, - 4, - 5, - 6})''') - self.assertEqual(pprint.pformat(set3(range(7)), width=20), + self.assertEqual(_pformat(set2(range(7)), width=20), '''\ +set2({0, 1, 2, 3, 4, + 5, 6})''') + self.assertEqual(_pformat(set3(range(7)), width=20), 'set3({0, 1, 2, 3, 4, 5, 6})') - self.assertEqual(pprint.pformat(frozenset()), 'frozenset()') - self.assertEqual(pprint.pformat(frozenset(range(3))), + self.assertEqual(_pformat(frozenset()), 'frozenset()') + self.assertEqual(_pformat(frozenset(range(3))), 'frozenset({0, 1, 2})') - self.assertEqual(pprint.pformat(frozenset(range(7)), width=20), '''\ -frozenset({0, - 1, - 2, - 3, - 4, - 5, + self.assertEqual(_pformat(frozenset(range(7)), width=20), '''\ +frozenset({0, 1, 2, + 3, 4, 5, 6})''') - self.assertEqual(pprint.pformat(frozenset2(range(7)), width=20), '''\ -frozenset2({0, - 1, - 2, - 3, - 4, - 5, + self.assertEqual(_pformat(frozenset2(range(7)), width=20), '''\ +frozenset2({0, 1, 2, + 3, 4, 5, 6})''') - self.assertEqual(pprint.pformat(frozenset3(range(7)), width=20), + self.assertEqual(_pformat(frozenset3(range(7)), width=20), 'frozenset3({0, 1, 2, 3, 4, 5, 6})') def test_set_of_sets_reprs(self): @@ -942,21 +936,21 @@ def test_set_of_sets_reprs(self): fs0 = frozenset() fs1 = frozenset(('abc', 'xyz')) data = frozenset((fs0, fs1)) - self.assertEqual(pprint.pformat(data), + self.assertEqual(_pformat(data), 'frozenset({%r, %r})' % (fs0, fs1)) - self.assertEqual(pprint.pformat(data), repr(data)) + self.assertEqual(_pformat(data), repr(data)) fs2 = frozenset(('one', 'two')) data = {fs2: frozenset((fs0, fs1))} - self.assertEqual(pprint.pformat(data), + self.assertEqual(_pformat(data), "{%r: frozenset({%r, %r})}" % (fs2, fs0, fs1)) - self.assertEqual(pprint.pformat(data), repr(data)) + self.assertEqual(_pformat(data), repr(data)) # Single-line, unordered: fs1 = frozenset(("xyz", "qwerty")) fs2 = frozenset(("abcd", "spam")) fs = frozenset((fs1, fs2)) - self.assertEqual(pprint.pformat(fs), repr(fs)) + self.assertEqual(_pformat(fs), repr(fs)) # Multiline, unordered: def check(res, invariants): @@ -966,7 +960,7 @@ def check(res, invariants): fs1 = frozenset(('regular string', 'other string')) fs2 = frozenset(('third string', 'one more string')) check( - pprint.pformat(frozenset((fs1, fs2))), + _pformat(frozenset((fs1, fs2))), [ """ frozenset({%r, @@ -981,7 +975,7 @@ def check(res, invariants): # Everything is multiline, unordered: check( - pprint.pformat( + _pformat( frozenset(( frozenset(( "xyz very-very long string", @@ -1028,16 +1022,16 @@ def test_depth(self): nested_tuple = (1, (2, (3, (4, (5, 6))))) nested_dict = {1: {2: {3: {4: {5: {6: 6}}}}}} nested_list = [1, [2, [3, [4, [5, [6, []]]]]]] - self.assertEqual(pprint.pformat(nested_tuple), repr(nested_tuple)) - self.assertEqual(pprint.pformat(nested_dict), repr(nested_dict)) - self.assertEqual(pprint.pformat(nested_list), repr(nested_list)) + self.assertEqual(_pformat(nested_tuple), repr(nested_tuple)) + self.assertEqual(_pformat(nested_dict), repr(nested_dict)) + self.assertEqual(_pformat(nested_list), repr(nested_list)) lv1_tuple = '(1, (...))' lv1_dict = '{1: {...}}' lv1_list = '[1, [...]]' - self.assertEqual(pprint.pformat(nested_tuple, depth=1), lv1_tuple) - self.assertEqual(pprint.pformat(nested_dict, depth=1), lv1_dict) - self.assertEqual(pprint.pformat(nested_list, depth=1), lv1_list) + self.assertEqual(_pformat(nested_tuple, depth=1), lv1_tuple) + self.assertEqual(_pformat(nested_dict, depth=1), lv1_dict) + self.assertEqual(_pformat(nested_list, depth=1), lv1_list) def test_sort_unorderable_values(self): # Issue 3976: sorted pprints fail for unorderable values. @@ -1047,24 +1041,24 @@ def test_sort_unorderable_values(self): skeys = sorted(keys, key=id) clean = lambda s: s.replace(' ', '').replace('\n','') - self.assertEqual(clean(pprint.pformat(set(keys))), + self.assertEqual(clean(_pformat(set(keys))), '{' + ','.join(map(repr, skeys)) + '}') - self.assertEqual(clean(pprint.pformat(frozenset(keys))), + self.assertEqual(clean(_pformat(frozenset(keys))), 'frozenset({' + ','.join(map(repr, skeys)) + '})') - self.assertEqual(clean(pprint.pformat(dict.fromkeys(keys))), + self.assertEqual(clean(_pformat(dict.fromkeys(keys))), '{' + ','.join('%r:None' % k for k in skeys) + '}') - self.assertEqual(clean(pprint.pformat(dict.fromkeys(keys).keys())), + self.assertEqual(clean(_pformat(dict.fromkeys(keys).keys())), 'dict_keys([' + ','.join('%r' % k for k in skeys) + '])') - self.assertEqual(clean(pprint.pformat(dict.fromkeys(keys).items())), + self.assertEqual(clean(_pformat(dict.fromkeys(keys).items())), 'dict_items([' + ','.join('(%r,None)' % k for k in skeys) + '])') # Issue 10017: TypeError on user-defined types as dict keys. - self.assertEqual(pprint.pformat({Unorderable: 0, 1: 0}), + self.assertEqual(_pformat({Unorderable: 0, 1: 0}), '{1: 0, ' + repr(Unorderable) +': 0}') # Issue 14998: TypeError on tuples with NoneTypes as dict keys. keys = [(1,), (None,)] - self.assertEqual(pprint.pformat(dict.fromkeys(keys, 0)), + self.assertEqual(_pformat(dict.fromkeys(keys, 0)), '{%r: 0, %r: 0}' % tuple(sorted(keys, key=id))) def test_sort_orderable_and_unorderable_values(self): @@ -1077,24 +1071,24 @@ def test_sort_orderable_and_unorderable_values(self): self.assertEqual(sorted([b, a]), [a, b]) self.assertEqual(sorted([a, b]), [a, b]) # set - self.assertEqual(pprint.pformat(set([b, a]), width=1), + self.assertEqual(_pformat(set([b, a]), width=1), '{%r,\n %r}' % (a, b)) - self.assertEqual(pprint.pformat(set([a, b]), width=1), + self.assertEqual(_pformat(set([a, b]), width=1), '{%r,\n %r}' % (a, b)) # dict - self.assertEqual(pprint.pformat(dict.fromkeys([b, a]), width=1), + self.assertEqual(_pformat(dict.fromkeys([b, a]), width=1), '{%r: None,\n %r: None}' % (a, b)) - self.assertEqual(pprint.pformat(dict.fromkeys([a, b]), width=1), + self.assertEqual(_pformat(dict.fromkeys([a, b]), width=1), '{%r: None,\n %r: None}' % (a, b)) def test_str_wrap(self): # pprint tries to wrap strings intelligently fox = 'the quick brown fox jumped over a lazy dog' - self.assertEqual(pprint.pformat(fox, width=19), """\ + self.assertEqual(_pformat(fox, width=19), """\ ('the quick brown ' 'fox jumped over ' 'a lazy dog')""") - self.assertEqual(pprint.pformat({'a': 1, 'b': fox, 'c': 2}, + self.assertEqual(_pformat({'a': 1, 'b': fox, 'c': 2}, width=25), """\ {'a': 1, 'b': 'the quick brown ' @@ -1107,28 +1101,28 @@ def test_str_wrap(self): # - non-ASCII is allowed # - an apostrophe doesn't disrupt the pprint special = "Portons dix bons \"whiskys\"\nà l'avocat goujat\t qui fumait au zoo" - self.assertEqual(pprint.pformat(special, width=68), repr(special)) - self.assertEqual(pprint.pformat(special, width=31), """\ + self.assertEqual(_pformat(special, width=68), repr(special)) + self.assertEqual(_pformat(special, width=31), """\ ('Portons dix bons "whiskys"\\n' "à l'avocat goujat\\t qui " 'fumait au zoo')""") - self.assertEqual(pprint.pformat(special, width=20), """\ + self.assertEqual(_pformat(special, width=20), """\ ('Portons dix bons ' '"whiskys"\\n' "à l'avocat " 'goujat\\t qui ' 'fumait au zoo')""") - self.assertEqual(pprint.pformat([[[[[special]]]]], width=35), """\ + self.assertEqual(_pformat([[[[[special]]]]], width=35), """\ [[[[['Portons dix bons "whiskys"\\n' "à l'avocat goujat\\t qui " 'fumait au zoo']]]]]""") - self.assertEqual(pprint.pformat([[[[[special]]]]], width=25), """\ + self.assertEqual(_pformat([[[[[special]]]]], width=25), """\ [[[[['Portons dix bons ' '"whiskys"\\n' "à l'avocat " 'goujat\\t qui ' 'fumait au zoo']]]]]""") - self.assertEqual(pprint.pformat([[[[[special]]]]], width=23), """\ + self.assertEqual(_pformat([[[[[special]]]]], width=23), """\ [[[[['Portons dix ' 'bons "whiskys"\\n' "à l'avocat " @@ -1137,14 +1131,14 @@ def test_str_wrap(self): 'zoo']]]]]""") # An unwrappable string is formatted as its repr unwrappable = "x" * 100 - self.assertEqual(pprint.pformat(unwrappable, width=80), repr(unwrappable)) - self.assertEqual(pprint.pformat(''), "''") + self.assertEqual(_pformat(unwrappable, width=80), repr(unwrappable)) + self.assertEqual(_pformat(''), "''") # Check that the pprint is a usable repr special *= 10 for width in range(3, 40): - formatted = pprint.pformat(special, width=width) + formatted = _pformat(special, width=width) self.assertEqual(eval(formatted), special) - formatted = pprint.pformat([special] * 2, width=width) + formatted = _pformat([special] * 2, width=width) self.assertEqual(eval(formatted), [special] * 2) def test_compact(self): @@ -1157,7 +1151,7 @@ def test_compact(self): 14, 15], [], [0], [0, 1], [0, 1, 2], [0, 1, 2, 3], [0, 1, 2, 3, 4]]""" - self.assertEqual(pprint.pformat(o, width=47, compact=True), expected) + self.assertEqual(_pformat(o, width=47, compact=True), expected) def test_compact_width(self): levels = 20 @@ -1166,117 +1160,117 @@ def test_compact_width(self): for i in range(levels - 1): o = [o] for w in range(levels * 2 + 1, levels + 3 * number - 1): - lines = pprint.pformat(o, width=w, compact=True).splitlines() + lines = _pformat(o, width=w, compact=True).splitlines() maxwidth = max(map(len, lines)) self.assertLessEqual(maxwidth, w) self.assertGreater(maxwidth, w - 3) def test_bytes_wrap(self): - self.assertEqual(pprint.pformat(b'', width=1), "b''") - self.assertEqual(pprint.pformat(b'abcd', width=1), "b'abcd'") + self.assertEqual(_pformat(b'', width=1), "b''") + self.assertEqual(_pformat(b'abcd', width=1), "b'abcd'") letters = b'abcdefghijklmnopqrstuvwxyz' - self.assertEqual(pprint.pformat(letters, width=29), repr(letters)) - self.assertEqual(pprint.pformat(letters, width=19), """\ + self.assertEqual(_pformat(letters, width=29), repr(letters)) + self.assertEqual(_pformat(letters, width=19), """\ (b'abcdefghijkl' b'mnopqrstuvwxyz')""") - self.assertEqual(pprint.pformat(letters, width=18), """\ + self.assertEqual(_pformat(letters, width=18), """\ (b'abcdefghijkl' b'mnopqrstuvwx' b'yz')""") - self.assertEqual(pprint.pformat(letters, width=16), """\ + self.assertEqual(_pformat(letters, width=16), """\ (b'abcdefghijkl' b'mnopqrstuvwx' b'yz')""") special = bytes(range(16)) - self.assertEqual(pprint.pformat(special, width=61), repr(special)) - self.assertEqual(pprint.pformat(special, width=48), """\ + self.assertEqual(_pformat(special, width=61), repr(special)) + self.assertEqual(_pformat(special, width=48), """\ (b'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat(special, width=32), """\ + self.assertEqual(_pformat(special, width=32), """\ (b'\\x00\\x01\\x02\\x03' b'\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat(special, width=1), """\ + self.assertEqual(_pformat(special, width=1), """\ (b'\\x00\\x01\\x02\\x03' b'\\x04\\x05\\x06\\x07' b'\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat({'a': 1, 'b': letters, 'c': 2}, + self.assertEqual(_pformat({'a': 1, 'b': letters, 'c': 2}, width=21), """\ {'a': 1, 'b': b'abcdefghijkl' b'mnopqrstuvwx' b'yz', 'c': 2}""") - self.assertEqual(pprint.pformat({'a': 1, 'b': letters, 'c': 2}, + self.assertEqual(_pformat({'a': 1, 'b': letters, 'c': 2}, width=20), """\ {'a': 1, 'b': b'abcdefgh' b'ijklmnop' b'qrstuvwxyz', 'c': 2}""") - self.assertEqual(pprint.pformat([[[[[[letters]]]]]], width=25), """\ + self.assertEqual(_pformat([[[[[[letters]]]]]], width=25), """\ [[[[[[b'abcdefghijklmnop' b'qrstuvwxyz']]]]]]""") - self.assertEqual(pprint.pformat([[[[[[special]]]]]], width=41), """\ + self.assertEqual(_pformat([[[[[[special]]]]]], width=41), """\ [[[[[[b'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07' b'\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f']]]]]]""") # Check that the pprint is a usable repr for width in range(1, 64): - formatted = pprint.pformat(special, width=width) + formatted = _pformat(special, width=width) self.assertEqual(eval(formatted), special) - formatted = pprint.pformat([special] * 2, width=width) + formatted = _pformat([special] * 2, width=width) self.assertEqual(eval(formatted), [special] * 2) def test_bytearray_wrap(self): - self.assertEqual(pprint.pformat(bytearray(), width=1), "bytearray(b'')") + self.assertEqual(_pformat(bytearray(), width=1), "bytearray(b'')") letters = bytearray(b'abcdefghijklmnopqrstuvwxyz') - self.assertEqual(pprint.pformat(letters, width=40), repr(letters)) - self.assertEqual(pprint.pformat(letters, width=28), """\ + self.assertEqual(_pformat(letters, width=40), repr(letters)) + self.assertEqual(_pformat(letters, width=28), """\ bytearray(b'abcdefghijkl' b'mnopqrstuvwxyz')""") - self.assertEqual(pprint.pformat(letters, width=27), """\ + self.assertEqual(_pformat(letters, width=27), """\ bytearray(b'abcdefghijkl' b'mnopqrstuvwx' b'yz')""") - self.assertEqual(pprint.pformat(letters, width=25), """\ + self.assertEqual(_pformat(letters, width=25), """\ bytearray(b'abcdefghijkl' b'mnopqrstuvwx' b'yz')""") special = bytearray(range(16)) - self.assertEqual(pprint.pformat(special, width=72), repr(special)) - self.assertEqual(pprint.pformat(special, width=57), """\ + self.assertEqual(_pformat(special, width=72), repr(special)) + self.assertEqual(_pformat(special, width=57), """\ bytearray(b'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat(special, width=41), """\ + self.assertEqual(_pformat(special, width=41), """\ bytearray(b'\\x00\\x01\\x02\\x03' b'\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat(special, width=1), """\ + self.assertEqual(_pformat(special, width=1), """\ bytearray(b'\\x00\\x01\\x02\\x03' b'\\x04\\x05\\x06\\x07' b'\\x08\\t\\n\\x0b' b'\\x0c\\r\\x0e\\x0f')""") - self.assertEqual(pprint.pformat({'a': 1, 'b': letters, 'c': 2}, + self.assertEqual(_pformat({'a': 1, 'b': letters, 'c': 2}, width=31), """\ {'a': 1, 'b': bytearray(b'abcdefghijkl' b'mnopqrstuvwx' b'yz'), 'c': 2}""") - self.assertEqual(pprint.pformat([[[[[letters]]]]], width=37), """\ + self.assertEqual(_pformat([[[[[letters]]]]], width=37), """\ [[[[[bytearray(b'abcdefghijklmnop' b'qrstuvwxyz')]]]]]""") - self.assertEqual(pprint.pformat([[[[[special]]]]], width=50), """\ + self.assertEqual(_pformat([[[[[special]]]]], width=50), """\ [[[[[bytearray(b'\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07' b'\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f')]]]]]""") def test_default_dict(self): d = collections.defaultdict(int) - self.assertEqual(pprint.pformat(d, width=1), "defaultdict(, {})") + self.assertEqual(_pformat(d, width=1), "defaultdict(, {})") words = 'the quick brown fox jumped over a lazy dog'.split() d = collections.defaultdict(int, zip(words, itertools.count())) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ defaultdict(, {'a': 6, @@ -1291,15 +1285,15 @@ def test_default_dict(self): def test_counter(self): d = collections.Counter() - self.assertEqual(pprint.pformat(d, width=1), "Counter()") + self.assertEqual(_pformat(d, width=1), "Counter()") d = collections.Counter('senselessness') - self.assertEqual(pprint.pformat(d, width=40), + self.assertEqual(_pformat(d, width=40), """\ Counter({'s': 6, 'e': 4, 'n': 2, 'l': 1})""") - self.assertEqual(pprint.pformat(d, indent=2, width=1), + self.assertEqual(_pformat(d, indent=2, width=1), """\ Counter({ 's': 6, 'e': 4, @@ -1308,11 +1302,11 @@ def test_counter(self): def test_chainmap(self): d = collections.ChainMap() - self.assertEqual(pprint.pformat(d, width=1), "ChainMap({})") + self.assertEqual(_pformat(d, width=1), "ChainMap({})") words = 'the quick brown fox jumped over a lazy dog'.split() items = list(zip(words, itertools.count())) d = collections.ChainMap(dict(items)) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ ChainMap({'a': 6, 'brown': 2, @@ -1324,7 +1318,7 @@ def test_chainmap(self): 'quick': 1, 'the': 0})""") d = collections.ChainMap(dict(items), collections.OrderedDict(items)) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ ChainMap({'a': 6, 'brown': 2, @@ -1335,16 +1329,10 @@ def test_chainmap(self): 'over': 5, 'quick': 1, 'the': 0}, - OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), + OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), + ('jumped', 4), ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)]))""") - self.assertEqual(pprint.pformat(d.keys()), + self.assertEqual(_pformat(d.keys()), """\ KeysView(ChainMap({'a': 6, 'brown': 2, @@ -1355,16 +1343,10 @@ def test_chainmap(self): 'over': 5, 'quick': 1, 'the': 0}, - OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), + OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), + ('jumped', 4), ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)])))""") - self.assertEqual(pprint.pformat(d.items()), + self.assertEqual(_pformat(d.items()), """\ ItemsView(ChainMap({'a': 6, 'brown': 2, @@ -1375,16 +1357,10 @@ def test_chainmap(self): 'over': 5, 'quick': 1, 'the': 0}, - OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), + OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), + ('jumped', 4), ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)])))""") - self.assertEqual(pprint.pformat(d.values()), + self.assertEqual(_pformat(d.values()), """\ ValuesView(ChainMap({'a': 6, 'brown': 2, @@ -1395,52 +1371,34 @@ def test_chainmap(self): 'over': 5, 'quick': 1, 'the': 0}, - OrderedDict([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), + OrderedDict([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), + ('jumped', 4), ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)])))""") def test_deque(self): d = collections.deque() - self.assertEqual(pprint.pformat(d, width=1), "deque([])") + self.assertEqual(_pformat(d, width=1), "deque([])") d = collections.deque(maxlen=7) - self.assertEqual(pprint.pformat(d, width=1), "deque([], maxlen=7)") + self.assertEqual(_pformat(d, width=1), "deque([], maxlen=7)") words = 'the quick brown fox jumped over a lazy dog'.split() d = collections.deque(zip(words, itertools.count())) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ -deque([('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), - ('dog', 8)])""") +deque([('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), ('jumped', 4), + ('over', 5), ('a', 6), ('lazy', 7), ('dog', 8)])""") d = collections.deque(zip(words, itertools.count()), maxlen=7) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ -deque([('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), - ('dog', 8)], +deque([('brown', 2), ('fox', 3), ('jumped', 4), ('over', 5), ('a', 6), + ('lazy', 7), ('dog', 8)], maxlen=7)""") def test_user_dict(self): d = collections.UserDict() - self.assertEqual(pprint.pformat(d, width=1), "{}") + self.assertEqual(_pformat(d, width=1), "{}") words = 'the quick brown fox jumped over a lazy dog'.split() d = collections.UserDict(zip(words, itertools.count())) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ {'a': 6, 'brown': 2, @@ -1451,7 +1409,7 @@ def test_user_dict(self): 'over': 5, 'quick': 1, 'the': 0}""") - self.assertEqual(pprint.pformat(d.keys()), """\ + self.assertEqual(_pformat(d.keys()), """\ KeysView({'a': 6, 'brown': 2, 'dog': 8, @@ -1461,7 +1419,7 @@ def test_user_dict(self): 'over': 5, 'quick': 1, 'the': 0})""") - self.assertEqual(pprint.pformat(d.items()), """\ + self.assertEqual(_pformat(d.items()), """\ ItemsView({'a': 6, 'brown': 2, 'dog': 8, @@ -1471,7 +1429,7 @@ def test_user_dict(self): 'over': 5, 'quick': 1, 'the': 0})""") - self.assertEqual(pprint.pformat(d.values()), """\ + self.assertEqual(_pformat(d.values()), """\ ValuesView({'a': 6, 'brown': 2, 'dog': 8, @@ -1484,31 +1442,24 @@ def test_user_dict(self): def test_user_list(self): d = collections.UserList() - self.assertEqual(pprint.pformat(d, width=1), "[]") + self.assertEqual(_pformat(d, width=1), "[]") words = 'the quick brown fox jumped over a lazy dog'.split() d = collections.UserList(zip(words, itertools.count())) - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ -[('the', 0), - ('quick', 1), - ('brown', 2), - ('fox', 3), - ('jumped', 4), - ('over', 5), - ('a', 6), - ('lazy', 7), - ('dog', 8)]""") +[('the', 0), ('quick', 1), ('brown', 2), ('fox', 3), ('jumped', 4), ('over', 5), + ('a', 6), ('lazy', 7), ('dog', 8)]""") def test_user_string(self): d = collections.UserString('') - self.assertEqual(pprint.pformat(d, width=1), "''") + self.assertEqual(_pformat(d, width=1), "''") d = collections.UserString('the quick brown fox jumped over a lazy dog') - self.assertEqual(pprint.pformat(d, width=20), + self.assertEqual(_pformat(d, width=20), """\ ('the quick brown ' 'fox jumped over ' 'a lazy dog')""") - self.assertEqual(pprint.pformat({1: d}, width=20), + self.assertEqual(_pformat({1: d}, width=20), """\ {1: 'the quick ' 'brown fox ' @@ -1517,22 +1468,22 @@ def test_user_string(self): def test_template(self): d = t"" - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), "Template(strings=('',), interpolations=())") - self.assertEqual(pprint.pformat(d), repr(d)) - self.assertEqual(pprint.pformat(d, width=1), + self.assertEqual(_pformat(d), repr(d)) + self.assertEqual(_pformat(d, width=1), """\ Template(strings=('',), interpolations=())""") name = "World" d = t"Hello {name}" - self.assertEqual(pprint.pformat(d), + self.assertEqual(_pformat(d), """\ Template(strings=('Hello ', ''), interpolations=(Interpolation('World', 'name', None, ''),))""") ver = {3.13: False, 3.14: True} d = t"Hello { {"name": "Python", "version": ver}!s:z}!" - self.assertEqual(pprint.pformat(d, width=1), + self.assertEqual(_pformat(d, width=1), """\ Template(strings=('Hello ', '!'), @@ -1550,13 +1501,13 @@ def test_template(self): def test_expand_template(self): d = t"" self.assertEqual( - pprint.pformat(d, expand=True), + pprint.pformat(d), "Template(strings=('',), interpolations=())", ) name = "World" d = t"Hello {name}" self.assertEqual( - pprint.pformat(d, width=40, indent=4, expand=True), + pprint.pformat(d, width=40, indent=4), """\ Template( strings=('Hello ', ''), @@ -1573,7 +1524,7 @@ def test_expand_template(self): ver = {3.13: False, 3.14: True} d = t"Hello { {"name": "Python", "version": ver}!s:z}!" self.assertEqual( - pprint.pformat(d, width=40, indent=4, expand=True), + pprint.pformat(d, width=40, indent=4), """\ Template( strings=('Hello ', '!'), @@ -1614,8 +1565,7 @@ class DummyDataclass: corge=7, garply=(1, 2, 3, 4), ) - self.assertEqual(pprint.pformat(dummy_dataclass, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_dataclass, width=40, indent=4), """\ DummyDataclass( foo='foo', @@ -1635,8 +1585,7 @@ def test_expand_dict(self): "quux": ["foo", "bar", "baz"], "corge": 7, } - self.assertEqual(pprint.pformat(dummy_dict, width=40, indent=4, - expand=True, sort_dicts=False), + self.assertEqual(pprint.pformat(dummy_dict, width=40, indent=4, sort_dicts=False), """\ { 'foo': 'bar', @@ -1654,8 +1603,7 @@ def test_expand_ordered_dict(self): ("baz", 123), ] ) - self.assertEqual(pprint.pformat(dummy_ordered_dict, width=20, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_ordered_dict, width=20, indent=4), """\ OrderedDict([ ('foo', 1), @@ -1670,8 +1618,7 @@ def test_expand_list(self): "baz", "qux", ] - self.assertEqual(pprint.pformat(dummy_list, width=20, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_list, width=20, indent=4), """\ [ 'foo', @@ -1689,8 +1636,7 @@ def test_expand_tuple(self): 5, 6, ) - self.assertEqual(pprint.pformat(dummy_tuple, width=20, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_tuple, width=20, indent=4), """\ ( 'foo', @@ -1703,7 +1649,7 @@ def test_expand_tuple(self): def test_expand_single_element_tuple(self): self.assertEqual( - pprint.pformat((1,), width=1, indent=4, expand=True), + pprint.pformat((1,), width=1, indent=4), """\ ( 1, @@ -1717,8 +1663,7 @@ def test_expand_set(self): "qux", (1, 2, 3), } - self.assertEqual(pprint.pformat(dummy_set, width=20, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_set, width=20, indent=4), """\ { 'bar', @@ -1741,8 +1686,7 @@ def test_expand_frozenset(self): frozenset(dummy_set), } ) - self.assertEqual(pprint.pformat(dummy_frozenset, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_frozenset, width=40, indent=4), """\ frozenset({ frozenset({(1, 2, 3)}), @@ -1757,7 +1701,7 @@ def test_expand_frozendict(self): {"foo": "bar", "baz": 123, "qux": [1, 2]} ) self.assertEqual( - pprint.pformat(dummy_frozendict, width=20, indent=4, expand=True), + pprint.pformat(dummy_frozendict, width=20, indent=4), """\ frozendict({ 'baz': 123, @@ -1768,8 +1712,7 @@ def test_expand_frozendict(self): def test_expand_bytes(self): dummy_bytes = b"Hello world! foo bar baz 123 456 789" - self.assertEqual(pprint.pformat(dummy_bytes, width=20, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_bytes, width=20, indent=4), """\ ( b'Hello world!' @@ -1780,8 +1723,7 @@ def test_expand_bytes(self): def test_expand_bytearray(self): dummy_bytes = b"Hello world! foo bar baz 123 456 789" dummy_byte_array = bytearray(dummy_bytes) - self.assertEqual(pprint.pformat(dummy_byte_array, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_byte_array, width=40, indent=4), """\ bytearray( b'Hello world! foo bar baz 123 456' @@ -1797,8 +1739,7 @@ def test_expand_mappingproxy(self): "corge": 7, } dummy_mappingproxy = types.MappingProxyType(dummy_dict) - self.assertEqual(pprint.pformat(dummy_mappingproxy, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_mappingproxy, width=40, indent=4), """\ mappingproxy({ 'baz': 123, @@ -1819,8 +1760,7 @@ def test_expand_namespace(self): ), ) - self.assertEqual(pprint.pformat(dummy_namespace, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_namespace, width=40, indent=4), """\ namespace( foo='bar', @@ -1838,8 +1778,7 @@ def test_expand_defaultdict(self): dummy_defaultdict["foo"].append("baz") dummy_defaultdict["foo"].append("qux") dummy_defaultdict["bar"] = {"foo": "bar", "baz": None} - self.assertEqual(pprint.pformat(dummy_defaultdict, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_defaultdict, width=40, indent=4), """\ defaultdict(, { 'bar': {'baz': None, 'foo': 'bar'}, @@ -1856,8 +1795,7 @@ def test_expand_counter(self): 'd': 2, 'e': 1, })""" - self.assertEqual(pprint.pformat(dummy_counter, width=40, indent=4, - expand=True), expected) + self.assertEqual(pprint.pformat(dummy_counter, width=40, indent=4), expected) expected2 = """\ Counter({ @@ -1867,8 +1805,7 @@ def test_expand_counter(self): 'd': 2, 'e': 1, })""" - self.assertEqual(pprint.pformat(dummy_counter, width=20, indent=2, - expand=True), expected2) + self.assertEqual(pprint.pformat(dummy_counter, width=20, indent=2), expected2) def test_expand_chainmap(self): dummy_dict = { @@ -1884,8 +1821,7 @@ def test_expand_chainmap(self): {"corge": dummy_dict}, ) dummy_chainmap.maps.append({"garply": "waldo"}) - self.assertEqual(pprint.pformat(dummy_chainmap, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_chainmap, width=40, indent=4), """\ ChainMap( {'foo': 'bar'}, @@ -1927,8 +1863,7 @@ def test_expand_deque(self): dummy_deque.append(dummy_dict) dummy_deque.extend(dummy_list) dummy_deque.appendleft(dummy_set) - self.assertEqual(pprint.pformat(dummy_deque, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_deque, width=40, indent=4), """\ deque([ {(1, 2, 3)}, @@ -1959,8 +1894,7 @@ def __init__(self, *args, **kwargs): "corge": 7 }) dummy_userdict.access_count = 5 - self.assertEqual(pprint.pformat(dummy_userdict, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_userdict, width=40, indent=4), """\ { 'baz': 123, @@ -1980,8 +1914,7 @@ def __init__(self, *args, **kwargs): dummy_userlist = DummyUserList(["first", 2, {"key": "value"}, [4, 5, 6]]) - self.assertEqual(pprint.pformat(dummy_userlist, width=40, indent=4, - expand=True), + self.assertEqual(pprint.pformat(dummy_userlist, width=40, indent=4), """\ [ 'first', @@ -1993,7 +1926,7 @@ def __init__(self, *args, **kwargs): def test_expand_dict_keys(self): d = {"foo": 1, "bar": 2, "baz": 3, "qux": 4, "quux": 5} self.assertEqual( - pprint.pformat(d.keys(), width=20, indent=4, expand=True), + pprint.pformat(d.keys(), width=20, indent=4), """\ dict_keys([ 'bar', @@ -2007,7 +1940,7 @@ def test_expand_dict_keys(self): def test_expand_dict_values(self): d = {"foo": 1, "bar": 2, "baz": 3, "qux": 4, "quux": 5} self.assertEqual( - pprint.pformat(d.values(), width=20, indent=4, expand=True), + pprint.pformat(d.values(), width=20, indent=4), """\ dict_values([ 1, @@ -2021,7 +1954,7 @@ def test_expand_dict_values(self): def test_expand_dict_items(self): d = {"foo": 1, "bar": 2, "baz": 3, "qux": 4, "quux": 5} self.assertEqual( - pprint.pformat(d.items(), width=20, indent=4, expand=True), + pprint.pformat(d.items(), width=20, indent=4), """\ dict_items([ ('bar', 2), @@ -2035,7 +1968,7 @@ def test_expand_dict_items(self): def test_expand_str(self): s = "The quick brown fox jumped over the lazy dog " * 3 self.assertEqual( - pprint.pformat(s, width=40, indent=4, expand=True), + pprint.pformat(s, width=40, indent=4), """\ ( 'The quick brown fox jumped over ' diff --git a/Lib/test/test_stable_abi_ctypes.py b/Lib/test/test_stable_abi_ctypes.py index a7b864c701be77..c20468c12b670d 100644 --- a/Lib/test/test_stable_abi_ctypes.py +++ b/Lib/test/test_stable_abi_ctypes.py @@ -1023,15 +1023,19 @@ def test_windows_feature_macros(self): 'PyOS_CheckStack', ) -EXPECTED_FEATURE_MACROS = set(['HAVE_FORK', - 'MS_WINDOWS', - 'PY_HAVE_THREAD_NATIVE_ID', - 'Py_REF_DEBUG', - 'Py_TRACE_REFS', - 'USE_STACKCHECK']) -WINDOWS_FEATURE_MACROS = {'HAVE_FORK': False, - 'MS_WINDOWS': True, - 'PY_HAVE_THREAD_NATIVE_ID': True, - 'Py_REF_DEBUG': 'maybe', - 'Py_TRACE_REFS': 'maybe', - 'USE_STACKCHECK': 'maybe'} +EXPECTED_FEATURE_MACROS = set([ + 'HAVE_FORK', + 'MS_WINDOWS', + 'PY_HAVE_THREAD_NATIVE_ID', + 'Py_REF_DEBUG', + 'Py_TRACE_REFS', + 'USE_STACKCHECK', +]) +WINDOWS_FEATURE_MACROS = { + 'HAVE_FORK': False, + 'MS_WINDOWS': True, + 'PY_HAVE_THREAD_NATIVE_ID': True, + 'Py_REF_DEBUG': 'maybe', + 'Py_TRACE_REFS': 'maybe', + 'USE_STACKCHECK': 'maybe', +} diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 199a9087dfe3bc..a5e7bbbfad5ffc 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -666,21 +666,18 @@ async def f(): (-2, 'line'), (-1, 'line'), (-1, 'return'), - (1, 'exception'), (2, 'line'), (1, 'line'), (-1, 'call'), (-2, 'line'), (-1, 'line'), (-1, 'return'), - (1, 'exception'), (2, 'line'), (1, 'line'), (-1, 'call'), (-2, 'line'), (-1, 'line'), (-1, 'return'), - (1, 'exception'), (2, 'line'), (1, 'line'), (-1, 'call'), diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 5d19e3706802dd..ad644bb3128809 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -11131,6 +11131,10 @@ def test_no_attributes(self): with self.assertRaises(AttributeError): type(NoDefault).foo + def test_no_subclassing(self): + with self.assertRaises(TypeError): + class Test(type(NoDefault)): ... + class AllTests(BaseTestCase): """Tests for __all__.""" diff --git a/Lib/test/test_unittest/testmock/testhelpers.py b/Lib/test/test_unittest/testmock/testhelpers.py index 0e82c723ec3eaa..f8643552011f4e 100644 --- a/Lib/test/test_unittest/testmock/testhelpers.py +++ b/Lib/test/test_unittest/testmock/testhelpers.py @@ -1162,9 +1162,7 @@ def test_call_list_str(self): mock.foo.bar().baz('fish', cat='dog') expected = ( - "[call(1, 2),\n" - " call.foo(a=3),\n" - " call.foo.bar(),\n" + "[call(1, 2), call.foo(a=3), call.foo.bar()," " call.foo.bar().baz('fish', cat='dog')]" ) self.assertEqual(str(mock.mock_calls), expected) diff --git a/Makefile.pre.in b/Makefile.pre.in index fe16c73204dcf8..dce0139d8d6e35 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -3330,7 +3330,9 @@ docclean: # data. The PGO data is only valid if source code remains unchanged. .PHONY: clean-retain-profile clean-retain-profile: pycremoval - find . -name '*.[oa]' -exec rm -f {} ';' + # Keep the generated JIT shim objects with the rest of the JIT generated + # files: they are regenerated as a group and tracked by .jit-stamp. + find . -name '*.[oa]' ! -name 'jit_shim*.o' -exec rm -f {} ';' find . -name '*.s[ol]' -exec rm -f {} ';' find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find . -name '*.lto' -exec rm -f {} ';' diff --git a/Misc/NEWS.d/next/Build/2026-05-04-23-07-45.gh-issue-149353.XfM8aQ.rst b/Misc/NEWS.d/next/Build/2026-05-04-23-07-45.gh-issue-149353.XfM8aQ.rst new file mode 100644 index 00000000000000..3a3bad2906f783 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2026-05-04-23-07-45.gh-issue-149353.XfM8aQ.rst @@ -0,0 +1,2 @@ +Avoid unnecessary JIT-related rebuilds during ``make install`` after +``--enable-optimizations`` builds. diff --git a/Misc/NEWS.d/next/Library/2026-04-30-18-56-23.gh-issue-149189.mszW10.rst b/Misc/NEWS.d/next/Library/2026-04-30-18-56-23.gh-issue-149189.mszW10.rst new file mode 100644 index 00000000000000..1fd7f76bb25c09 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-04-30-18-56-23.gh-issue-149189.mszW10.rst @@ -0,0 +1,7 @@ +:mod:`pprint` now uses modern defaults: ``indent=4`` and ``width=88``, +and the default ``compact=False`` output is now formatted similar to +pretty-printed :func:`json.dumps`, with opening parentheses and brackets +followed by a newline and the contents indented by one level. The +*expand* parameter, added in 3.15.0a8, has been removed; ``compact=False`` +(the default) now produces the former ``expand=True`` layout. +Patch by Hugo van Kemenade. diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index 46627c33d2a7c9..238e17bea303d3 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -3782,8 +3782,7 @@ // _GUARD_NOS_NOT_NULL { nos = stack_pointer[-2]; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { + if (PyStackRef_IsNull(nos)) { UPDATE_MISS_STATS(CALL); assert(_PyOpcode_Deopt[opcode] == (CALL)); JUMP_TO_PREDICTED(CALL); @@ -5784,9 +5783,7 @@ int err = PyDict_Update(dict_o, update_o); stack_pointer = _PyFrame_GetStackPointer(frame); if (err < 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_AttributeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches) { _PyFrame_SetStackPointer(frame, stack_pointer); PyObject *exc = _PyErr_GetRaisedException(tstate); @@ -6407,15 +6404,14 @@ next_instr += 2; INSTRUCTION_STATS(FOR_ITER_VIRTUAL); static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size"); - _PyStackRef iter; _PyStackRef null_or_index; + _PyStackRef iter; _PyStackRef next; /* Skip 1 cache entry */ - // _GUARD_NOS_ITER_VIRTUAL + // _GUARD_TOS_NOT_NULL { - iter = stack_pointer[-2]; - PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); - if (Py_TYPE(iter_o)->_tp_iteritem == NULL) { + null_or_index = stack_pointer[-1]; + if (PyStackRef_IsNull(null_or_index)) { UPDATE_MISS_STATS(FOR_ITER); assert(_PyOpcode_Deopt[opcode] == (FOR_ITER)); JUMP_TO_PREDICTED(FOR_ITER); @@ -6423,7 +6419,7 @@ } // _FOR_ITER_VIRTUAL { - null_or_index = stack_pointer[-1]; + iter = stack_pointer[-2]; PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); Py_ssize_t index = PyStackRef_UntagInt(null_or_index); _PyFrame_SetStackPointer(frame, stack_pointer); @@ -8238,9 +8234,7 @@ PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable); stack_pointer = _PyFrame_GetStackPointer(frame); if (none_val == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_TypeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches && (Py_TYPE(iterable)->tp_iter == NULL && !PySequence_Check(iterable))) { @@ -11117,7 +11111,6 @@ v = stack_pointer[-1]; null_or_index = stack_pointer[-2]; PyObject *receiver_o = PyStackRef_AsPyObjectBorrow(receiver); - PyObject *retval_o; assert(frame->owner != FRAME_OWNED_BY_INTERPRETER); if (!IS_PEP523_HOOKED(tstate) && (Py_TYPE(receiver_o) == &PyGen_Type || Py_TYPE(receiver_o) == &PyCoro_Type) && @@ -11136,7 +11129,7 @@ gen_frame->previous = frame; DISPATCH_INLINED(gen_frame); } - if (!PyStackRef_IsNull(null_or_index)) { + if (!PyStackRef_IsNull(null_or_index) && PyStackRef_IsNone(v)) { _PyFrame_SetStackPointer(frame, stack_pointer); _PyStackRef item = _PyForIter_VirtualIteratorNext(tstate, frame, receiver, &null_or_index); stack_pointer = _PyFrame_GetStackPointer(frame); @@ -11151,51 +11144,89 @@ retval = item; } else { - if (PyStackRef_IsNone(v) && PyIter_Check(receiver_o)) { - _PyFrame_SetStackPointer(frame, stack_pointer); - retval_o = Py_TYPE(receiver_o)->tp_iternext(receiver_o); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - retval_o = PyObject_CallMethodOneArg(receiver_o, - &_Py_ID(send), - PyStackRef_AsPyObjectBorrow(v)); - stack_pointer = _PyFrame_GetStackPointer(frame); + PyObject *v_o = PyStackRef_AsPyObjectBorrow(v); + _PyFrame_SetStackPointer(frame, stack_pointer); + PySendResultPair res = _PyIter_Send(receiver_o, v_o); + stack_pointer = _PyFrame_GetStackPointer(frame); + if (res.kind == PYGEN_ERROR) { + JUMP_TO_LABEL(error); } - if (retval_o == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - int matches = _PyErr_ExceptionMatches(tstate, PyExc_StopIteration); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (matches) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyEval_MonitorRaise(tstate, frame, this_instr); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - int err = _PyGen_FetchStopIterationValue(&retval_o); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err == 0) { - assert(retval_o != NULL); - JUMPBY(oparg); - } - else { - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_CLOSE(v); + stack_pointer = _PyFrame_GetStackPointer(frame); + retval = PyStackRef_FromPyObjectSteal(res.object); + if (res.kind == PYGEN_RETURN) { + JUMPBY(oparg); } - retval = PyStackRef_FromPyObjectSteal(retval_o); + stack_pointer += 1; + } + } + stack_pointer[-2] = null_or_index; + stack_pointer[-1] = retval; + DISPATCH(); + } + + TARGET(SEND_ASYNC_GEN) { + #if _Py_TAIL_CALL_INTERP + int opcode = SEND_ASYNC_GEN; + (void)(opcode); + #endif + _Py_CODEUNIT* const this_instr = next_instr; + (void)this_instr; + frame->instr_ptr = next_instr; + next_instr += 2; + INSTRUCTION_STATS(SEND_ASYNC_GEN); + static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size"); + _PyStackRef iter; + _PyStackRef null_in; + _PyStackRef v; + _PyStackRef asend; + _PyStackRef null_out; + _PyStackRef retval; + /* Skip 1 cache entry */ + // _GUARD_3OS_ASYNC_GEN_ASEND + { + iter = stack_pointer[-3]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); } - stack_pointer[-2] = null_or_index; - stack_pointer[-1] = retval; + } + // _SEND_ASYNC_GEN + { + v = stack_pointer[-1]; + null_in = stack_pointer[-2]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + assert(PyAsyncGenASend_CheckExact(iter_o)); + PyObject *val = PyStackRef_AsPyObjectBorrow(v); + PyObject *retval_o; + _PyFrame_SetStackPointer(frame, stack_pointer); + PySendResult what = _PyAsyncGenASend_Send(iter_o, val, &retval_o); + stack_pointer = _PyFrame_GetStackPointer(frame); + if (what == PYGEN_ERROR) { + JUMP_TO_LABEL(error); + } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); PyStackRef_CLOSE(v); stack_pointer = _PyFrame_GetStackPointer(frame); + asend = iter; + null_out = null_in; + retval = PyStackRef_FromPyObjectSteal(retval_o); + if (what == PYGEN_RETURN) { + JUMPBY(oparg); + } } + stack_pointer[-2] = asend; + stack_pointer[-1] = null_out; + stack_pointer[0] = retval; + stack_pointer += 1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); DISPATCH(); } @@ -11268,6 +11299,70 @@ DISPATCH(); } + TARGET(SEND_VIRTUAL) { + #if _Py_TAIL_CALL_INTERP + int opcode = SEND_VIRTUAL; + (void)(opcode); + #endif + _Py_CODEUNIT* const this_instr = next_instr; + (void)this_instr; + frame->instr_ptr = next_instr; + next_instr += 2; + INSTRUCTION_STATS(SEND_VIRTUAL); + static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size"); + _PyStackRef val; + _PyStackRef nos; + _PyStackRef iter; + _PyStackRef null_or_index; + _PyStackRef none; + _PyStackRef next; + /* Skip 1 cache entry */ + // _GUARD_TOS_IS_NONE + { + val = stack_pointer[-1]; + if (!PyStackRef_IsNone(val)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); + } + } + // _GUARD_NOS_NOT_NULL + { + nos = stack_pointer[-2]; + if (PyStackRef_IsNull(nos)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); + } + } + // _SEND_VIRTUAL + { + none = val; + null_or_index = nos; + iter = stack_pointer[-3]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyObjectIndexPair next_index = Py_TYPE(iter_o)->_tp_iteritem(iter_o, index); + stack_pointer = _PyFrame_GetStackPointer(frame); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + JUMP_TO_LABEL(error); + } + next = none; + JUMPBY(oparg); + DISPATCH(); + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + } + stack_pointer[-2] = null_or_index; + stack_pointer[-1] = next; + DISPATCH(); + } + TARGET(SETUP_ANNOTATIONS) { #if _Py_TAIL_CALL_INTERP int opcode = SETUP_ANNOTATIONS; diff --git a/Modules/_testinternalcapi/test_targets.h b/Modules/_testinternalcapi/test_targets.h index 43d4656a4b7f7e..1a7eb9169fc837 100644 --- a/Modules/_testinternalcapi/test_targets.h +++ b/Modules/_testinternalcapi/test_targets.h @@ -202,7 +202,9 @@ static void *opcode_targets_table[256] = { &&TARGET_LOAD_SUPER_ATTR_METHOD, &&TARGET_RESUME_CHECK, &&TARGET_RESUME_CHECK_JIT, + &&TARGET_SEND_ASYNC_GEN, &&TARGET_SEND_GEN, + &&TARGET_SEND_VIRTUAL, &&TARGET_STORE_ATTR_INSTANCE_VALUE, &&TARGET_STORE_ATTR_SLOT, &&TARGET_STORE_ATTR_WITH_HINT, @@ -231,8 +233,6 @@ static void *opcode_targets_table[256] = { &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, - &&_unknown_opcode, - &&_unknown_opcode, &&TARGET_INSTRUMENTED_END_FOR, &&TARGET_INSTRUMENTED_POP_ITER, &&TARGET_INSTRUMENTED_END_SEND, @@ -476,8 +476,8 @@ static void *opcode_tracing_targets_table[256] = { &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, - &&_unknown_opcode, - &&_unknown_opcode, + &&TARGET_TRACE_RECORD, + &&TARGET_TRACE_RECORD, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, @@ -725,7 +725,9 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RESUME_CHECK_JIT(TAIL_CALL_PARAM static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RETURN_GENERATOR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RETURN_VALUE(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_ASYNC_GEN(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_GEN(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_VIRTUAL(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SETUP_ANNOTATIONS(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SET_ADD(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SET_FUNCTION_ATTRIBUTE(TAIL_CALL_PARAMS); @@ -969,7 +971,9 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [RETURN_GENERATOR] = _TAIL_CALL_RETURN_GENERATOR, [RETURN_VALUE] = _TAIL_CALL_RETURN_VALUE, [SEND] = _TAIL_CALL_SEND, + [SEND_ASYNC_GEN] = _TAIL_CALL_SEND_ASYNC_GEN, [SEND_GEN] = _TAIL_CALL_SEND_GEN, + [SEND_VIRTUAL] = _TAIL_CALL_SEND_VIRTUAL, [SETUP_ANNOTATIONS] = _TAIL_CALL_SETUP_ANNOTATIONS, [SET_ADD] = _TAIL_CALL_SET_ADD, [SET_FUNCTION_ATTRIBUTE] = _TAIL_CALL_SET_FUNCTION_ATTRIBUTE, @@ -1015,8 +1019,6 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [217] = _TAIL_CALL_UNKNOWN_OPCODE, - [218] = _TAIL_CALL_UNKNOWN_OPCODE, [219] = _TAIL_CALL_UNKNOWN_OPCODE, [220] = _TAIL_CALL_UNKNOWN_OPCODE, [221] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1227,7 +1229,9 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [RETURN_GENERATOR] = _TAIL_CALL_TRACE_RECORD, [RETURN_VALUE] = _TAIL_CALL_TRACE_RECORD, [SEND] = _TAIL_CALL_TRACE_RECORD, + [SEND_ASYNC_GEN] = _TAIL_CALL_TRACE_RECORD, [SEND_GEN] = _TAIL_CALL_TRACE_RECORD, + [SEND_VIRTUAL] = _TAIL_CALL_TRACE_RECORD, [SETUP_ANNOTATIONS] = _TAIL_CALL_TRACE_RECORD, [SET_ADD] = _TAIL_CALL_TRACE_RECORD, [SET_FUNCTION_ATTRIBUTE] = _TAIL_CALL_TRACE_RECORD, @@ -1273,8 +1277,6 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [217] = _TAIL_CALL_UNKNOWN_OPCODE, - [218] = _TAIL_CALL_UNKNOWN_OPCODE, [219] = _TAIL_CALL_UNKNOWN_OPCODE, [220] = _TAIL_CALL_UNKNOWN_OPCODE, [221] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Objects/abstract.c b/Objects/abstract.c index 0bbf60840a3346..48b3137152e7bf 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2951,3 +2951,11 @@ PyIter_Send(PyObject *iter, PyObject *arg, PyObject **result) } return PYGEN_ERROR; } + +PySendResultPair +_PyIter_Send(PyObject *iter, PyObject *arg) +{ + PySendResultPair pair; + pair.kind = PyIter_Send(iter, arg, &pair.object); + return pair; +} diff --git a/Objects/genobject.c b/Objects/genobject.c index d628889afc6dc8..8c5d720c0b9035 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -2002,6 +2002,19 @@ async_gen_asend_send(PyObject *self, PyObject *arg) return result; } +PySendResult +_PyAsyncGenASend_Send(PyObject *iter, PyObject *arg, PyObject **result) +{ + *result = async_gen_asend_send(iter, arg); + if (*result != NULL) { + return PYGEN_NEXT; + } + if (_PyGen_FetchStopIterationValue(result) == 0) { + return PYGEN_RETURN; + } + return PYGEN_ERROR; +} + static PyObject * async_gen_asend_iternext(PyObject *ags) @@ -2090,10 +2103,8 @@ static PyMethodDef async_gen_asend_methods[] = { static PyAsyncMethods async_gen_asend_as_async = { - PyObject_SelfIter, /* am_await */ - 0, /* am_aiter */ - 0, /* am_anext */ - 0, /* am_send */ + .am_await = PyObject_SelfIter, + .am_send = _PyAsyncGenASend_Send, }; diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 8b411829214b52..3bd489122da9d4 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1649,6 +1649,8 @@ dummy_func( family(SEND, INLINE_CACHE_ENTRIES_SEND) = { SEND_GEN, + SEND_VIRTUAL, + SEND_ASYNC_GEN, }; specializing op(_SPECIALIZE_SEND, (counter/1, receiver, unused, unused -- receiver, unused, unused)) { @@ -1663,9 +1665,8 @@ dummy_func( #endif /* ENABLE_SPECIALIZATION */ } - op(_SEND, (receiver, null_or_index, v -- receiver, null_or_index, retval)) { + tier1 op(_SEND, (receiver, null_or_index, v -- receiver, null_or_index, retval)) { PyObject *receiver_o = PyStackRef_AsPyObjectBorrow(receiver); - PyObject *retval_o; assert(frame->owner != FRAME_OWNED_BY_INTERPRETER); if (!IS_PEP523_HOOKED(tstate) && (Py_TYPE(receiver_o) == &PyGen_Type || Py_TYPE(receiver_o) == &PyCoro_Type) && @@ -1684,7 +1685,7 @@ dummy_func( gen_frame->previous = frame; DISPATCH_INLINED(gen_frame); } - if (!PyStackRef_IsNull(null_or_index)) { + if (!PyStackRef_IsNull(null_or_index) && PyStackRef_IsNone(v)) { _PyStackRef item = _PyForIter_VirtualIteratorNext(tstate, frame, receiver, &null_or_index); if (!PyStackRef_IsValid(item)) { if (PyStackRef_IsError(item)) { @@ -1694,34 +1695,20 @@ dummy_func( DISPATCH(); } retval = item; + DEAD(v); } else { - if (PyStackRef_IsNone(v) && PyIter_Check(receiver_o)) { - retval_o = Py_TYPE(receiver_o)->tp_iternext(receiver_o); - } - else { - retval_o = PyObject_CallMethodOneArg(receiver_o, - &_Py_ID(send), - PyStackRef_AsPyObjectBorrow(v)); + PyObject *v_o = PyStackRef_AsPyObjectBorrow(v); + PySendResultPair res = _PyIter_Send(receiver_o, v_o); + if (res.kind == PYGEN_ERROR) { + ERROR_NO_POP(); } - if (retval_o == NULL) { - int matches = _PyErr_ExceptionMatches(tstate, PyExc_StopIteration); - if (matches) { - _PyEval_MonitorRaise(tstate, frame, this_instr); - } - int err = _PyGen_FetchStopIterationValue(&retval_o); - if (err == 0) { - assert(retval_o != NULL); - JUMPBY(oparg); - } - else { - PyStackRef_CLOSE(v); - ERROR_IF(true); - } + PyStackRef_CLOSE(v); + retval = PyStackRef_FromPyObjectSteal(res.object); + if (res.kind == PYGEN_RETURN) { + JUMPBY(oparg); } - retval = PyStackRef_FromPyObjectSteal(retval_o); } - PyStackRef_CLOSE(v); } macro(SEND) = _SPECIALIZE_SEND + _SEND; @@ -1749,6 +1736,112 @@ dummy_func( _SEND_GEN_FRAME + _PUSH_FRAME; + op(_GUARD_TOS_IS_NONE, (val -- val)) { + EXIT_IF(!PyStackRef_IsNone(val)); + } + + macro(FOR_ITER) = _SPECIALIZE_FOR_ITER + _FOR_ITER; + + op(_GUARD_NOS_NOT_NULL, (nos, unused -- nos, unused)) { + EXIT_IF(PyStackRef_IsNull(nos)); + } + + replaced op(_SEND_VIRTUAL, (iter, null_or_index, none -- iter, null_or_index, next)) { + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = Py_TYPE(iter_o)->_tp_iteritem(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + ERROR_NO_POP(); + } + next = none; + DEAD(none); + JUMPBY(oparg); + DISPATCH(); + } + DEAD(none); + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + } + + op(_SEND_VIRTUAL_TIER_TWO, (iter, null_or_index, none -- iter, null_or_index, next)) { + assert(PyStackRef_IsNone(none)); + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = CALL_TP_ITERITEM_NO_ESCAPE(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + ERROR_NO_POP(); + } + next = none; + DEAD(none); + EXIT_IF(true); + } + DEAD(none); + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + } + + macro(SEND_VIRTUAL) = + unused/1 + + _GUARD_TOS_IS_NONE + + _GUARD_NOS_NOT_NULL + + _SEND_VIRTUAL; + + op(_GUARD_3OS_ASYNC_GEN_ASEND, (iter, null_or_index, value -- iter, null_or_index, value)) { + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + EXIT_IF(!PyAsyncGenASend_CheckExact(iter_o)); + } + + replaced op(_SEND_ASYNC_GEN, (iter, null_in, v -- asend, null_out, retval)) { + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + assert(PyAsyncGenASend_CheckExact(iter_o)); + PyObject *val = PyStackRef_AsPyObjectBorrow(v); + PyObject *retval_o; + + PySendResult what = _PyAsyncGenASend_Send(iter_o, val, &retval_o); + if (what == PYGEN_ERROR) { + ERROR_NO_POP(); + } + PyStackRef_CLOSE(v); + asend = iter; + DEAD(iter); + null_out = null_in; + DEAD(null_in); + retval = PyStackRef_FromPyObjectSteal(retval_o); + if (what == PYGEN_RETURN) { + JUMPBY(oparg); + } + } + + macro(SEND_ASYNC_GEN) = + unused/1 + + _GUARD_3OS_ASYNC_GEN_ASEND + + _SEND_ASYNC_GEN; + + tier2 op(_SEND_ASYNC_GEN_TIER_TWO, (iter, null_in, v -- asend, null_out, retval)) { + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + assert(PyAsyncGenASend_CheckExact(iter_o)); + PyObject *val = PyStackRef_AsPyObjectBorrow(v); + PyObject *retval_o; + + PySendResult what = _PyAsyncGenASend_Send(iter_o, val, &retval_o); + if (what == PYGEN_ERROR) { + ERROR_NO_POP(); + } + PyStackRef_CLOSE(v); + asend = iter; + DEAD(iter); + null_out = null_in; + DEAD(null_in); + retval = PyStackRef_FromPyObjectSteal(retval_o); + EXIT_IF(what == PYGEN_RETURN); + } + op(_YIELD_VALUE, (retval -- value)) { // NOTE: It's important that YIELD_VALUE never raises an exception! // The compiler treats any exception raised here as a failed close() @@ -3803,6 +3896,10 @@ dummy_func( EXIT_IF(Py_TYPE(iter_o)->_tp_iteritem == NULL); } + op(_GUARD_TOS_NOT_NULL, (null_or_index -- null_or_index)) { + EXIT_IF(PyStackRef_IsNull(null_or_index)); + } + replaced op(_FOR_ITER_VIRTUAL, (iter, null_or_index -- iter, null_or_index, next)) { PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); Py_ssize_t index = PyStackRef_UntagInt(null_or_index); @@ -3823,7 +3920,7 @@ dummy_func( macro(FOR_ITER_VIRTUAL) = unused/1 + // Skip over the counter - _GUARD_NOS_ITER_VIRTUAL + + _GUARD_TOS_NOT_NULL + _FOR_ITER_VIRTUAL; op(_FOR_ITER_VIRTUAL_TIER_TWO, (iter, null_or_index -- iter, null_or_index, next)) { @@ -4606,11 +4703,6 @@ dummy_func( EXIT_IF(!PyStackRef_IsNull(null)); } - op(_GUARD_NOS_NOT_NULL, (nos, unused -- nos, unused)) { - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - EXIT_IF(o == NULL); - } - op(_GUARD_THIRD_NULL, (null, unused, unused -- null, unused, unused)) { EXIT_IF(!PyStackRef_IsNull(null)); } diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h index be3d5fb0a69ad4..c61690e8bd7240 100644 --- a/Python/ceval_macros.h +++ b/Python/ceval_macros.h @@ -640,3 +640,6 @@ gen_try_set_executing(PyGenObject *gen) (PyLongObject *)PyStackRef_AsPyObjectBorrow(left), \ (PyLongObject *)PyStackRef_AsPyObjectBorrow(right)); \ } + +#define CALL_TP_ITERITEM_NO_ESCAPE(ITER, INDEX) \ + Py_TYPE(ITER)->_tp_iteritem((ITER), (INDEX)) diff --git a/Python/codegen.c b/Python/codegen.c index a77451152c6039..529c1733598e38 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -2156,7 +2156,7 @@ codegen_for(compiler *c, stmt_ty s) USE_LABEL(c, cleanup); /* It is important for instrumentation that the `END_FOR` comes first. * Iteration over a generator will jump to the first of these instructions, - * but a non-generator will jump to a later instruction. + * but a non-generator will jump to the second instruction. */ ADDOP(c, NO_LOCATION, END_FOR); ADDOP(c, NO_LOCATION, POP_ITER); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 76caff06ca61f7..b6a2821db3007e 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -8768,50 +8768,553 @@ break; } - /* _SEND is not a viable micro-op for tier 2 because it uses the 'this_instr' variable */ + case _SEND_GEN_FRAME_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef v; + _PyStackRef receiver; + _PyStackRef gen_frame; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + oparg = CURRENT_OPARG(); + v = _stack_item_2; + receiver = _stack_item_0; + PyGenObject *gen = (PyGenObject *)PyStackRef_AsPyObjectBorrow(receiver); + if (Py_TYPE(gen) != &PyGen_Type && Py_TYPE(gen) != &PyCoro_Type) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = v; + _tos_cache1 = _stack_item_1; + _tos_cache0 = receiver; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + if (!gen_try_set_executing((PyGenObject *)gen)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = v; + _tos_cache1 = _stack_item_1; + _tos_cache0 = receiver; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + STAT_INC(SEND, hit); + _PyInterpreterFrame *pushed_frame = &gen->gi_iframe; + _PyFrame_StackPush(pushed_frame, PyStackRef_MakeHeapSafe(v)); + gen->gi_exc_state.previous_item = tstate->exc_info; + tstate->exc_info = &gen->gi_exc_state; + assert( 2u + oparg <= UINT16_MAX); + frame->return_offset = (uint16_t)( 2u + oparg); + pushed_frame->previous = frame; + gen_frame = PyStackRef_Wrap(pushed_frame); + _tos_cache2 = gen_frame; + _tos_cache1 = _stack_item_1; + _tos_cache0 = receiver; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_IS_NONE_r01: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef val; + val = stack_pointer[-1]; + if (!PyStackRef_IsNone(val)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = val; + SET_CURRENT_CACHED_VALUES(1); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_IS_NONE_r11: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef val; + _PyStackRef _stack_item_0 = _tos_cache0; + val = _stack_item_0; + if (!PyStackRef_IsNone(val)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = val; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = val; + SET_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_IS_NONE_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef val; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + val = _stack_item_1; + if (!PyStackRef_IsNone(val)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = val; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = val; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_IS_NONE_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef val; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + val = _stack_item_2; + if (!PyStackRef_IsNone(val)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = val; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = val; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_NOT_NULL_r02: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + nos = stack_pointer[-2]; + if (PyStackRef_IsNull(nos)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = stack_pointer[-1]; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + stack_pointer += -2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_NOT_NULL_r12: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + nos = stack_pointer[-1]; + if (PyStackRef_IsNull(nos)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = _stack_item_0; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_NOT_NULL_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + nos = _stack_item_0; + if (PyStackRef_IsNull(nos)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = _stack_item_1; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = _stack_item_1; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_NOT_NULL_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + nos = _stack_item_1; + if (PyStackRef_IsNull(nos)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = _stack_item_2; + _tos_cache1 = nos; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = _stack_item_2; + _tos_cache1 = nos; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + /* _SEND_VIRTUAL is not a viable micro-op for tier 2 because it is replaced */ + + case _SEND_VIRTUAL_TIER_TWO_r03: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef none; + _PyStackRef null_or_index; + _PyStackRef iter; + _PyStackRef next; + none = stack_pointer[-1]; + null_or_index = stack_pointer[-2]; + iter = stack_pointer[-3]; + assert(PyStackRef_IsNone(none)); + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = CALL_TP_ITERITEM_NO_ESCAPE(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_ERROR(); + } + next = none; + if (true) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + _tos_cache2 = next; + _tos_cache1 = null_or_index; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -3; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _SEND_VIRTUAL_TIER_TWO_r13: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef none; + _PyStackRef null_or_index; + _PyStackRef iter; + _PyStackRef next; + _PyStackRef _stack_item_0 = _tos_cache0; + none = _stack_item_0; + null_or_index = stack_pointer[-1]; + iter = stack_pointer[-2]; + assert(PyStackRef_IsNone(none)); + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = CALL_TP_ITERITEM_NO_ESCAPE(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + stack_pointer[0] = none; + stack_pointer += 1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_ERROR(); + } + next = none; + if (true) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = stack_pointer[0]; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + _tos_cache2 = next; + _tos_cache1 = null_or_index; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _SEND_VIRTUAL_TIER_TWO_r23: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef none; + _PyStackRef null_or_index; + _PyStackRef iter; + _PyStackRef next; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + none = _stack_item_1; + null_or_index = _stack_item_0; + iter = stack_pointer[-1]; + assert(PyStackRef_IsNone(none)); + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = CALL_TP_ITERITEM_NO_ESCAPE(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + stack_pointer[0] = null_or_index; + stack_pointer[1] = none; + stack_pointer += 2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_ERROR(); + } + next = none; + if (true) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = stack_pointer[1]; + _tos_cache0 = null_or_index; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + _tos_cache2 = next; + _tos_cache1 = null_or_index; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _SEND_VIRTUAL_TIER_TWO_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef none; + _PyStackRef null_or_index; + _PyStackRef iter; + _PyStackRef next; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + none = _stack_item_2; + null_or_index = _stack_item_1; + iter = _stack_item_0; + assert(PyStackRef_IsNone(none)); + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyObjectIndexPair next_index = CALL_TP_ITERITEM_NO_ESCAPE(iter_o, index); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + stack_pointer[0] = iter; + stack_pointer[1] = null_or_index; + stack_pointer[2] = none; + stack_pointer += 3; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_ERROR(); + } + next = none; + if (true) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = stack_pointer[2]; + _tos_cache1 = null_or_index; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + _tos_cache2 = next; + _tos_cache1 = null_or_index; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_3OS_ASYNC_GEN_ASEND_r03: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef iter; + iter = stack_pointer[-3]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = stack_pointer[-1]; + _tos_cache1 = stack_pointer[-2]; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -3; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_3OS_ASYNC_GEN_ASEND_r13: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef iter; + _PyStackRef _stack_item_0 = _tos_cache0; + iter = stack_pointer[-2]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = _stack_item_0; + _tos_cache1 = stack_pointer[-1]; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } - case _SEND_GEN_FRAME_r33: { - CHECK_CURRENT_CACHED_VALUES(3); + case _GUARD_3OS_ASYNC_GEN_ASEND_r23: { + CHECK_CURRENT_CACHED_VALUES(2); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef v; - _PyStackRef receiver; - _PyStackRef gen_frame; + _PyStackRef iter; _PyStackRef _stack_item_0 = _tos_cache0; _PyStackRef _stack_item_1 = _tos_cache1; - _PyStackRef _stack_item_2 = _tos_cache2; - oparg = CURRENT_OPARG(); - v = _stack_item_2; - receiver = _stack_item_0; - PyGenObject *gen = (PyGenObject *)PyStackRef_AsPyObjectBorrow(receiver); - if (Py_TYPE(gen) != &PyGen_Type && Py_TYPE(gen) != &PyCoro_Type) { + iter = stack_pointer[-1]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { UOP_STAT_INC(uopcode, miss); - _tos_cache2 = v; _tos_cache1 = _stack_item_1; - _tos_cache0 = receiver; - SET_CURRENT_CACHED_VALUES(3); + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); JUMP_TO_JUMP_TARGET(); } - if (!gen_try_set_executing((PyGenObject *)gen)) { + _tos_cache2 = _stack_item_1; + _tos_cache1 = _stack_item_0; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_3OS_ASYNC_GEN_ASEND_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef iter; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + iter = _stack_item_0; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { UOP_STAT_INC(uopcode, miss); - _tos_cache2 = v; + _tos_cache2 = _stack_item_2; _tos_cache1 = _stack_item_1; - _tos_cache0 = receiver; + _tos_cache0 = iter; SET_CURRENT_CACHED_VALUES(3); JUMP_TO_JUMP_TARGET(); } - STAT_INC(SEND, hit); - _PyInterpreterFrame *pushed_frame = &gen->gi_iframe; - _PyFrame_StackPush(pushed_frame, PyStackRef_MakeHeapSafe(v)); - gen->gi_exc_state.previous_item = tstate->exc_info; - tstate->exc_info = &gen->gi_exc_state; - assert( 2u + oparg <= UINT16_MAX); - frame->return_offset = (uint16_t)( 2u + oparg); - pushed_frame->previous = frame; - gen_frame = PyStackRef_Wrap(pushed_frame); - _tos_cache2 = gen_frame; + _tos_cache2 = _stack_item_2; _tos_cache1 = _stack_item_1; - _tos_cache0 = receiver; + _tos_cache0 = iter; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + /* _SEND_ASYNC_GEN is not a viable micro-op for tier 2 because it is replaced */ + + case _SEND_ASYNC_GEN_TIER_TWO_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef v; + _PyStackRef null_in; + _PyStackRef iter; + _PyStackRef asend; + _PyStackRef null_out; + _PyStackRef retval; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + v = _stack_item_2; + null_in = _stack_item_1; + iter = _stack_item_0; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + assert(PyAsyncGenASend_CheckExact(iter_o)); + PyObject *val = PyStackRef_AsPyObjectBorrow(v); + PyObject *retval_o; + stack_pointer[0] = iter; + stack_pointer[1] = null_in; + stack_pointer[2] = v; + stack_pointer += 3; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PySendResult what = _PyAsyncGenASend_Send(iter_o, val, &retval_o); + stack_pointer = _PyFrame_GetStackPointer(frame); + if (what == PYGEN_ERROR) { + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_ERROR(); + } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_CLOSE(v); + stack_pointer = _PyFrame_GetStackPointer(frame); + asend = iter; + null_out = null_in; + retval = PyStackRef_FromPyObjectSteal(retval_o); + if (what == PYGEN_RETURN) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = stack_pointer[-1]; + _tos_cache1 = stack_pointer[-2]; + _tos_cache0 = stack_pointer[-3]; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -3; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = retval; + _tos_cache1 = null_out; + _tos_cache0 = asend; SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); break; } @@ -10320,9 +10823,7 @@ PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable); stack_pointer = _PyFrame_GetStackPointer(frame); if (none_val == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_TypeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches && (Py_TYPE(iterable)->tp_iter == NULL && !PySequence_Check(iterable))) { @@ -10535,9 +11036,7 @@ int err = PyDict_Update(dict_o, update_o); stack_pointer = _PyFrame_GetStackPointer(frame); if (err < 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_AttributeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches) { _PyFrame_SetStackPointer(frame, stack_pointer); PyObject *exc = _PyErr_GetRaisedException(tstate); @@ -14309,6 +14808,87 @@ break; } + case _GUARD_TOS_NOT_NULL_r01: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef null_or_index; + null_or_index = stack_pointer[-1]; + if (PyStackRef_IsNull(null_or_index)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = null_or_index; + SET_CURRENT_CACHED_VALUES(1); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_NOT_NULL_r11: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef null_or_index; + _PyStackRef _stack_item_0 = _tos_cache0; + null_or_index = _stack_item_0; + if (PyStackRef_IsNull(null_or_index)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = null_or_index; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = null_or_index; + SET_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_NOT_NULL_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef null_or_index; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + null_or_index = _stack_item_1; + if (PyStackRef_IsNull(null_or_index)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = null_or_index; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = null_or_index; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_TOS_NOT_NULL_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef null_or_index; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + null_or_index = _stack_item_2; + if (PyStackRef_IsNull(null_or_index)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = null_or_index; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = null_or_index; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + /* _FOR_ITER_VIRTUAL is not a viable micro-op for tier 2 because it is replaced */ case _FOR_ITER_VIRTUAL_TIER_TWO_r23: { @@ -16934,95 +17514,6 @@ break; } - case _GUARD_NOS_NOT_NULL_r02: { - CHECK_CURRENT_CACHED_VALUES(0); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef nos; - nos = stack_pointer[-2]; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { - UOP_STAT_INC(uopcode, miss); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_JUMP_TARGET(); - } - _tos_cache1 = stack_pointer[-1]; - _tos_cache0 = nos; - SET_CURRENT_CACHED_VALUES(2); - stack_pointer += -2; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _GUARD_NOS_NOT_NULL_r12: { - CHECK_CURRENT_CACHED_VALUES(1); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef nos; - _PyStackRef _stack_item_0 = _tos_cache0; - nos = stack_pointer[-1]; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { - UOP_STAT_INC(uopcode, miss); - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(1); - JUMP_TO_JUMP_TARGET(); - } - _tos_cache1 = _stack_item_0; - _tos_cache0 = nos; - SET_CURRENT_CACHED_VALUES(2); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _GUARD_NOS_NOT_NULL_r22: { - CHECK_CURRENT_CACHED_VALUES(2); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef nos; - _PyStackRef _stack_item_0 = _tos_cache0; - _PyStackRef _stack_item_1 = _tos_cache1; - nos = _stack_item_0; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = _stack_item_1; - _tos_cache0 = nos; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); - } - _tos_cache1 = _stack_item_1; - _tos_cache0 = nos; - SET_CURRENT_CACHED_VALUES(2); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _GUARD_NOS_NOT_NULL_r33: { - CHECK_CURRENT_CACHED_VALUES(3); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef nos; - _PyStackRef _stack_item_0 = _tos_cache0; - _PyStackRef _stack_item_1 = _tos_cache1; - _PyStackRef _stack_item_2 = _tos_cache2; - nos = _stack_item_1; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { - UOP_STAT_INC(uopcode, miss); - _tos_cache2 = _stack_item_2; - _tos_cache1 = nos; - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(3); - JUMP_TO_JUMP_TARGET(); - } - _tos_cache2 = _stack_item_2; - _tos_cache1 = nos; - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(3); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - case _GUARD_THIRD_NULL_r03: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 0419991ca7761a..2623105656c90c 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -3782,8 +3782,7 @@ // _GUARD_NOS_NOT_NULL { nos = stack_pointer[-2]; - PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (o == NULL) { + if (PyStackRef_IsNull(nos)) { UPDATE_MISS_STATS(CALL); assert(_PyOpcode_Deopt[opcode] == (CALL)); JUMP_TO_PREDICTED(CALL); @@ -5784,9 +5783,7 @@ int err = PyDict_Update(dict_o, update_o); stack_pointer = _PyFrame_GetStackPointer(frame); if (err < 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_AttributeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches) { _PyFrame_SetStackPointer(frame, stack_pointer); PyObject *exc = _PyErr_GetRaisedException(tstate); @@ -6407,15 +6404,14 @@ next_instr += 2; INSTRUCTION_STATS(FOR_ITER_VIRTUAL); static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size"); - _PyStackRef iter; _PyStackRef null_or_index; + _PyStackRef iter; _PyStackRef next; /* Skip 1 cache entry */ - // _GUARD_NOS_ITER_VIRTUAL + // _GUARD_TOS_NOT_NULL { - iter = stack_pointer[-2]; - PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); - if (Py_TYPE(iter_o)->_tp_iteritem == NULL) { + null_or_index = stack_pointer[-1]; + if (PyStackRef_IsNull(null_or_index)) { UPDATE_MISS_STATS(FOR_ITER); assert(_PyOpcode_Deopt[opcode] == (FOR_ITER)); JUMP_TO_PREDICTED(FOR_ITER); @@ -6423,7 +6419,7 @@ } // _FOR_ITER_VIRTUAL { - null_or_index = stack_pointer[-1]; + iter = stack_pointer[-2]; PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); Py_ssize_t index = PyStackRef_UntagInt(null_or_index); _PyFrame_SetStackPointer(frame, stack_pointer); @@ -8237,9 +8233,7 @@ PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable); stack_pointer = _PyFrame_GetStackPointer(frame); if (none_val == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); int matches = _PyErr_ExceptionMatches(tstate, PyExc_TypeError); - stack_pointer = _PyFrame_GetStackPointer(frame); if (matches && (Py_TYPE(iterable)->tp_iter == NULL && !PySequence_Check(iterable))) { @@ -11114,7 +11108,6 @@ v = stack_pointer[-1]; null_or_index = stack_pointer[-2]; PyObject *receiver_o = PyStackRef_AsPyObjectBorrow(receiver); - PyObject *retval_o; assert(frame->owner != FRAME_OWNED_BY_INTERPRETER); if (!IS_PEP523_HOOKED(tstate) && (Py_TYPE(receiver_o) == &PyGen_Type || Py_TYPE(receiver_o) == &PyCoro_Type) && @@ -11133,7 +11126,7 @@ gen_frame->previous = frame; DISPATCH_INLINED(gen_frame); } - if (!PyStackRef_IsNull(null_or_index)) { + if (!PyStackRef_IsNull(null_or_index) && PyStackRef_IsNone(v)) { _PyFrame_SetStackPointer(frame, stack_pointer); _PyStackRef item = _PyForIter_VirtualIteratorNext(tstate, frame, receiver, &null_or_index); stack_pointer = _PyFrame_GetStackPointer(frame); @@ -11148,51 +11141,89 @@ retval = item; } else { - if (PyStackRef_IsNone(v) && PyIter_Check(receiver_o)) { - _PyFrame_SetStackPointer(frame, stack_pointer); - retval_o = Py_TYPE(receiver_o)->tp_iternext(receiver_o); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - retval_o = PyObject_CallMethodOneArg(receiver_o, - &_Py_ID(send), - PyStackRef_AsPyObjectBorrow(v)); - stack_pointer = _PyFrame_GetStackPointer(frame); + PyObject *v_o = PyStackRef_AsPyObjectBorrow(v); + _PyFrame_SetStackPointer(frame, stack_pointer); + PySendResultPair res = _PyIter_Send(receiver_o, v_o); + stack_pointer = _PyFrame_GetStackPointer(frame); + if (res.kind == PYGEN_ERROR) { + JUMP_TO_LABEL(error); } - if (retval_o == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - int matches = _PyErr_ExceptionMatches(tstate, PyExc_StopIteration); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (matches) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyEval_MonitorRaise(tstate, frame, this_instr); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - int err = _PyGen_FetchStopIterationValue(&retval_o); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err == 0) { - assert(retval_o != NULL); - JUMPBY(oparg); - } - else { - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_CLOSE(v); + stack_pointer = _PyFrame_GetStackPointer(frame); + retval = PyStackRef_FromPyObjectSteal(res.object); + if (res.kind == PYGEN_RETURN) { + JUMPBY(oparg); } - retval = PyStackRef_FromPyObjectSteal(retval_o); + stack_pointer += 1; + } + } + stack_pointer[-2] = null_or_index; + stack_pointer[-1] = retval; + DISPATCH(); + } + + TARGET(SEND_ASYNC_GEN) { + #if _Py_TAIL_CALL_INTERP + int opcode = SEND_ASYNC_GEN; + (void)(opcode); + #endif + _Py_CODEUNIT* const this_instr = next_instr; + (void)this_instr; + frame->instr_ptr = next_instr; + next_instr += 2; + INSTRUCTION_STATS(SEND_ASYNC_GEN); + static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size"); + _PyStackRef iter; + _PyStackRef null_in; + _PyStackRef v; + _PyStackRef asend; + _PyStackRef null_out; + _PyStackRef retval; + /* Skip 1 cache entry */ + // _GUARD_3OS_ASYNC_GEN_ASEND + { + iter = stack_pointer[-3]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + if (!PyAsyncGenASend_CheckExact(iter_o)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); } - stack_pointer[-2] = null_or_index; - stack_pointer[-1] = retval; + } + // _SEND_ASYNC_GEN + { + v = stack_pointer[-1]; + null_in = stack_pointer[-2]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + assert(PyAsyncGenASend_CheckExact(iter_o)); + PyObject *val = PyStackRef_AsPyObjectBorrow(v); + PyObject *retval_o; + _PyFrame_SetStackPointer(frame, stack_pointer); + PySendResult what = _PyAsyncGenASend_Send(iter_o, val, &retval_o); + stack_pointer = _PyFrame_GetStackPointer(frame); + if (what == PYGEN_ERROR) { + JUMP_TO_LABEL(error); + } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); PyStackRef_CLOSE(v); stack_pointer = _PyFrame_GetStackPointer(frame); + asend = iter; + null_out = null_in; + retval = PyStackRef_FromPyObjectSteal(retval_o); + if (what == PYGEN_RETURN) { + JUMPBY(oparg); + } } + stack_pointer[-2] = asend; + stack_pointer[-1] = null_out; + stack_pointer[0] = retval; + stack_pointer += 1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); DISPATCH(); } @@ -11265,6 +11296,70 @@ DISPATCH(); } + TARGET(SEND_VIRTUAL) { + #if _Py_TAIL_CALL_INTERP + int opcode = SEND_VIRTUAL; + (void)(opcode); + #endif + _Py_CODEUNIT* const this_instr = next_instr; + (void)this_instr; + frame->instr_ptr = next_instr; + next_instr += 2; + INSTRUCTION_STATS(SEND_VIRTUAL); + static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size"); + _PyStackRef val; + _PyStackRef nos; + _PyStackRef iter; + _PyStackRef null_or_index; + _PyStackRef none; + _PyStackRef next; + /* Skip 1 cache entry */ + // _GUARD_TOS_IS_NONE + { + val = stack_pointer[-1]; + if (!PyStackRef_IsNone(val)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); + } + } + // _GUARD_NOS_NOT_NULL + { + nos = stack_pointer[-2]; + if (PyStackRef_IsNull(nos)) { + UPDATE_MISS_STATS(SEND); + assert(_PyOpcode_Deopt[opcode] == (SEND)); + JUMP_TO_PREDICTED(SEND); + } + } + // _SEND_VIRTUAL + { + none = val; + null_or_index = nos; + iter = stack_pointer[-3]; + PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter); + Py_ssize_t index = PyStackRef_UntagInt(null_or_index); + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyObjectIndexPair next_index = Py_TYPE(iter_o)->_tp_iteritem(iter_o, index); + stack_pointer = _PyFrame_GetStackPointer(frame); + PyObject *next_o = next_index.object; + index = next_index.index; + if (next_o == NULL) { + if (index < 0) { + JUMP_TO_LABEL(error); + } + next = none; + JUMPBY(oparg); + DISPATCH(); + } + next = PyStackRef_FromPyObjectSteal(next_o); + null_or_index = PyStackRef_TagInt(index); + } + stack_pointer[-2] = null_or_index; + stack_pointer[-1] = next; + DISPATCH(); + } + TARGET(SETUP_ANNOTATIONS) { #if _Py_TAIL_CALL_INTERP int opcode = SETUP_ANNOTATIONS; diff --git a/Python/jit.c b/Python/jit.c index 5c8f87857731fc..67dd88f510040e 100644 --- a/Python/jit.c +++ b/Python/jit.c @@ -11,6 +11,7 @@ #include "pycore_floatobject.h" #include "pycore_frame.h" #include "pycore_function.h" +#include "pycore_genobject.h" #include "pycore_import.h" #include "pycore_interpframe.h" #include "pycore_interpolation.h" diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 43d4656a4b7f7e..1a7eb9169fc837 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -202,7 +202,9 @@ static void *opcode_targets_table[256] = { &&TARGET_LOAD_SUPER_ATTR_METHOD, &&TARGET_RESUME_CHECK, &&TARGET_RESUME_CHECK_JIT, + &&TARGET_SEND_ASYNC_GEN, &&TARGET_SEND_GEN, + &&TARGET_SEND_VIRTUAL, &&TARGET_STORE_ATTR_INSTANCE_VALUE, &&TARGET_STORE_ATTR_SLOT, &&TARGET_STORE_ATTR_WITH_HINT, @@ -231,8 +233,6 @@ static void *opcode_targets_table[256] = { &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, - &&_unknown_opcode, - &&_unknown_opcode, &&TARGET_INSTRUMENTED_END_FOR, &&TARGET_INSTRUMENTED_POP_ITER, &&TARGET_INSTRUMENTED_END_SEND, @@ -476,8 +476,8 @@ static void *opcode_tracing_targets_table[256] = { &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, - &&_unknown_opcode, - &&_unknown_opcode, + &&TARGET_TRACE_RECORD, + &&TARGET_TRACE_RECORD, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, @@ -725,7 +725,9 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RESUME_CHECK_JIT(TAIL_CALL_PARAM static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RETURN_GENERATOR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_RETURN_VALUE(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_ASYNC_GEN(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_GEN(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SEND_VIRTUAL(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SETUP_ANNOTATIONS(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SET_ADD(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_SET_FUNCTION_ATTRIBUTE(TAIL_CALL_PARAMS); @@ -969,7 +971,9 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [RETURN_GENERATOR] = _TAIL_CALL_RETURN_GENERATOR, [RETURN_VALUE] = _TAIL_CALL_RETURN_VALUE, [SEND] = _TAIL_CALL_SEND, + [SEND_ASYNC_GEN] = _TAIL_CALL_SEND_ASYNC_GEN, [SEND_GEN] = _TAIL_CALL_SEND_GEN, + [SEND_VIRTUAL] = _TAIL_CALL_SEND_VIRTUAL, [SETUP_ANNOTATIONS] = _TAIL_CALL_SETUP_ANNOTATIONS, [SET_ADD] = _TAIL_CALL_SET_ADD, [SET_FUNCTION_ATTRIBUTE] = _TAIL_CALL_SET_FUNCTION_ATTRIBUTE, @@ -1015,8 +1019,6 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [217] = _TAIL_CALL_UNKNOWN_OPCODE, - [218] = _TAIL_CALL_UNKNOWN_OPCODE, [219] = _TAIL_CALL_UNKNOWN_OPCODE, [220] = _TAIL_CALL_UNKNOWN_OPCODE, [221] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1227,7 +1229,9 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [RETURN_GENERATOR] = _TAIL_CALL_TRACE_RECORD, [RETURN_VALUE] = _TAIL_CALL_TRACE_RECORD, [SEND] = _TAIL_CALL_TRACE_RECORD, + [SEND_ASYNC_GEN] = _TAIL_CALL_TRACE_RECORD, [SEND_GEN] = _TAIL_CALL_TRACE_RECORD, + [SEND_VIRTUAL] = _TAIL_CALL_TRACE_RECORD, [SETUP_ANNOTATIONS] = _TAIL_CALL_TRACE_RECORD, [SET_ADD] = _TAIL_CALL_TRACE_RECORD, [SET_FUNCTION_ATTRIBUTE] = _TAIL_CALL_TRACE_RECORD, @@ -1273,8 +1277,6 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [217] = _TAIL_CALL_UNKNOWN_OPCODE, - [218] = _TAIL_CALL_UNKNOWN_OPCODE, [219] = _TAIL_CALL_UNKNOWN_OPCODE, [220] = _TAIL_CALL_UNKNOWN_OPCODE, [221] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Python/optimizer.c b/Python/optimizer.c index c8ce4396b426e4..db258fff22cdd1 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -500,6 +500,8 @@ _PyUOp_Replacements[MAX_UOP_ID + 1] = { [_ITER_NEXT_LIST] = _ITER_NEXT_LIST_TIER_TWO, [_CHECK_PERIODIC_AT_END] = _TIER2_RESUME_CHECK, [_LOAD_BYTECODE] = _NOP, + [_SEND_VIRTUAL] = _SEND_VIRTUAL_TIER_TWO, + [_SEND_ASYNC_GEN] = _SEND_ASYNC_GEN_TIER_TWO, }; static const uint8_t @@ -1000,8 +1002,14 @@ _PyJit_translate_single_bytecode_to_trace( else { int extended_arg = orig_oparg > 255; uint32_t jump_target = next_inst + orig_oparg + extended_arg; - assert(_Py_GetBaseCodeUnit(old_code, jump_target).op.code == END_FOR); - assert(_Py_GetBaseCodeUnit(old_code, jump_target+1).op.code == POP_ITER); + /* Jump must be to an "END" either END_FOR or END_SEND */ + assert(( + _Py_GetBaseCodeUnit(old_code, jump_target).op.code == END_FOR && + _Py_GetBaseCodeUnit(old_code, jump_target+1).op.code == POP_ITER + ) + || + _Py_GetBaseCodeUnit(old_code, jump_target).op.code == END_SEND + ); if (is_for_iter_test[uop]) { target = jump_target + 1; } diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index f10c304fa02001..e10a096baa3318 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -2701,7 +2701,32 @@ dummy_func(void) { stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer); } + op(_GUARD_TOS_NOT_NULL, (null_or_index -- null_or_index)) { + if (sym_is_not_null(null_or_index)) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + else { + sym_set_non_null(null_or_index); + } + } + op(_GUARD_3OS_ASYNC_GEN_ASEND, (iter, null_or_index, value -- iter, null_or_index, value)) { + if (sym_matches_type(iter, &_PyAsyncGenASend_Type)) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + else { + sym_set_type(iter, &_PyAsyncGenASend_Type); + } + } + + op(_GET_ANEXT, (aiter -- aiter, awaitable)) { + if (sym_matches_type(aiter, &PyAsyncGen_Type)) { + awaitable = sym_new_type(ctx, &_PyAsyncGenASend_Type); + } + else { + awaitable = sym_new_not_null(ctx); + } + } // END BYTECODES // diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 0cad3524850df4..01ecb3790aa2cd 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1860,8 +1860,15 @@ } case _GET_ANEXT: { + JitOptRef aiter; JitOptRef awaitable; - awaitable = sym_new_not_null(ctx); + aiter = stack_pointer[-1]; + if (sym_matches_type(aiter, &PyAsyncGen_Type)) { + awaitable = sym_new_type(ctx, &_PyAsyncGenASend_Type); + } + else { + awaitable = sym_new_not_null(ctx); + } CHECK_STACK_BOUNDS(1); stack_pointer[0] = awaitable; stack_pointer += 1; @@ -1876,8 +1883,6 @@ break; } - /* _SEND is not a viable micro-op for tier 2 */ - case _SEND_GEN_FRAME: { JitOptRef v; JitOptRef receiver; @@ -1896,6 +1901,58 @@ break; } + case _GUARD_TOS_IS_NONE: { + break; + } + + case _GUARD_NOS_NOT_NULL: { + JitOptRef nos; + nos = stack_pointer[-2]; + if (sym_is_not_null(nos)) { + ADD_OP(_NOP, 0, 0); + } + else { + sym_set_non_null(nos); + } + break; + } + + /* _SEND_VIRTUAL is not a viable micro-op for tier 2 */ + + case _SEND_VIRTUAL_TIER_TWO: { + JitOptRef next; + next = sym_new_not_null(ctx); + stack_pointer[-1] = next; + break; + } + + case _GUARD_3OS_ASYNC_GEN_ASEND: { + JitOptRef iter; + iter = stack_pointer[-3]; + if (sym_matches_type(iter, &_PyAsyncGenASend_Type)) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + else { + sym_set_type(iter, &_PyAsyncGenASend_Type); + } + break; + } + + /* _SEND_ASYNC_GEN is not a viable micro-op for tier 2 */ + + case _SEND_ASYNC_GEN_TIER_TWO: { + JitOptRef asend; + JitOptRef null_out; + JitOptRef retval; + asend = sym_new_not_null(ctx); + null_out = sym_new_not_null(ctx); + retval = sym_new_not_null(ctx); + stack_pointer[-3] = asend; + stack_pointer[-2] = null_out; + stack_pointer[-1] = retval; + break; + } + case _YIELD_VALUE: { JitOptRef retval; JitOptRef value; @@ -3687,6 +3744,18 @@ break; } + case _GUARD_TOS_NOT_NULL: { + JitOptRef null_or_index; + null_or_index = stack_pointer[-1]; + if (sym_is_not_null(null_or_index)) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + else { + sym_set_non_null(null_or_index); + } + break; + } + /* _FOR_ITER_VIRTUAL is not a viable micro-op for tier 2 */ case _FOR_ITER_VIRTUAL_TIER_TWO: { @@ -4211,18 +4280,6 @@ break; } - case _GUARD_NOS_NOT_NULL: { - JitOptRef nos; - nos = stack_pointer[-2]; - if (sym_is_not_null(nos)) { - ADD_OP(_NOP, 0, 0); - } - else { - sym_set_non_null(nos); - } - break; - } - case _GUARD_THIRD_NULL: { JitOptRef null; null = stack_pointer[-3]; diff --git a/Python/record_functions.c.h b/Python/record_functions.c.h index ce5d25b004ab3c..8cd87f00e8079e 100644 --- a/Python/record_functions.c.h +++ b/Python/record_functions.c.h @@ -137,6 +137,9 @@ const _PyOpcodeRecordEntry _PyOpcode_RecordEntries[256] = { [STORE_SUBSCR_DICT] = {1, {_RECORD_NOS_TYPE_INDEX}}, [SEND] = {1, {_RECORD_3OS_GEN_FUNC_INDEX}}, [SEND_GEN] = {1, {_RECORD_3OS_GEN_FUNC_INDEX}}, + [FOR_ITER] = {1, {_RECORD_NOS_INDEX}}, + [SEND_VIRTUAL] = {1, {_RECORD_3OS_GEN_FUNC_INDEX}}, + [SEND_ASYNC_GEN] = {1, {_RECORD_3OS_GEN_FUNC_INDEX}}, [STORE_ATTR] = {1, {_RECORD_TOS_TYPE_INDEX}}, [LOAD_SUPER_ATTR] = {1, {_RECORD_NOS_INDEX}}, [LOAD_SUPER_ATTR_METHOD] = {1, {_RECORD_NOS_INDEX}}, @@ -155,7 +158,6 @@ const _PyOpcodeRecordEntry _PyOpcode_RecordEntries[256] = { [GET_ITER] = {1, {_RECORD_TOS_TYPE_INDEX}}, [GET_ITER_SELF] = {1, {_RECORD_TOS_TYPE_INDEX}}, [GET_ITER_VIRTUAL] = {1, {_RECORD_TOS_TYPE_INDEX}}, - [FOR_ITER] = {1, {_RECORD_NOS_INDEX}}, [FOR_ITER_VIRTUAL] = {1, {_RECORD_NOS_INDEX}}, [FOR_ITER_LIST] = {1, {_RECORD_NOS_INDEX}}, [FOR_ITER_TUPLE] = {1, {_RECORD_NOS_INDEX}}, @@ -204,6 +206,7 @@ const _PyOpcodeRecordSlotMap _PyOpcode_RecordSlotMaps[256] = { [BINARY_OP_SUBSCR_GETITEM] = {1, 0, {0}}, [STORE_SUBSCR_DICT] = {1, 0, {0}}, [SEND_GEN] = {1, 0, {0}}, + [FOR_ITER] = {1, 1, {0}}, [LOAD_SUPER_ATTR_METHOD] = {1, 0, {0}}, [LOAD_ATTR_INSTANCE_VALUE] = {1, 1, {0}}, [LOAD_ATTR_WITH_HINT] = {1, 1, {0}}, @@ -218,7 +221,6 @@ const _PyOpcodeRecordSlotMap _PyOpcode_RecordSlotMaps[256] = { [GET_ITER] = {1, 0, {0}}, [GET_ITER_SELF] = {1, 0, {0}}, [GET_ITER_VIRTUAL] = {1, 0, {0}}, - [FOR_ITER] = {1, 1, {0}}, [FOR_ITER_GEN] = {1, 1, {0}}, [LOAD_SPECIAL] = {1, 0, {0}}, [LOAD_ATTR_METHOD_WITH_VALUES] = {1, 1, {0}}, diff --git a/Python/specialize.c b/Python/specialize.c index b50728d4a2f3f3..c54807931f2326 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -2761,6 +2761,14 @@ _Py_Specialize_Send(_PyStackRef receiver_st, _Py_CODEUNIT *instr) specialize(instr, SEND_GEN); return; } + if (tp->_tp_iteritem != NULL) { + specialize(instr, SEND_VIRTUAL); + return; + } + if (tp == &_PyAsyncGenASend_Type) { + specialize(instr, SEND_ASYNC_GEN); + return; + } SPECIALIZATION_FAIL(SEND, _PySpecialization_ClassifyIterator(receiver)); failure: diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py index 414ca18be4654c..59bca201a947e3 100644 --- a/Tools/cases_generator/analyzer.py +++ b/Tools/cases_generator/analyzer.py @@ -717,6 +717,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool: "_Py_GatherStats_GetIter", "_PyStolenTuple_Free", "PyObject_GC_UnTrack", + "_PyErr_ExceptionMatches", )