Mailman 3 February 2024 - Python-checkins

[3.11] gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (GH-116121)
by encukou Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/9db482c7d9b98456ebf1dc9fa27e67f3fc… commit: 9db482c7d9b98456ebf1dc9fa27e67f3fc945817 branch: 3.11 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2024-02-29T14:44:55Z summary: [3.11] gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (GH-116121) gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (cherry picked from commit 186fa9387669bcba6d3974a99c012c2b2c6fb4ce) gh-116103: Prevent error in WindowsLoadTracker.__del__ if there was a permission error Co-authored-by: Petr Viktorin <encukou(a)gmail.com> files: M Lib/test/libregrtest/win_utils.py diff --git a/Lib/test/libregrtest/win_utils.py b/Lib/test/libregrtest/win_utils.py index 5736cdfd3c7292..b51fde0af57d1f 100644 --- a/Lib/test/libregrtest/win_utils.py +++ b/Lib/test/libregrtest/win_utils.py @@ -24,6 +24,10 @@ class WindowsLoadTracker(): """ def __init__(self): + # make __del__ not fail if pre-flight test fails + self._running = None + self._stopped = None + # Pre-flight test for access to the performance data; # `PermissionError` will be raised if not allowed winreg.QueryInfoKey(winreg.HKEY_PERFORMANCE_DATA)

1 0

[3.12] gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (GH-116120)
by encukou Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/845123d64110011e166f272c878bd56c14… commit: 845123d64110011e166f272c878bd56c1405bfb0 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2024-02-29T14:43:05Z summary: [3.12] gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (GH-116120) gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) (cherry picked from commit 186fa9387669bcba6d3974a99c012c2b2c6fb4ce) gh-116103: Prevent error in WindowsLoadTracker.__del__ if there was a permission error Co-authored-by: Petr Viktorin <encukou(a)gmail.com> files: M Lib/test/libregrtest/win_utils.py diff --git a/Lib/test/libregrtest/win_utils.py b/Lib/test/libregrtest/win_utils.py index 5736cdfd3c7292..b51fde0af57d1f 100644 --- a/Lib/test/libregrtest/win_utils.py +++ b/Lib/test/libregrtest/win_utils.py @@ -24,6 +24,10 @@ class WindowsLoadTracker(): """ def __init__(self): + # make __del__ not fail if pre-flight test fails + self._running = None + self._stopped = None + # Pre-flight test for access to the performance data; # `PermissionError` will be raised if not allowed winreg.QueryInfoKey(winreg.HKEY_PERFORMANCE_DATA)

1 0

[3.12] gh-116034: fix location info on the error of a failed assertion (#116054)
by iritkatriel Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/6359141867595f84f9e803e1053ae51db3… commit: 6359141867595f84f9e803e1053ae51db3203c49 branch: 3.12 author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2024-02-29T12:36:54Z summary: [3.12] gh-116034: fix location info on the error of a failed assertion (#116054) files: A Misc/NEWS.d/next/Core and Builtins/2024-02-28-16-42-17.gh-issue-116034.-Uu9tf.rst M Lib/test/test_compile.py M Lib/test/test_traceback.py M Python/compile.c diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index 815800f4e2f530..6ed7fe2b06597c 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -1412,7 +1412,7 @@ def test_multiline_assert(self): self.assertOpcodeSourcePositionIs(compiled_code, 'CALL', line=1, end_line=3, column=0, end_column=30, occurrence=1) self.assertOpcodeSourcePositionIs(compiled_code, 'RAISE_VARARGS', - line=1, end_line=3, column=0, end_column=30, occurrence=1) + line=1, end_line=3, column=8, end_column=16, occurrence=1) def test_multiline_generator_expression(self): snippet = textwrap.dedent("""\ diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 61eb0a7ef93d7f..d12b559cf076d6 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -666,6 +666,23 @@ def f_with_binary_operator(): result_lines = self.get_exception(f_with_binary_operator) self.assertEqual(result_lines, expected_error.splitlines()) + def test_caret_for_failed_assertion(self): + def f_assert(): + test = 3 + assert test == 1 and test == 2, "Bug found?" + + lineno_f = f_assert.__code__.co_firstlineno + expected_error = ( + 'Traceback (most recent call last):\n' + f' File "{__file__}", line {self.callable_line}, in get_exception\n' + ' callable()\n' + f' File "{__file__}", line {lineno_f+2}, in f_assert\n' + ' assert test == 1 and test == 2, "Bug found?"\n' + ' ^^^^^^^^^^^^^^^^^^^^^^^\n' + ) + result_lines = self.get_exception(f_assert) + self.assertEqual(result_lines, expected_error.splitlines()) + def test_traceback_specialization_with_syntax_error(self): bytecode = compile("1 / 0 / 1 / 2\n", TESTFN, "exec") diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-02-28-16-42-17.gh-issue-116034.-Uu9tf.rst b/Misc/NEWS.d/next/Core and Builtins/2024-02-28-16-42-17.gh-issue-116034.-Uu9tf.rst new file mode 100644 index 00000000000000..c711b63605d1a1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2024-02-28-16-42-17.gh-issue-116034.-Uu9tf.rst @@ -0,0 +1 @@ +Fix location of the error on a failed assertion. diff --git a/Python/compile.c b/Python/compile.c index ddd7b5c795b9ef..a871e9c417517f 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3883,7 +3883,7 @@ compiler_assert(struct compiler *c, stmt_ty s) VISIT(c, expr, s->v.Assert.msg); ADDOP_I(c, LOC(s), CALL, 0); } - ADDOP_I(c, LOC(s), RAISE_VARARGS, 1); + ADDOP_I(c, LOC(s->v.Assert.test), RAISE_VARARGS, 1); USE_LABEL(c, end); return SUCCESS;

1 0

gh-115881: Document feature_version limitations (#115980)
by pablogsal Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/bea2795be2c08dde3830f987830414f3f1… commit: bea2795be2c08dde3830f987830414f3f12bc1eb branch: main author: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2024-02-29T11:09:09Z summary: gh-115881: Document feature_version limitations (#115980) files: M Doc/library/ast.rst diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index d629393f023c8a..5ed6eb63c0fb62 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -2183,12 +2183,15 @@ and classes for traversing abstract syntax trees: modified to correspond to :pep:`484` "signature type comments", e.g. ``(str, int) -> List[str]``. - Also, setting ``feature_version`` to a tuple ``(major, minor)`` - will attempt to parse using that Python version's grammar. - Currently ``major`` must equal to ``3``. For example, setting - ``feature_version=(3, 4)`` will allow the use of ``async`` and - ``await`` as variable names. The lowest supported version is - ``(3, 7)``; the highest is ``sys.version_info[0:2]``. + Setting ``feature_version`` to a tuple ``(major, minor)`` will result in + a "best-effort" attempt to parse using that Python version's grammar. + For example, setting ``feature_version=(3, 9)`` will attempt to disallow + parsing of :keyword:`match` statements. + Currently ``major`` must equal to ``3``. The lowest supported version is + ``(3, 7)`` (and this may increase in future Python versions); + the highest is ``sys.version_info[0:2]``. "Best-effort" attempt means there + is no guarantee that the parse (or success of the parse) is the same as + when run on the Python version corresponding to ``feature_version``. If source contains a null character ('\0'), :exc:`ValueError` is raised.

1 0

gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105)
by encukou Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/186fa9387669bcba6d3974a99c012c2b2c… commit: 186fa9387669bcba6d3974a99c012c2b2c6fb4ce branch: main author: Petr Viktorin <encukou(a)gmail.com> committer: encukou <encukou(a)gmail.com> date: 2024-02-29T11:40:18+01:00 summary: gh-116103: Prevent error in WindowsLoadTracker.__del__ on permission error (GH-116105) gh-116103: Prevent error in WindowsLoadTracker.__del__ if there was a permission error files: M Lib/test/libregrtest/win_utils.py diff --git a/Lib/test/libregrtest/win_utils.py b/Lib/test/libregrtest/win_utils.py index 5736cdfd3c7292..b51fde0af57d1f 100644 --- a/Lib/test/libregrtest/win_utils.py +++ b/Lib/test/libregrtest/win_utils.py @@ -24,6 +24,10 @@ class WindowsLoadTracker(): """ def __init__(self): + # make __del__ not fail if pre-flight test fails + self._running = None + self._stopped = None + # Pre-flight test for access to the performance data; # `PermissionError` will be raised if not allowed winreg.QueryInfoKey(winreg.HKEY_PERFORMANCE_DATA)

1 0

[3.11] gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (#116107)
by gpshead Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/6e328371c56c7752932a50329102065342… commit: 6e328371c56c7752932a503291020653421e0485 branch: 3.11 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: gpshead <greg(a)krypto.org> date: 2024-02-29T01:54:48-08:00 summary: [3.11] gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (#116107) gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (cherry picked from commit fb2e17b642fc3089e4f98e4bf6b09dd362e6b27d) Co-authored-by: Erlend E. Aasland <erlend(a)python.org> Co-authored-by: Carol Willing <carolcode(a)willingconsulting.com> Co-authored-by: Gregory P. Smith <greg(a)krypto.org> Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: M Doc/library/inspect.rst diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 2ddd5beebd94a4..9048e6a405cd24 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -634,9 +634,6 @@ function. Accepts a wide range of Python callables, from plain functions and classes to :func:`functools.partial` objects. - If the passed object has a ``__signature__`` attribute, this function - returns it without further computations. - For objects defined in modules using stringized annotations (``from __future__ import annotations``), :func:`signature` will attempt to automatically un-stringize the annotations using @@ -671,6 +668,13 @@ function. Python. For example, in CPython, some built-in functions defined in C provide no metadata about their arguments. + .. impl-detail:: + + If the passed object has a :attr:`!__signature__` attribute, + we may use it to create the signature. + The exact semantics are an implementation detail and are subject to + unannounced changes. Consult the source code for current semantics. + .. class:: Signature(parameters=None, *, return_annotation=Signature.empty)

1 0

[3.12] gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (#116106)
by gpshead Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/31462d4de2abb4a94ea41c21df3ef7d2fe… commit: 31462d4de2abb4a94ea41c21df3ef7d2fe6b8a22 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: gpshead <greg(a)krypto.org> date: 2024-02-29T01:54:36-08:00 summary: [3.12] gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (#116106) gh-115937: Remove implementation details from inspect.signature() docs (GH-116086) (cherry picked from commit fb2e17b642fc3089e4f98e4bf6b09dd362e6b27d) Co-authored-by: Erlend E. Aasland <erlend(a)python.org> Co-authored-by: Carol Willing <carolcode(a)willingconsulting.com> Co-authored-by: Gregory P. Smith <greg(a)krypto.org> Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: M Doc/library/inspect.rst diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index a1178cfccddf82..c4c381bb8335b8 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -655,9 +655,6 @@ function. Accepts a wide range of Python callables, from plain functions and classes to :func:`functools.partial` objects. - If the passed object has a ``__signature__`` attribute, this function - returns it without further computations. - For objects defined in modules using stringized annotations (``from __future__ import annotations``), :func:`signature` will attempt to automatically un-stringize the annotations using @@ -692,6 +689,13 @@ function. Python. For example, in CPython, some built-in functions defined in C provide no metadata about their arguments. + .. impl-detail:: + + If the passed object has a :attr:`!__signature__` attribute, + we may use it to create the signature. + The exact semantics are an implementation detail and are subject to + unannounced changes. Consult the source code for current semantics. + .. class:: Signature(parameters=None, *, return_annotation=Signature.empty)

1 0

gh-115937: Remove implementation details from inspect.signature() docs (#116086)
by erlend-aasland Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/fb2e17b642fc3089e4f98e4bf6b09dd362… commit: fb2e17b642fc3089e4f98e4bf6b09dd362e6b27d branch: main author: Erlend E. Aasland <erlend(a)python.org> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2024-02-29T09:42:28Z summary: gh-115937: Remove implementation details from inspect.signature() docs (#116086) Co-authored-by: Carol Willing <carolcode(a)willingconsulting.com> Co-authored-by: Gregory P. Smith <greg(a)krypto.org> Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: M Doc/library/inspect.rst diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 8a74cadb98a0db..ed8d705da3b0b5 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -665,9 +665,6 @@ function. Accepts a wide range of Python callables, from plain functions and classes to :func:`functools.partial` objects. - If the passed object has a ``__signature__`` attribute, this function - returns it without further computations. - For objects defined in modules using stringized annotations (``from __future__ import annotations``), :func:`signature` will attempt to automatically un-stringize the annotations using @@ -702,6 +699,13 @@ function. Python. For example, in CPython, some built-in functions defined in C provide no metadata about their arguments. + .. impl-detail:: + + If the passed object has a :attr:`!__signature__` attribute, + we may use it to create the signature. + The exact semantics are an implementation detail and are subject to + unannounced changes. Consult the source code for current semantics. + .. class:: Signature(parameters=None, *, return_annotation=Signature.empty)

1 0

[3.12] gh-114572: Fix locking in cert_store_stats and get_ca_certs (GH-114573) (GH-115547)
by encukou Feb. 29, 2024

Feb. 29, 2024

https://github.com/python/cpython/commit/542f3272f56f31ed04e74c40635a913fbc… commit: 542f3272f56f31ed04e74c40635a913fbc12d286 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2024-02-29T08:53:56+01:00 summary: [3.12] gh-114572: Fix locking in cert_store_stats and get_ca_certs (GH-114573) (GH-115547) gh-114572: Fix locking in cert_store_stats and get_ca_certs (GH-114573) * gh-114572: Fix locking in cert_store_stats and get_ca_certs cert_store_stats and get_ca_certs query the SSLContext's X509_STORE with X509_STORE_get0_objects, but reading the result requires a lock. See https://github.com/openssl/openssl/pull/23224 for details. Instead, use X509_STORE_get1_objects, newly added in that PR. X509_STORE_get1_objects does not exist in current OpenSSLs, but we can polyfill it with X509_STORE_lock and X509_STORE_unlock. * Work around const-correctness problem * Add missing X509_STORE_get1_objects failure check * Add blurb (cherry picked from commit bce693111bff906ccf9281c22371331aaff766ab) Co-authored-by: David Benjamin <davidben(a)google.com> files: A Misc/NEWS.d/next/Security/2024-01-26-22-14-09.gh-issue-114572.t1QMQD.rst M Modules/_ssl.c diff --git a/Misc/NEWS.d/next/Security/2024-01-26-22-14-09.gh-issue-114572.t1QMQD.rst b/Misc/NEWS.d/next/Security/2024-01-26-22-14-09.gh-issue-114572.t1QMQD.rst new file mode 100644 index 00000000000000..b4f9fe64db0615 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2024-01-26-22-14-09.gh-issue-114572.t1QMQD.rst @@ -0,0 +1,4 @@ +:meth:`ssl.SSLContext.cert_store_stats` and +:meth:`ssl.SSLContext.get_ca_certs` now correctly lock access to the +certificate store, when the :class:`ssl.SSLContext` is shared across +multiple threads. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index b602eb04c795a9..5f1425ae464059 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4520,6 +4520,50 @@ set_sni_callback(PySSLContext *self, PyObject *arg, void *c) return 0; } +#if OPENSSL_VERSION_NUMBER < 0x30300000L +static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj) +{ + int ok; + X509_OBJECT *ret = X509_OBJECT_new(); + if (ret == NULL) { + return NULL; + } + switch (X509_OBJECT_get_type(obj)) { + case X509_LU_X509: + ok = X509_OBJECT_set1_X509(ret, X509_OBJECT_get0_X509(obj)); + break; + case X509_LU_CRL: + /* X509_OBJECT_get0_X509_CRL was not const-correct prior to 3.0.*/ + ok = X509_OBJECT_set1_X509_CRL( + ret, X509_OBJECT_get0_X509_CRL((X509_OBJECT *)obj)); + break; + default: + /* We cannot duplicate unrecognized types in a polyfill, but it is + * safe to leave an empty object. The caller will ignore it. */ + ok = 1; + break; + } + if (!ok) { + X509_OBJECT_free(ret); + return NULL; + } + return ret; +} + +static STACK_OF(X509_OBJECT) * +X509_STORE_get1_objects(X509_STORE *store) +{ + STACK_OF(X509_OBJECT) *ret; + if (!X509_STORE_lock(store)) { + return NULL; + } + ret = sk_X509_OBJECT_deep_copy(X509_STORE_get0_objects(store), + x509_object_dup, X509_OBJECT_free); + X509_STORE_unlock(store); + return ret; +} +#endif + PyDoc_STRVAR(PySSLContext_sni_callback_doc, "Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension.\n\ \n\ @@ -4549,7 +4593,12 @@ _ssl__SSLContext_cert_store_stats_impl(PySSLContext *self) int x509 = 0, crl = 0, ca = 0, i; store = SSL_CTX_get_cert_store(self->ctx); - objs = X509_STORE_get0_objects(store); + objs = X509_STORE_get1_objects(store); + if (objs == NULL) { + PyErr_SetString(PyExc_MemoryError, "failed to query cert store"); + return NULL; + } + for (i = 0; i < sk_X509_OBJECT_num(objs); i++) { obj = sk_X509_OBJECT_value(objs, i); switch (X509_OBJECT_get_type(obj)) { @@ -4563,12 +4612,11 @@ _ssl__SSLContext_cert_store_stats_impl(PySSLContext *self) crl++; break; default: - /* Ignore X509_LU_FAIL, X509_LU_RETRY, X509_LU_PKEY. - * As far as I can tell they are internal states and never - * stored in a cert store */ + /* Ignore unrecognized types. */ break; } } + sk_X509_OBJECT_pop_free(objs, X509_OBJECT_free); return Py_BuildValue("{sisisi}", "x509", x509, "crl", crl, "x509_ca", ca); } @@ -4600,7 +4648,12 @@ _ssl__SSLContext_get_ca_certs_impl(PySSLContext *self, int binary_form) } store = SSL_CTX_get_cert_store(self->ctx); - objs = X509_STORE_get0_objects(store); + objs = X509_STORE_get1_objects(store); + if (objs == NULL) { + PyErr_SetString(PyExc_MemoryError, "failed to query cert store"); + goto error; + } + for (i = 0; i < sk_X509_OBJECT_num(objs); i++) { X509_OBJECT *obj; X509 *cert; @@ -4628,9 +4681,11 @@ _ssl__SSLContext_get_ca_certs_impl(PySSLContext *self, int binary_form) } Py_CLEAR(ci); } + sk_X509_OBJECT_pop_free(objs, X509_OBJECT_free); return rlist; error: + sk_X509_OBJECT_pop_free(objs, X509_OBJECT_free); Py_XDECREF(ci); Py_XDECREF(rlist); return NULL;

1 0

gh-115816: Generate calls to sym_new_const() etc. without _Py_uop prefix (#116077)
by gvanrossum Feb. 28, 2024

Feb. 28, 2024

https://github.com/python/cpython/commit/86e5e063aba76a7f4fc58f7d06b17b0a47… commit: 86e5e063aba76a7f4fc58f7d06b17b0a4730fd8e branch: main author: Guido van Rossum <guido(a)python.org> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2024-02-29T00:05:53Z summary: gh-115816: Generate calls to sym_new_const() etc. without _Py_uop prefix (#116077) This was left behind by GH-115987. Basically a lot of diffs like this: ``` - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); ``` files: M Lib/test/test_generated_cases.py M Python/optimizer_cases.c.h M Tools/cases_generator/optimizer_generator.py diff --git a/Lib/test/test_generated_cases.py b/Lib/test/test_generated_cases.py index 18bf8ab29148c4..6fcb5d58dd7f34 100644 --- a/Lib/test/test_generated_cases.py +++ b/Lib/test/test_generated_cases.py @@ -900,7 +900,7 @@ def test_overridden_abstract_args(self): case OP2: { _Py_UopsSymbol *out; - out = _Py_uop_sym_new_unknown(ctx); + out = sym_new_unknown(ctx); if (out == NULL) goto out_of_space; stack_pointer[-1] = out; break; @@ -925,7 +925,7 @@ def test_no_overridden_case(self): output = """ case OP: { _Py_UopsSymbol *out; - out = _Py_uop_sym_new_unknown(ctx); + out = sym_new_unknown(ctx); if (out == NULL) goto out_of_space; stack_pointer[-1] = out; break; diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 9b387c07850245..b38c03bed4b4d0 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -80,7 +80,7 @@ case _END_SEND: { _Py_UopsSymbol *value; - value = _Py_uop_sym_new_unknown(ctx); + value = sym_new_unknown(ctx); if (value == NULL) goto out_of_space; stack_pointer[-2] = value; stack_pointer += -1; @@ -89,7 +89,7 @@ case _UNARY_NEGATIVE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -97,7 +97,7 @@ case _UNARY_NOT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -105,7 +105,7 @@ case _TO_BOOL: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -117,7 +117,7 @@ case _TO_BOOL_INT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -125,7 +125,7 @@ case _TO_BOOL_LIST: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -133,7 +133,7 @@ case _TO_BOOL_NONE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -141,7 +141,7 @@ case _TO_BOOL_STR: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -149,7 +149,7 @@ case _TO_BOOL_ALWAYS_TRUE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -157,7 +157,7 @@ case _UNARY_INVERT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -390,7 +390,7 @@ case _BINARY_OP_ADD_UNICODE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -399,7 +399,7 @@ case _BINARY_SUBSCR: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -408,7 +408,7 @@ case _BINARY_SLICE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-3] = res; stack_pointer += -2; @@ -422,7 +422,7 @@ case _BINARY_SUBSCR_LIST_INT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -431,7 +431,7 @@ case _BINARY_SUBSCR_STR_INT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -440,7 +440,7 @@ case _BINARY_SUBSCR_TUPLE_INT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -449,7 +449,7 @@ case _BINARY_SUBSCR_DICT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -490,7 +490,7 @@ case _CALL_INTRINSIC_1: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -498,7 +498,7 @@ case _CALL_INTRINSIC_2: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -525,7 +525,7 @@ case _GET_AITER: { _Py_UopsSymbol *iter; - iter = _Py_uop_sym_new_unknown(ctx); + iter = sym_new_unknown(ctx); if (iter == NULL) goto out_of_space; stack_pointer[-1] = iter; break; @@ -533,7 +533,7 @@ case _GET_ANEXT: { _Py_UopsSymbol *awaitable; - awaitable = _Py_uop_sym_new_unknown(ctx); + awaitable = sym_new_unknown(ctx); if (awaitable == NULL) goto out_of_space; stack_pointer[0] = awaitable; stack_pointer += 1; @@ -542,7 +542,7 @@ case _GET_AWAITABLE: { _Py_UopsSymbol *iter; - iter = _Py_uop_sym_new_unknown(ctx); + iter = sym_new_unknown(ctx); if (iter == NULL) goto out_of_space; stack_pointer[-1] = iter; break; @@ -561,7 +561,7 @@ case _LOAD_ASSERTION_ERROR: { _Py_UopsSymbol *value; - value = _Py_uop_sym_new_unknown(ctx); + value = sym_new_unknown(ctx); if (value == NULL) goto out_of_space; stack_pointer[0] = value; stack_pointer += 1; @@ -570,7 +570,7 @@ case _LOAD_BUILD_CLASS: { _Py_UopsSymbol *bc; - bc = _Py_uop_sym_new_unknown(ctx); + bc = sym_new_unknown(ctx); if (bc == NULL) goto out_of_space; stack_pointer[0] = bc; stack_pointer += 1; @@ -604,7 +604,7 @@ _Py_UopsSymbol **values; values = &stack_pointer[-1]; for (int _i = oparg; --_i >= 0;) { - values[_i] = _Py_uop_sym_new_unknown(ctx); + values[_i] = sym_new_unknown(ctx); if (values[_i] == NULL) goto out_of_space; } stack_pointer += -1 + oparg; @@ -615,7 +615,7 @@ _Py_UopsSymbol **values; values = &stack_pointer[-1]; for (int _i = oparg; --_i >= 0;) { - values[_i] = _Py_uop_sym_new_unknown(ctx); + values[_i] = sym_new_unknown(ctx); if (values[_i] == NULL) goto out_of_space; } stack_pointer += -1 + oparg; @@ -626,7 +626,7 @@ _Py_UopsSymbol **values; values = &stack_pointer[-1]; for (int _i = oparg; --_i >= 0;) { - values[_i] = _Py_uop_sym_new_unknown(ctx); + values[_i] = sym_new_unknown(ctx); if (values[_i] == NULL) goto out_of_space; } stack_pointer += -1 + oparg; @@ -669,7 +669,7 @@ case _LOAD_LOCALS: { _Py_UopsSymbol *locals; - locals = _Py_uop_sym_new_unknown(ctx); + locals = sym_new_unknown(ctx); if (locals == NULL) goto out_of_space; stack_pointer[0] = locals; stack_pointer += 1; @@ -678,7 +678,7 @@ case _LOAD_FROM_DICT_OR_GLOBALS: { _Py_UopsSymbol *v; - v = _Py_uop_sym_new_unknown(ctx); + v = sym_new_unknown(ctx); if (v == NULL) goto out_of_space; stack_pointer[-1] = v; break; @@ -686,7 +686,7 @@ case _LOAD_NAME: { _Py_UopsSymbol *v; - v = _Py_uop_sym_new_unknown(ctx); + v = sym_new_unknown(ctx); if (v == NULL) goto out_of_space; stack_pointer[0] = v; stack_pointer += 1; @@ -696,9 +696,9 @@ case _LOAD_GLOBAL: { _Py_UopsSymbol *res; _Py_UopsSymbol *null = NULL; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; - null = _Py_uop_sym_new_null(ctx); + null = sym_new_null(ctx); if (null == NULL) goto out_of_space; stack_pointer[0] = res; if (oparg & 1) stack_pointer[1] = null; @@ -717,9 +717,9 @@ case _LOAD_GLOBAL_MODULE: { _Py_UopsSymbol *res; _Py_UopsSymbol *null = NULL; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; - null = _Py_uop_sym_new_null(ctx); + null = sym_new_null(ctx); if (null == NULL) goto out_of_space; stack_pointer[0] = res; if (oparg & 1) stack_pointer[1] = null; @@ -730,9 +730,9 @@ case _LOAD_GLOBAL_BUILTINS: { _Py_UopsSymbol *res; _Py_UopsSymbol *null = NULL; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; - null = _Py_uop_sym_new_null(ctx); + null = sym_new_null(ctx); if (null == NULL) goto out_of_space; stack_pointer[0] = res; if (oparg & 1) stack_pointer[1] = null; @@ -754,7 +754,7 @@ case _LOAD_FROM_DICT_OR_DEREF: { _Py_UopsSymbol *value; - value = _Py_uop_sym_new_unknown(ctx); + value = sym_new_unknown(ctx); if (value == NULL) goto out_of_space; stack_pointer[-1] = value; break; @@ -762,7 +762,7 @@ case _LOAD_DEREF: { _Py_UopsSymbol *value; - value = _Py_uop_sym_new_unknown(ctx); + value = sym_new_unknown(ctx); if (value == NULL) goto out_of_space; stack_pointer[0] = value; stack_pointer += 1; @@ -780,7 +780,7 @@ case _BUILD_STRING: { _Py_UopsSymbol *str; - str = _Py_uop_sym_new_unknown(ctx); + str = sym_new_unknown(ctx); if (str == NULL) goto out_of_space; stack_pointer[-oparg] = str; stack_pointer += 1 - oparg; @@ -789,7 +789,7 @@ case _BUILD_TUPLE: { _Py_UopsSymbol *tup; - tup = _Py_uop_sym_new_unknown(ctx); + tup = sym_new_unknown(ctx); if (tup == NULL) goto out_of_space; stack_pointer[-oparg] = tup; stack_pointer += 1 - oparg; @@ -798,7 +798,7 @@ case _BUILD_LIST: { _Py_UopsSymbol *list; - list = _Py_uop_sym_new_unknown(ctx); + list = sym_new_unknown(ctx); if (list == NULL) goto out_of_space; stack_pointer[-oparg] = list; stack_pointer += 1 - oparg; @@ -817,7 +817,7 @@ case _BUILD_SET: { _Py_UopsSymbol *set; - set = _Py_uop_sym_new_unknown(ctx); + set = sym_new_unknown(ctx); if (set == NULL) goto out_of_space; stack_pointer[-oparg] = set; stack_pointer += 1 - oparg; @@ -826,7 +826,7 @@ case _BUILD_MAP: { _Py_UopsSymbol *map; - map = _Py_uop_sym_new_unknown(ctx); + map = sym_new_unknown(ctx); if (map == NULL) goto out_of_space; stack_pointer[-oparg*2] = map; stack_pointer += 1 - oparg*2; @@ -839,7 +839,7 @@ case _BUILD_CONST_KEY_MAP: { _Py_UopsSymbol *map; - map = _Py_uop_sym_new_unknown(ctx); + map = sym_new_unknown(ctx); if (map == NULL) goto out_of_space; stack_pointer[-1 - oparg] = map; stack_pointer += -oparg; @@ -865,7 +865,7 @@ case _LOAD_SUPER_ATTR_ATTR: { _Py_UopsSymbol *attr; - attr = _Py_uop_sym_new_unknown(ctx); + attr = sym_new_unknown(ctx); if (attr == NULL) goto out_of_space; stack_pointer[-3] = attr; stack_pointer += -2; @@ -875,9 +875,9 @@ case _LOAD_SUPER_ATTR_METHOD: { _Py_UopsSymbol *attr; _Py_UopsSymbol *self_or_null; - attr = _Py_uop_sym_new_unknown(ctx); + attr = sym_new_unknown(ctx); if (attr == NULL) goto out_of_space; - self_or_null = _Py_uop_sym_new_unknown(ctx); + self_or_null = sym_new_unknown(ctx); if (self_or_null == NULL) goto out_of_space; stack_pointer[-3] = attr; stack_pointer[-2] = self_or_null; @@ -888,9 +888,9 @@ case _LOAD_ATTR: { _Py_UopsSymbol *attr; _Py_UopsSymbol *self_or_null = NULL; - attr = _Py_uop_sym_new_unknown(ctx); + attr = sym_new_unknown(ctx); if (attr == NULL) goto out_of_space; - self_or_null = _Py_uop_sym_new_unknown(ctx); + self_or_null = sym_new_unknown(ctx); if (self_or_null == NULL) goto out_of_space; stack_pointer[-1] = attr; if (oparg & 1) stack_pointer[0] = self_or_null; @@ -1048,7 +1048,7 @@ case _COMPARE_OP: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -1057,7 +1057,7 @@ case _COMPARE_OP_FLOAT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -1066,7 +1066,7 @@ case _COMPARE_OP_INT: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -1075,7 +1075,7 @@ case _COMPARE_OP_STR: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -1084,7 +1084,7 @@ case _IS_OP: { _Py_UopsSymbol *b; - b = _Py_uop_sym_new_unknown(ctx); + b = sym_new_unknown(ctx); if (b == NULL) goto out_of_space; stack_pointer[-2] = b; stack_pointer += -1; @@ -1093,7 +1093,7 @@ case _CONTAINS_OP: { _Py_UopsSymbol *b; - b = _Py_uop_sym_new_unknown(ctx); + b = sym_new_unknown(ctx); if (b == NULL) goto out_of_space; stack_pointer[-2] = b; stack_pointer += -1; @@ -1103,9 +1103,9 @@ case _CHECK_EG_MATCH: { _Py_UopsSymbol *rest; _Py_UopsSymbol *match; - rest = _Py_uop_sym_new_unknown(ctx); + rest = sym_new_unknown(ctx); if (rest == NULL) goto out_of_space; - match = _Py_uop_sym_new_unknown(ctx); + match = sym_new_unknown(ctx); if (match == NULL) goto out_of_space; stack_pointer[-2] = rest; stack_pointer[-1] = match; @@ -1114,7 +1114,7 @@ case _CHECK_EXC_MATCH: { _Py_UopsSymbol *b; - b = _Py_uop_sym_new_unknown(ctx); + b = sym_new_unknown(ctx); if (b == NULL) goto out_of_space; stack_pointer[-1] = b; break; @@ -1126,7 +1126,7 @@ case _IS_NONE: { _Py_UopsSymbol *b; - b = _Py_uop_sym_new_unknown(ctx); + b = sym_new_unknown(ctx); if (b == NULL) goto out_of_space; stack_pointer[-1] = b; break; @@ -1134,7 +1134,7 @@ case _GET_LEN: { _Py_UopsSymbol *len_o; - len_o = _Py_uop_sym_new_unknown(ctx); + len_o = sym_new_unknown(ctx); if (len_o == NULL) goto out_of_space; stack_pointer[0] = len_o; stack_pointer += 1; @@ -1143,7 +1143,7 @@ case _MATCH_CLASS: { _Py_UopsSymbol *attrs; - attrs = _Py_uop_sym_new_unknown(ctx); + attrs = sym_new_unknown(ctx); if (attrs == NULL) goto out_of_space; stack_pointer[-3] = attrs; stack_pointer += -2; @@ -1152,7 +1152,7 @@ case _MATCH_MAPPING: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[0] = res; stack_pointer += 1; @@ -1161,7 +1161,7 @@ case _MATCH_SEQUENCE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[0] = res; stack_pointer += 1; @@ -1170,7 +1170,7 @@ case _MATCH_KEYS: { _Py_UopsSymbol *values_or_none; - values_or_none = _Py_uop_sym_new_unknown(ctx); + values_or_none = sym_new_unknown(ctx); if (values_or_none == NULL) goto out_of_space; stack_pointer[0] = values_or_none; stack_pointer += 1; @@ -1179,7 +1179,7 @@ case _GET_ITER: { _Py_UopsSymbol *iter; - iter = _Py_uop_sym_new_unknown(ctx); + iter = sym_new_unknown(ctx); if (iter == NULL) goto out_of_space; stack_pointer[-1] = iter; break; @@ -1187,7 +1187,7 @@ case _GET_YIELD_FROM_ITER: { _Py_UopsSymbol *iter; - iter = _Py_uop_sym_new_unknown(ctx); + iter = sym_new_unknown(ctx); if (iter == NULL) goto out_of_space; stack_pointer[-1] = iter; break; @@ -1197,7 +1197,7 @@ case _FOR_ITER_TIER_TWO: { _Py_UopsSymbol *next; - next = _Py_uop_sym_new_unknown(ctx); + next = sym_new_unknown(ctx); if (next == NULL) goto out_of_space; stack_pointer[0] = next; stack_pointer += 1; @@ -1218,7 +1218,7 @@ case _ITER_NEXT_LIST: { _Py_UopsSymbol *next; - next = _Py_uop_sym_new_unknown(ctx); + next = sym_new_unknown(ctx); if (next == NULL) goto out_of_space; stack_pointer[0] = next; stack_pointer += 1; @@ -1237,7 +1237,7 @@ case _ITER_NEXT_TUPLE: { _Py_UopsSymbol *next; - next = _Py_uop_sym_new_unknown(ctx); + next = sym_new_unknown(ctx); if (next == NULL) goto out_of_space; stack_pointer[0] = next; stack_pointer += 1; @@ -1270,9 +1270,9 @@ case _BEFORE_ASYNC_WITH: { _Py_UopsSymbol *exit; _Py_UopsSymbol *res; - exit = _Py_uop_sym_new_unknown(ctx); + exit = sym_new_unknown(ctx); if (exit == NULL) goto out_of_space; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = exit; stack_pointer[0] = res; @@ -1283,9 +1283,9 @@ case _BEFORE_WITH: { _Py_UopsSymbol *exit; _Py_UopsSymbol *res; - exit = _Py_uop_sym_new_unknown(ctx); + exit = sym_new_unknown(ctx); if (exit == NULL) goto out_of_space; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = exit; stack_pointer[0] = res; @@ -1295,7 +1295,7 @@ case _WITH_EXCEPT_START: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[0] = res; stack_pointer += 1; @@ -1305,9 +1305,9 @@ case _PUSH_EXC_INFO: { _Py_UopsSymbol *prev_exc; _Py_UopsSymbol *new_exc; - prev_exc = _Py_uop_sym_new_unknown(ctx); + prev_exc = sym_new_unknown(ctx); if (prev_exc == NULL) goto out_of_space; - new_exc = _Py_uop_sym_new_unknown(ctx); + new_exc = sym_new_unknown(ctx); if (new_exc == NULL) goto out_of_space; stack_pointer[-1] = prev_exc; stack_pointer[0] = new_exc; @@ -1355,7 +1355,7 @@ case _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES: { _Py_UopsSymbol *attr; - attr = _Py_uop_sym_new_unknown(ctx); + attr = sym_new_unknown(ctx); if (attr == NULL) goto out_of_space; stack_pointer[-1] = attr; break; @@ -1363,7 +1363,7 @@ case _LOAD_ATTR_NONDESCRIPTOR_NO_DICT: { _Py_UopsSymbol *attr; - attr = _Py_uop_sym_new_unknown(ctx); + attr = sym_new_unknown(ctx); if (attr == NULL) goto out_of_space; stack_pointer[-1] = attr; break; @@ -1488,7 +1488,7 @@ case _CALL_TYPE_1: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1497,7 +1497,7 @@ case _CALL_STR_1: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1506,7 +1506,7 @@ case _CALL_TUPLE_1: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1522,7 +1522,7 @@ case _CALL_BUILTIN_CLASS: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1531,7 +1531,7 @@ case _CALL_BUILTIN_O: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1540,7 +1540,7 @@ case _CALL_BUILTIN_FAST: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1549,7 +1549,7 @@ case _CALL_BUILTIN_FAST_WITH_KEYWORDS: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1558,7 +1558,7 @@ case _CALL_LEN: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1567,7 +1567,7 @@ case _CALL_ISINSTANCE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1576,7 +1576,7 @@ case _CALL_METHOD_DESCRIPTOR_O: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1585,7 +1585,7 @@ case _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1594,7 +1594,7 @@ case _CALL_METHOD_DESCRIPTOR_NOARGS: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1603,7 +1603,7 @@ case _CALL_METHOD_DESCRIPTOR_FAST: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2 - oparg] = res; stack_pointer += -1 - oparg; @@ -1620,7 +1620,7 @@ case _MAKE_FUNCTION: { _Py_UopsSymbol *func; - func = _Py_uop_sym_new_unknown(ctx); + func = sym_new_unknown(ctx); if (func == NULL) goto out_of_space; stack_pointer[-1] = func; break; @@ -1628,7 +1628,7 @@ case _SET_FUNCTION_ATTRIBUTE: { _Py_UopsSymbol *func; - func = _Py_uop_sym_new_unknown(ctx); + func = sym_new_unknown(ctx); if (func == NULL) goto out_of_space; stack_pointer[-2] = func; stack_pointer += -1; @@ -1637,7 +1637,7 @@ case _BUILD_SLICE: { _Py_UopsSymbol *slice; - slice = _Py_uop_sym_new_unknown(ctx); + slice = sym_new_unknown(ctx); if (slice == NULL) goto out_of_space; stack_pointer[-2 - ((oparg == 3) ? 1 : 0)] = slice; stack_pointer += -1 - ((oparg == 3) ? 1 : 0); @@ -1646,7 +1646,7 @@ case _CONVERT_VALUE: { _Py_UopsSymbol *result; - result = _Py_uop_sym_new_unknown(ctx); + result = sym_new_unknown(ctx); if (result == NULL) goto out_of_space; stack_pointer[-1] = result; break; @@ -1654,7 +1654,7 @@ case _FORMAT_SIMPLE: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-1] = res; break; @@ -1662,7 +1662,7 @@ case _FORMAT_WITH_SPEC: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; @@ -1682,7 +1682,7 @@ case _BINARY_OP: { _Py_UopsSymbol *res; - res = _Py_uop_sym_new_unknown(ctx); + res = sym_new_unknown(ctx); if (res == NULL) goto out_of_space; stack_pointer[-2] = res; stack_pointer += -1; diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py index e933fee8f4242b..d3ce4c8a25f5b8 100644 --- a/Tools/cases_generator/optimizer_generator.py +++ b/Tools/cases_generator/optimizer_generator.py @@ -28,7 +28,7 @@ from cwriter import CWriter from typing import TextIO, Iterator from lexer import Token -from stack import StackOffset, Stack, SizeMismatch, UNUSED +from stack import Stack, SizeMismatch, UNUSED DEFAULT_OUTPUT = ROOT / "Python/optimizer_cases.c.h" DEFAULT_ABSTRACT_INPUT = ROOT / "Python/optimizer_bytecodes.c" @@ -87,14 +87,14 @@ def emit_default(out: CWriter, uop: Uop) -> None: if var.name != "unused" and not var.peek: if var.is_array(): out.emit(f"for (int _i = {var.size}; --_i >= 0;) {{\n") - out.emit(f"{var.name}[_i] = _Py_uop_sym_new_unknown(ctx);\n") + out.emit(f"{var.name}[_i] = sym_new_unknown(ctx);\n") out.emit(f"if ({var.name}[_i] == NULL) goto out_of_space;\n") out.emit("}\n") elif var.name == "null": - out.emit(f"{var.name} = _Py_uop_sym_new_null(ctx);\n") + out.emit(f"{var.name} = sym_new_null(ctx);\n") out.emit(f"if ({var.name} == NULL) goto out_of_space;\n") else: - out.emit(f"{var.name} = _Py_uop_sym_new_unknown(ctx);\n") + out.emit(f"{var.name} = sym_new_unknown(ctx);\n") out.emit(f"if ({var.name} == NULL) goto out_of_space;\n")

1 0