diff --git a/Doc/conf.py b/Doc/conf.py index 6f66ed68c52e83..4ac6f6192a0806 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -569,6 +569,7 @@ # Relative filename of the data files refcount_file = 'data/refcounts.dat' stable_abi_file = 'data/stable_abi.dat' +threadsafety_file = 'data/threadsafety.dat' # Options for sphinxext-opengraph # ------------------------------- diff --git a/Doc/data/threadsafety.dat b/Doc/data/threadsafety.dat new file mode 100644 index 00000000000000..f063ca1360d5fb --- /dev/null +++ b/Doc/data/threadsafety.dat @@ -0,0 +1,19 @@ +# Thread safety annotations for C API functions. +# +# Each line has the form: +# function_name : level +# +# Where level is one of: +# incompatible -- not safe even with external locking +# compatible -- safe if the caller serializes all access with external locks +# distinct -- safe on distinct objects without external synchronization +# shared -- safe for concurrent use on the same object +# atomic -- atomic +# +# Lines beginning with '#' are ignored. +# The function name must match the C domain identifier used in the documentation. + +# Synchronization primitives (Doc/c-api/synchronization.rst) +PyMutex_Lock:shared: +PyMutex_Unlock:shared: +PyMutex_IsLocked:atomic: diff --git a/Doc/deprecations/pending-removal-in-3.20.rst b/Doc/deprecations/pending-removal-in-3.20.rst index 8372432a34daa5..176e8f3f9f601c 100644 --- a/Doc/deprecations/pending-removal-in-3.20.rst +++ b/Doc/deprecations/pending-removal-in-3.20.rst @@ -1,6 +1,13 @@ Pending removal in Python 3.20 ------------------------------ +* Calling the ``__new__()`` method of :class:`struct.Struct` without the + *format* argument is deprecated and will be removed in Python 3.20. Calling + :meth:`~object.__init__` method on initialized :class:`~struct.Struct` + objects is deprecated and will be removed in Python 3.20. + + (Contributed by Sergey B Kirpichev and Serhiy Storchaka in :gh:`143715`.) + * The ``__version__``, ``version`` and ``VERSION`` attributes have been deprecated in these standard library modules and will be removed in Python 3.20. Use :py:data:`sys.version_info` instead. diff --git a/Doc/library/threadsafety.rst b/Doc/library/threadsafety.rst index 5b5949d4eff437..7ab5921c7ec298 100644 --- a/Doc/library/threadsafety.rst +++ b/Doc/library/threadsafety.rst @@ -13,6 +13,88 @@ For general guidance on writing thread-safe code in free-threaded Python, see :ref:`freethreading-python-howto`. +.. _threadsafety-levels: + +Thread safety levels +==================== + +The C API documentation uses the following levels to describe the thread +safety guarantees of each function. The levels are listed from least to +most safe. + +.. _threadsafety-level-incompatible: + +Incompatible +------------ + +A function or operation that cannot be made safe for concurrent use even +with external synchronization. Incompatible code typically accesses +global state in an unsynchronized way and must only be called from a single +thread throughout the program's lifetime. + +Example: a function that modifies process-wide state such as signal handlers +or environment variables, where concurrent calls from any threads, even with +external locking, can conflict with the runtime or other libraries. + +.. _threadsafety-level-compatible: + +Compatible +---------- + +A function or operation that is safe to call from multiple threads +*provided* the caller supplies appropriate external synchronization, for +example by holding a :term:`lock` for the duration of each call. Without +such synchronization, concurrent calls may produce :term:`race conditions +` or :term:`data races `. + +Example: a function that reads from or writes to an object whose internal +state is not protected by a lock. Callers must ensure that no two threads +access the same object at the same time. + +.. _threadsafety-level-distinct: + +Safe on distinct objects +------------------------ + +A function or operation that is safe to call from multiple threads without +external synchronization, as long as each thread operates on a **different** +object. Two threads may call the function at the same time, but they must +not pass the same object (or objects that share underlying state) as +arguments. + +Example: a function that modifies fields of a struct using non-atomic +writes. Two threads can each call the function on their own struct +instance safely, but concurrent calls on the *same* instance require +external synchronization. + +.. _threadsafety-level-shared: + +Safe on shared objects +---------------------- + +A function or operation that is safe for concurrent use on the **same** +object. The implementation uses internal synchronization (such as +:term:`per-object locks ` or +:ref:`critical sections `) to protect shared +mutable state, so callers do not need to supply their own locking. + +Example: :c:func:`PyList_GetItemRef` can be called from multiple threads on the +same :c:type:`PyListObject` - it uses internal synchronization to serialize +access. + +.. _threadsafety-level-atomic: + +Atomic +------ + +A function or operation that appears :term:`atomic ` with +respect to other threads - it executes instantaneously from the perspective +of other threads. This is the strongest form of thread safety. + +Example: :c:func:`PyMutex_IsLocked` performs an atomic read of the mutex +state and can be called from any thread at any time. + + .. _thread-safety-list: Thread safety for list objects diff --git a/Doc/tools/extensions/c_annotations.py b/Doc/tools/extensions/c_annotations.py index e04a5f144c449b..58f597c2eb2d0c 100644 --- a/Doc/tools/extensions/c_annotations.py +++ b/Doc/tools/extensions/c_annotations.py @@ -3,10 +3,12 @@ * Reference count annotations for C API functions. * Stable ABI annotations * Limited API annotations +* Thread safety annotations for C API functions. Configuration: * Set ``refcount_file`` to the path to the reference count data file. * Set ``stable_abi_file`` to the path to stable ABI list. +* Set ``threadsafety_file`` to the path to the thread safety data file. """ from __future__ import annotations @@ -48,6 +50,15 @@ class RefCountEntry: result_refs: int | None = None +@dataclasses.dataclass(frozen=True, slots=True) +class ThreadSafetyEntry: + # Name of the function. + name: str + # Thread safety level. + # One of: 'incompatible', 'compatible', 'safe'. + level: str + + @dataclasses.dataclass(frozen=True, slots=True) class StableABIEntry: # Role of the object. @@ -113,10 +124,42 @@ def read_stable_abi_data(stable_abi_file: Path) -> dict[str, StableABIEntry]: return stable_abi_data +_VALID_THREADSAFETY_LEVELS = frozenset({ + "incompatible", + "compatible", + "distinct", + "shared", + "atomic", +}) + + +def read_threadsafety_data( + threadsafety_filename: Path, +) -> dict[str, ThreadSafetyEntry]: + threadsafety_data = {} + for line in threadsafety_filename.read_text(encoding="utf8").splitlines(): + line = line.strip() + if not line or line.startswith("#"): + continue + # Each line is of the form: function_name : level : [comment] + parts = line.split(":", 2) + if len(parts) < 2: + raise ValueError(f"Wrong field count in {line!r}") + name, level = parts[0].strip(), parts[1].strip() + if level not in _VALID_THREADSAFETY_LEVELS: + raise ValueError( + f"Unknown thread safety level {level!r} for {name!r}. " + f"Valid levels: {sorted(_VALID_THREADSAFETY_LEVELS)}" + ) + threadsafety_data[name] = ThreadSafetyEntry(name=name, level=level) + return threadsafety_data + + def add_annotations(app: Sphinx, doctree: nodes.document) -> None: state = app.env.domaindata["c_annotations"] refcount_data = state["refcount_data"] stable_abi_data = state["stable_abi_data"] + threadsafety_data = state["threadsafety_data"] for node in doctree.findall(addnodes.desc_content): par = node.parent if par["domain"] != "c": @@ -126,6 +169,12 @@ def add_annotations(app: Sphinx, doctree: nodes.document) -> None: name = par[0]["ids"][0].removeprefix("c.") objtype = par["objtype"] + # Thread safety annotation — inserted first so it appears last (bottom-most) + # among all annotations. + if entry := threadsafety_data.get(name): + annotation = _threadsafety_annotation(entry.level) + node.insert(0, annotation) + # Stable ABI annotation. if record := stable_abi_data.get(name): if ROLE_TO_OBJECT_TYPE[record.role] != objtype: @@ -256,6 +305,46 @@ def _unstable_api_annotation() -> nodes.admonition: ) +def _threadsafety_annotation(level: str) -> nodes.emphasis: + match level: + case "incompatible": + display = sphinx_gettext("Not safe to call from multiple threads.") + reftarget = "threadsafety-level-incompatible" + case "compatible": + display = sphinx_gettext( + "Safe to call from multiple threads" + " with external synchronization only." + ) + reftarget = "threadsafety-level-compatible" + case "distinct": + display = sphinx_gettext( + "Safe to call without external synchronization" + " on distinct objects." + ) + reftarget = "threadsafety-level-distinct" + case "shared": + display = sphinx_gettext( + "Safe for concurrent use on the same object." + ) + reftarget = "threadsafety-level-shared" + case "atomic": + display = sphinx_gettext("Atomic.") + reftarget = "threadsafety-level-atomic" + case _: + raise AssertionError(f"Unknown thread safety level {level!r}") + ref_node = addnodes.pending_xref( + display, + nodes.Text(display), + refdomain="std", + reftarget=reftarget, + reftype="ref", + refexplicit="True", + ) + prefix = sphinx_gettext("Thread safety:") + " " + classes = ["threadsafety", f"threadsafety-{level}"] + return nodes.emphasis("", prefix, ref_node, classes=classes) + + def _return_value_annotation(result_refs: int | None) -> nodes.emphasis: classes = ["refcount"] if result_refs is None: @@ -342,11 +431,15 @@ def init_annotations(app: Sphinx) -> None: state["stable_abi_data"] = read_stable_abi_data( Path(app.srcdir, app.config.stable_abi_file) ) + state["threadsafety_data"] = read_threadsafety_data( + Path(app.srcdir, app.config.threadsafety_file) + ) def setup(app: Sphinx) -> ExtensionMetadata: app.add_config_value("refcount_file", "", "env", types={str}) app.add_config_value("stable_abi_file", "", "env", types={str}) + app.add_config_value("threadsafety_file", "", "env", types={str}) app.add_directive("limited-api-list", LimitedAPIList) app.add_directive("corresponding-type-slot", CorrespondingTypeSlot) app.connect("builder-inited", init_annotations) diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst index e749ef2a455ea2..c979118abd0a07 100644 --- a/Doc/whatsnew/3.15.rst +++ b/Doc/whatsnew/3.15.rst @@ -1560,6 +1560,15 @@ New deprecations (Contributed by Bénédikt Tran in :gh:`134978`.) +* :mod:`struct`: + + * Calling the ``Struct.__new__()`` without required argument now is + deprecated and will be removed in Python 3.20. Calling + :meth:`~object.__init__` method on initialized :class:`~struct.Struct` + objects is deprecated and will be removed in Python 3.20. + + (Contributed by Sergey B Kirpichev and Serhiy Storchaka in :gh:`143715`.) + * ``__version__`` * The ``__version__``, ``version`` and ``VERSION`` attributes have been diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 09588e9428281e..2586ed3a5299a6 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1096,17 +1096,17 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, - [BINARY_OP_EXTEND] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_EXTEND] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_LOCAL_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, - [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, + [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_SLICE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG }, - [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_SUBSCR_USTR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG }, + [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, + [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_SUBSCR_USTR_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1120,24 +1120,24 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BUILD_TUPLE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [CACHE] = { true, INSTR_FMT_IX, 0 }, [CALL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, - [CALL_ALLOC_AND_ENTER_INIT] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, + [CALL_ALLOC_AND_ENTER_INIT] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_BOUND_METHOD_EXACT_ARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_BOUND_METHOD_GENERAL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, - [CALL_BUILTIN_CLASS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, - [CALL_BUILTIN_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, - [CALL_BUILTIN_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [CALL_BUILTIN_CLASS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [CALL_BUILTIN_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [CALL_BUILTIN_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_BUILTIN_O] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_EX_NON_PY_GENERAL] = { true, INSTR_FMT_IXC, HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CALL_EX_PY] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_FUNCTION_EX] = { true, INSTR_FMT_IXC, HAS_EVAL_BREAK_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [CALL_INTRINSIC_1] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CALL_INTRINSIC_2] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [CALL_ISINSTANCE] = { true, INSTR_FMT_IXC00, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [CALL_ISINSTANCE] = { true, INSTR_FMT_IXC00, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CALL_KW] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [CALL_KW_BOUND_METHOD] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [CALL_KW_NON_PY] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CALL_KW_PY] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, - [CALL_LEN] = { true, INSTR_FMT_IXC00, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [CALL_LEN] = { true, INSTR_FMT_IXC00, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CALL_LIST_APPEND] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CALL_METHOD_DESCRIPTOR_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, @@ -1146,9 +1146,9 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [CALL_NON_PY_GENERAL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_PY_EXACT_ARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, [CALL_PY_GENERAL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, - [CALL_STR_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [CALL_TUPLE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [CALL_TYPE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG }, + [CALL_STR_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [CALL_TUPLE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [CALL_TYPE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [CHECK_EG_MATCH] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CHECK_EXC_MATCH] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CLEANUP_THROW] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, @@ -1158,7 +1158,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG }, [CONTAINS_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG }, [COPY_FREE_VARS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, @@ -1179,7 +1179,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [FORMAT_SIMPLE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [FORMAT_WITH_SPEC] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [FOR_ITER] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, - [FOR_ITER_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, + [FOR_ITER_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 }, [FOR_ITER_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, [FOR_ITER_RANGE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, [FOR_ITER_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EXIT_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG }, @@ -1226,15 +1226,15 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [LOAD_ATTR_CLASS_WITH_METACLASS_CHECK] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [LOAD_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_METHOD_LAZY_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_RECORDS_VALUE_FLAG }, + [LOAD_ATTR_METHOD_LAZY_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_RECORDS_VALUE_FLAG }, [LOAD_ATTR_METHOD_NO_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_METHOD_WITH_VALUES] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_MODULE] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG }, + [LOAD_ATTR_METHOD_WITH_VALUES] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_RECORDS_VALUE_FLAG }, + [LOAD_ATTR_MODULE] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [LOAD_ATTR_NONDESCRIPTOR_NO_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [LOAD_ATTR_PROPERTY] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_SLOT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, - [LOAD_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [LOAD_ATTR_SLOT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, + [LOAD_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [LOAD_BUILD_CLASS] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [LOAD_COMMON_CONSTANT] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, [LOAD_CONST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_CONST_FLAG }, @@ -1255,8 +1255,8 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [LOAD_SMALL_INT] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, [LOAD_SPECIAL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [LOAD_SUPER_ATTR_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [LOAD_SUPER_ATTR_METHOD] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, + [LOAD_SUPER_ATTR_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, + [LOAD_SUPER_ATTR_METHOD] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [MAKE_CELL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_FREE_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [MAKE_FUNCTION] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [MAP_ADD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1283,13 +1283,13 @@ 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_ESCAPES_FLAG | HAS_SYNC_SP_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, - [SEND_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG | HAS_RECORDS_VALUE_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 }, [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 }, [SET_UPDATE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_ATTR] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [STORE_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IXC000, HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [STORE_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IXC000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [STORE_ATTR_SLOT] = { true, INSTR_FMT_IXC000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [STORE_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG | HAS_RECORDS_VALUE_FLAG }, [STORE_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_FREE_FLAG | HAS_ESCAPES_FLAG }, @@ -1317,8 +1317,8 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [UNPACK_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, - [UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, - [UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [WITH_EXCEPT_START] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [YIELD_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [ANNOTATIONS_PLACEHOLDER] = { true, -1, HAS_PURE_FLAG }, @@ -1502,7 +1502,7 @@ _PyOpcode_macro_expansion[256] = { [SET_FUNCTION_ATTRIBUTE] = { .nuops = 1, .uops = { { _SET_FUNCTION_ATTRIBUTE, OPARG_SIMPLE, 0 } } }, [SET_UPDATE] = { .nuops = 1, .uops = { { _SET_UPDATE, OPARG_SIMPLE, 0 } } }, [STORE_ATTR] = { .nuops = 1, .uops = { { _STORE_ATTR, OPARG_SIMPLE, 3 } } }, - [STORE_ATTR_INSTANCE_VALUE] = { .nuops = 4, .uops = { { _GUARD_TYPE_VERSION_AND_LOCK, 2, 1 }, { _GUARD_DORV_NO_DICT, OPARG_SIMPLE, 3 }, { _STORE_ATTR_INSTANCE_VALUE, 1, 3 }, { _POP_TOP, OPARG_SIMPLE, 4 } } }, + [STORE_ATTR_INSTANCE_VALUE] = { .nuops = 5, .uops = { { _LOCK_OBJECT, OPARG_SIMPLE, 1 }, { _GUARD_TYPE_VERSION_LOCKED, 2, 1 }, { _GUARD_DORV_NO_DICT, OPARG_SIMPLE, 3 }, { _STORE_ATTR_INSTANCE_VALUE, 1, 3 }, { _POP_TOP, OPARG_SIMPLE, 4 } } }, [STORE_ATTR_SLOT] = { .nuops = 4, .uops = { { _RECORD_TOS_TYPE, OPARG_SIMPLE, 1 }, { _GUARD_TYPE_VERSION, 2, 1 }, { _STORE_ATTR_SLOT, 1, 3 }, { _POP_TOP, OPARG_SIMPLE, 4 } } }, [STORE_ATTR_WITH_HINT] = { .nuops = 4, .uops = { { _RECORD_TOS_TYPE, OPARG_SIMPLE, 1 }, { _GUARD_TYPE_VERSION, 2, 1 }, { _STORE_ATTR_WITH_HINT, 1, 3 }, { _POP_TOP, OPARG_SIMPLE, 4 } } }, [STORE_DEREF] = { .nuops = 1, .uops = { { _STORE_DEREF, OPARG_SIMPLE, 0 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 216436604c6973..79e62edfeed978 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -189,7 +189,7 @@ extern "C" { #define _GUARD_TOS_TUPLE 444 #define _GUARD_TOS_UNICODE 445 #define _GUARD_TYPE_VERSION 446 -#define _GUARD_TYPE_VERSION_AND_LOCK 447 +#define _GUARD_TYPE_VERSION_LOCKED 447 #define _HANDLE_PENDING_AND_DEOPT 448 #define _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME @@ -286,1002 +286,1007 @@ extern "C" { #define _LOAD_SPECIAL 516 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD -#define _MAKE_CALLARGS_A_TUPLE 517 +#define _LOCK_OBJECT 517 +#define _MAKE_CALLARGS_A_TUPLE 518 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_HEAP_SAFE 518 -#define _MAKE_WARM 519 +#define _MAKE_HEAP_SAFE 519 +#define _MAKE_WARM 520 #define _MAP_ADD MAP_ADD #define _MATCH_CLASS MATCH_CLASS #define _MATCH_KEYS MATCH_KEYS #define _MATCH_MAPPING MATCH_MAPPING #define _MATCH_SEQUENCE MATCH_SEQUENCE -#define _MAYBE_EXPAND_METHOD 520 -#define _MAYBE_EXPAND_METHOD_KW 521 -#define _MONITOR_CALL 522 -#define _MONITOR_CALL_KW 523 -#define _MONITOR_JUMP_BACKWARD 524 -#define _MONITOR_RESUME 525 +#define _MAYBE_EXPAND_METHOD 521 +#define _MAYBE_EXPAND_METHOD_KW 522 +#define _MONITOR_CALL 523 +#define _MONITOR_CALL_KW 524 +#define _MONITOR_JUMP_BACKWARD 525 +#define _MONITOR_RESUME 526 #define _NOP NOP -#define _POP_CALL 526 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW 527 -#define _POP_CALL_ONE 528 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 529 -#define _POP_CALL_TWO 530 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 531 +#define _POP_CALL 527 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW 528 +#define _POP_CALL_ONE 529 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 530 +#define _POP_CALL_TWO 531 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 532 #define _POP_EXCEPT POP_EXCEPT #define _POP_ITER POP_ITER -#define _POP_JUMP_IF_FALSE 532 -#define _POP_JUMP_IF_TRUE 533 +#define _POP_JUMP_IF_FALSE 533 +#define _POP_JUMP_IF_TRUE 534 #define _POP_TOP POP_TOP -#define _POP_TOP_FLOAT 534 -#define _POP_TOP_INT 535 -#define _POP_TOP_LOAD_CONST_INLINE 536 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 537 -#define _POP_TOP_NOP 538 -#define _POP_TOP_UNICODE 539 -#define _POP_TWO 540 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 541 +#define _POP_TOP_FLOAT 535 +#define _POP_TOP_INT 536 +#define _POP_TOP_LOAD_CONST_INLINE 537 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW 538 +#define _POP_TOP_NOP 539 +#define _POP_TOP_UNICODE 540 +#define _POP_TWO 541 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW 542 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 542 +#define _PUSH_FRAME 543 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 543 -#define _PY_FRAME_EX 544 -#define _PY_FRAME_GENERAL 545 -#define _PY_FRAME_KW 546 -#define _QUICKEN_RESUME 547 -#define _RECORD_4OS 548 -#define _RECORD_BOUND_METHOD 549 -#define _RECORD_CALLABLE 550 -#define _RECORD_CODE 551 -#define _RECORD_NOS 552 -#define _RECORD_NOS_GEN_FUNC 553 -#define _RECORD_TOS 554 -#define _RECORD_TOS_TYPE 555 -#define _REPLACE_WITH_TRUE 556 +#define _PUSH_NULL_CONDITIONAL 544 +#define _PY_FRAME_EX 545 +#define _PY_FRAME_GENERAL 546 +#define _PY_FRAME_KW 547 +#define _QUICKEN_RESUME 548 +#define _RECORD_4OS 549 +#define _RECORD_BOUND_METHOD 550 +#define _RECORD_CALLABLE 551 +#define _RECORD_CODE 552 +#define _RECORD_NOS 553 +#define _RECORD_NOS_GEN_FUNC 554 +#define _RECORD_TOS 555 +#define _RECORD_TOS_TYPE 556 +#define _REPLACE_WITH_TRUE 557 #define _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR -#define _RETURN_VALUE 557 -#define _SAVE_RETURN_OFFSET 558 -#define _SEND 559 -#define _SEND_GEN_FRAME 560 +#define _RETURN_VALUE 558 +#define _SAVE_RETURN_OFFSET 559 +#define _SEND 560 +#define _SEND_GEN_FRAME 561 #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS #define _SET_ADD SET_ADD #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE #define _SET_UPDATE SET_UPDATE -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW 561 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW 562 -#define _SPILL_OR_RELOAD 563 -#define _START_EXECUTOR 564 -#define _STORE_ATTR 565 -#define _STORE_ATTR_INSTANCE_VALUE 566 -#define _STORE_ATTR_SLOT 567 -#define _STORE_ATTR_WITH_HINT 568 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW 562 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW 563 +#define _SPILL_OR_RELOAD 564 +#define _START_EXECUTOR 565 +#define _STORE_ATTR 566 +#define _STORE_ATTR_INSTANCE_VALUE 567 +#define _STORE_ATTR_SLOT 568 +#define _STORE_ATTR_WITH_HINT 569 #define _STORE_DEREF STORE_DEREF #define _STORE_GLOBAL STORE_GLOBAL #define _STORE_NAME STORE_NAME -#define _STORE_SLICE 569 -#define _STORE_SUBSCR 570 -#define _STORE_SUBSCR_DICT 571 -#define _STORE_SUBSCR_LIST_INT 572 -#define _SWAP 573 -#define _SWAP_2 574 -#define _SWAP_3 575 -#define _SWAP_FAST 576 -#define _SWAP_FAST_0 577 -#define _SWAP_FAST_1 578 -#define _SWAP_FAST_2 579 -#define _SWAP_FAST_3 580 -#define _SWAP_FAST_4 581 -#define _SWAP_FAST_5 582 -#define _SWAP_FAST_6 583 -#define _SWAP_FAST_7 584 -#define _TIER2_RESUME_CHECK 585 -#define _TO_BOOL 586 +#define _STORE_SLICE 570 +#define _STORE_SUBSCR 571 +#define _STORE_SUBSCR_DICT 572 +#define _STORE_SUBSCR_LIST_INT 573 +#define _SWAP 574 +#define _SWAP_2 575 +#define _SWAP_3 576 +#define _SWAP_FAST 577 +#define _SWAP_FAST_0 578 +#define _SWAP_FAST_1 579 +#define _SWAP_FAST_2 580 +#define _SWAP_FAST_3 581 +#define _SWAP_FAST_4 582 +#define _SWAP_FAST_5 583 +#define _SWAP_FAST_6 584 +#define _SWAP_FAST_7 585 +#define _TIER2_RESUME_CHECK 586 +#define _TO_BOOL 587 #define _TO_BOOL_BOOL TO_BOOL_BOOL -#define _TO_BOOL_INT 587 -#define _TO_BOOL_LIST 588 +#define _TO_BOOL_INT 588 +#define _TO_BOOL_LIST 589 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 589 +#define _TO_BOOL_STR 590 #define _TRACE_RECORD TRACE_RECORD -#define _UNARY_INVERT 590 -#define _UNARY_NEGATIVE 591 +#define _UNARY_INVERT 591 +#define _UNARY_NEGATIVE 592 #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 592 -#define _UNPACK_SEQUENCE_LIST 593 -#define _UNPACK_SEQUENCE_TUPLE 594 -#define _UNPACK_SEQUENCE_TWO_TUPLE 595 +#define _UNPACK_SEQUENCE 593 +#define _UNPACK_SEQUENCE_LIST 594 +#define _UNPACK_SEQUENCE_TUPLE 595 +#define _UNPACK_SEQUENCE_TWO_TUPLE 596 #define _WITH_EXCEPT_START WITH_EXCEPT_START -#define _YIELD_VALUE 596 -#define MAX_UOP_ID 596 -#define _BINARY_OP_r23 597 -#define _BINARY_OP_ADD_FLOAT_r03 598 -#define _BINARY_OP_ADD_FLOAT_r13 599 -#define _BINARY_OP_ADD_FLOAT_r23 600 -#define _BINARY_OP_ADD_INT_r03 601 -#define _BINARY_OP_ADD_INT_r13 602 -#define _BINARY_OP_ADD_INT_r23 603 -#define _BINARY_OP_ADD_UNICODE_r03 604 -#define _BINARY_OP_ADD_UNICODE_r13 605 -#define _BINARY_OP_ADD_UNICODE_r23 606 -#define _BINARY_OP_EXTEND_r23 607 -#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 608 -#define _BINARY_OP_MULTIPLY_FLOAT_r03 609 -#define _BINARY_OP_MULTIPLY_FLOAT_r13 610 -#define _BINARY_OP_MULTIPLY_FLOAT_r23 611 -#define _BINARY_OP_MULTIPLY_INT_r03 612 -#define _BINARY_OP_MULTIPLY_INT_r13 613 -#define _BINARY_OP_MULTIPLY_INT_r23 614 -#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 615 -#define _BINARY_OP_SUBSCR_DICT_r23 616 -#define _BINARY_OP_SUBSCR_INIT_CALL_r01 617 -#define _BINARY_OP_SUBSCR_INIT_CALL_r11 618 -#define _BINARY_OP_SUBSCR_INIT_CALL_r21 619 -#define _BINARY_OP_SUBSCR_INIT_CALL_r31 620 -#define _BINARY_OP_SUBSCR_LIST_INT_r23 621 -#define _BINARY_OP_SUBSCR_LIST_SLICE_r23 622 -#define _BINARY_OP_SUBSCR_STR_INT_r23 623 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 624 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 625 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 626 -#define _BINARY_OP_SUBSCR_USTR_INT_r23 627 -#define _BINARY_OP_SUBTRACT_FLOAT_r03 628 -#define _BINARY_OP_SUBTRACT_FLOAT_r13 629 -#define _BINARY_OP_SUBTRACT_FLOAT_r23 630 -#define _BINARY_OP_SUBTRACT_INT_r03 631 -#define _BINARY_OP_SUBTRACT_INT_r13 632 -#define _BINARY_OP_SUBTRACT_INT_r23 633 -#define _BINARY_SLICE_r31 634 -#define _BUILD_INTERPOLATION_r01 635 -#define _BUILD_LIST_r01 636 -#define _BUILD_MAP_r01 637 -#define _BUILD_SET_r01 638 -#define _BUILD_SLICE_r01 639 -#define _BUILD_STRING_r01 640 -#define _BUILD_TEMPLATE_r21 641 -#define _BUILD_TUPLE_r01 642 -#define _CALL_BUILTIN_CLASS_r01 643 -#define _CALL_BUILTIN_FAST_r01 644 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 645 -#define _CALL_BUILTIN_O_r03 646 -#define _CALL_FUNCTION_EX_NON_PY_GENERAL_r31 647 -#define _CALL_INTRINSIC_1_r11 648 -#define _CALL_INTRINSIC_2_r21 649 -#define _CALL_ISINSTANCE_r31 650 -#define _CALL_KW_NON_PY_r11 651 -#define _CALL_LEN_r33 652 -#define _CALL_LIST_APPEND_r03 653 -#define _CALL_LIST_APPEND_r13 654 -#define _CALL_LIST_APPEND_r23 655 -#define _CALL_LIST_APPEND_r33 656 -#define _CALL_METHOD_DESCRIPTOR_FAST_r01 657 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 658 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 659 -#define _CALL_METHOD_DESCRIPTOR_O_r03 660 -#define _CALL_NON_PY_GENERAL_r01 661 -#define _CALL_STR_1_r32 662 -#define _CALL_TUPLE_1_r32 663 -#define _CALL_TYPE_1_r02 664 -#define _CALL_TYPE_1_r12 665 -#define _CALL_TYPE_1_r22 666 -#define _CALL_TYPE_1_r32 667 -#define _CHECK_AND_ALLOCATE_OBJECT_r00 668 -#define _CHECK_ATTR_CLASS_r01 669 -#define _CHECK_ATTR_CLASS_r11 670 -#define _CHECK_ATTR_CLASS_r22 671 -#define _CHECK_ATTR_CLASS_r33 672 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 673 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 674 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 675 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 676 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 677 -#define _CHECK_EG_MATCH_r22 678 -#define _CHECK_EXC_MATCH_r22 679 -#define _CHECK_FUNCTION_EXACT_ARGS_r00 680 -#define _CHECK_FUNCTION_VERSION_r00 681 -#define _CHECK_FUNCTION_VERSION_INLINE_r00 682 -#define _CHECK_FUNCTION_VERSION_INLINE_r11 683 -#define _CHECK_FUNCTION_VERSION_INLINE_r22 684 -#define _CHECK_FUNCTION_VERSION_INLINE_r33 685 -#define _CHECK_FUNCTION_VERSION_KW_r11 686 -#define _CHECK_IS_NOT_PY_CALLABLE_r00 687 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r03 688 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r13 689 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r23 690 -#define _CHECK_IS_NOT_PY_CALLABLE_EX_r33 691 -#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 692 -#define _CHECK_IS_PY_CALLABLE_EX_r03 693 -#define _CHECK_IS_PY_CALLABLE_EX_r13 694 -#define _CHECK_IS_PY_CALLABLE_EX_r23 695 -#define _CHECK_IS_PY_CALLABLE_EX_r33 696 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 697 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 698 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 699 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 700 -#define _CHECK_METHOD_VERSION_r00 701 -#define _CHECK_METHOD_VERSION_KW_r11 702 -#define _CHECK_PEP_523_r00 703 -#define _CHECK_PEP_523_r11 704 -#define _CHECK_PEP_523_r22 705 -#define _CHECK_PEP_523_r33 706 -#define _CHECK_PERIODIC_r00 707 -#define _CHECK_PERIODIC_AT_END_r00 708 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 709 -#define _CHECK_RECURSION_REMAINING_r00 710 -#define _CHECK_RECURSION_REMAINING_r11 711 -#define _CHECK_RECURSION_REMAINING_r22 712 -#define _CHECK_RECURSION_REMAINING_r33 713 -#define _CHECK_STACK_SPACE_r00 714 -#define _CHECK_STACK_SPACE_OPERAND_r00 715 -#define _CHECK_STACK_SPACE_OPERAND_r11 716 -#define _CHECK_STACK_SPACE_OPERAND_r22 717 -#define _CHECK_STACK_SPACE_OPERAND_r33 718 -#define _CHECK_VALIDITY_r00 719 -#define _CHECK_VALIDITY_r11 720 -#define _CHECK_VALIDITY_r22 721 -#define _CHECK_VALIDITY_r33 722 -#define _COLD_DYNAMIC_EXIT_r00 723 -#define _COLD_EXIT_r00 724 -#define _COMPARE_OP_r21 725 -#define _COMPARE_OP_FLOAT_r03 726 -#define _COMPARE_OP_FLOAT_r13 727 -#define _COMPARE_OP_FLOAT_r23 728 -#define _COMPARE_OP_INT_r23 729 -#define _COMPARE_OP_STR_r23 730 -#define _CONTAINS_OP_r23 731 -#define _CONTAINS_OP_DICT_r23 732 -#define _CONTAINS_OP_SET_r23 733 -#define _CONVERT_VALUE_r11 734 -#define _COPY_r01 735 -#define _COPY_1_r02 736 -#define _COPY_1_r12 737 -#define _COPY_1_r23 738 -#define _COPY_2_r03 739 -#define _COPY_2_r13 740 -#define _COPY_2_r23 741 -#define _COPY_3_r03 742 -#define _COPY_3_r13 743 -#define _COPY_3_r23 744 -#define _COPY_3_r33 745 -#define _COPY_FREE_VARS_r00 746 -#define _COPY_FREE_VARS_r11 747 -#define _COPY_FREE_VARS_r22 748 -#define _COPY_FREE_VARS_r33 749 -#define _CREATE_INIT_FRAME_r01 750 -#define _DELETE_ATTR_r10 751 -#define _DELETE_DEREF_r00 752 -#define _DELETE_FAST_r00 753 -#define _DELETE_GLOBAL_r00 754 -#define _DELETE_NAME_r00 755 -#define _DELETE_SUBSCR_r20 756 -#define _DEOPT_r00 757 -#define _DEOPT_r10 758 -#define _DEOPT_r20 759 -#define _DEOPT_r30 760 -#define _DICT_MERGE_r10 761 -#define _DICT_UPDATE_r10 762 -#define _DO_CALL_r01 763 -#define _DO_CALL_FUNCTION_EX_r31 764 -#define _DO_CALL_KW_r11 765 -#define _DYNAMIC_EXIT_r00 766 -#define _DYNAMIC_EXIT_r10 767 -#define _DYNAMIC_EXIT_r20 768 -#define _DYNAMIC_EXIT_r30 769 -#define _END_FOR_r10 770 -#define _END_SEND_r21 771 -#define _ERROR_POP_N_r00 772 -#define _EXIT_INIT_CHECK_r10 773 -#define _EXIT_TRACE_r00 774 -#define _EXIT_TRACE_r10 775 -#define _EXIT_TRACE_r20 776 -#define _EXIT_TRACE_r30 777 -#define _EXPAND_METHOD_r00 778 -#define _EXPAND_METHOD_KW_r11 779 -#define _FATAL_ERROR_r00 780 -#define _FATAL_ERROR_r11 781 -#define _FATAL_ERROR_r22 782 -#define _FATAL_ERROR_r33 783 -#define _FORMAT_SIMPLE_r11 784 -#define _FORMAT_WITH_SPEC_r21 785 -#define _FOR_ITER_r23 786 -#define _FOR_ITER_GEN_FRAME_r03 787 -#define _FOR_ITER_GEN_FRAME_r13 788 -#define _FOR_ITER_GEN_FRAME_r23 789 -#define _FOR_ITER_TIER_TWO_r23 790 -#define _GET_AITER_r11 791 -#define _GET_ANEXT_r12 792 -#define _GET_AWAITABLE_r11 793 -#define _GET_ITER_r12 794 -#define _GET_LEN_r12 795 -#define _GET_YIELD_FROM_ITER_r11 796 -#define _GUARD_BINARY_OP_EXTEND_r22 797 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 798 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 799 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 800 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 801 -#define _GUARD_BIT_IS_SET_POP_r00 802 -#define _GUARD_BIT_IS_SET_POP_r10 803 -#define _GUARD_BIT_IS_SET_POP_r21 804 -#define _GUARD_BIT_IS_SET_POP_r32 805 -#define _GUARD_BIT_IS_SET_POP_4_r00 806 -#define _GUARD_BIT_IS_SET_POP_4_r10 807 -#define _GUARD_BIT_IS_SET_POP_4_r21 808 -#define _GUARD_BIT_IS_SET_POP_4_r32 809 -#define _GUARD_BIT_IS_SET_POP_5_r00 810 -#define _GUARD_BIT_IS_SET_POP_5_r10 811 -#define _GUARD_BIT_IS_SET_POP_5_r21 812 -#define _GUARD_BIT_IS_SET_POP_5_r32 813 -#define _GUARD_BIT_IS_SET_POP_6_r00 814 -#define _GUARD_BIT_IS_SET_POP_6_r10 815 -#define _GUARD_BIT_IS_SET_POP_6_r21 816 -#define _GUARD_BIT_IS_SET_POP_6_r32 817 -#define _GUARD_BIT_IS_SET_POP_7_r00 818 -#define _GUARD_BIT_IS_SET_POP_7_r10 819 -#define _GUARD_BIT_IS_SET_POP_7_r21 820 -#define _GUARD_BIT_IS_SET_POP_7_r32 821 -#define _GUARD_BIT_IS_UNSET_POP_r00 822 -#define _GUARD_BIT_IS_UNSET_POP_r10 823 -#define _GUARD_BIT_IS_UNSET_POP_r21 824 -#define _GUARD_BIT_IS_UNSET_POP_r32 825 -#define _GUARD_BIT_IS_UNSET_POP_4_r00 826 -#define _GUARD_BIT_IS_UNSET_POP_4_r10 827 -#define _GUARD_BIT_IS_UNSET_POP_4_r21 828 -#define _GUARD_BIT_IS_UNSET_POP_4_r32 829 -#define _GUARD_BIT_IS_UNSET_POP_5_r00 830 -#define _GUARD_BIT_IS_UNSET_POP_5_r10 831 -#define _GUARD_BIT_IS_UNSET_POP_5_r21 832 -#define _GUARD_BIT_IS_UNSET_POP_5_r32 833 -#define _GUARD_BIT_IS_UNSET_POP_6_r00 834 -#define _GUARD_BIT_IS_UNSET_POP_6_r10 835 -#define _GUARD_BIT_IS_UNSET_POP_6_r21 836 -#define _GUARD_BIT_IS_UNSET_POP_6_r32 837 -#define _GUARD_BIT_IS_UNSET_POP_7_r00 838 -#define _GUARD_BIT_IS_UNSET_POP_7_r10 839 -#define _GUARD_BIT_IS_UNSET_POP_7_r21 840 -#define _GUARD_BIT_IS_UNSET_POP_7_r32 841 -#define _GUARD_CALLABLE_ISINSTANCE_r03 842 -#define _GUARD_CALLABLE_ISINSTANCE_r13 843 -#define _GUARD_CALLABLE_ISINSTANCE_r23 844 -#define _GUARD_CALLABLE_ISINSTANCE_r33 845 -#define _GUARD_CALLABLE_LEN_r03 846 -#define _GUARD_CALLABLE_LEN_r13 847 -#define _GUARD_CALLABLE_LEN_r23 848 -#define _GUARD_CALLABLE_LEN_r33 849 -#define _GUARD_CALLABLE_LIST_APPEND_r03 850 -#define _GUARD_CALLABLE_LIST_APPEND_r13 851 -#define _GUARD_CALLABLE_LIST_APPEND_r23 852 -#define _GUARD_CALLABLE_LIST_APPEND_r33 853 -#define _GUARD_CALLABLE_STR_1_r03 854 -#define _GUARD_CALLABLE_STR_1_r13 855 -#define _GUARD_CALLABLE_STR_1_r23 856 -#define _GUARD_CALLABLE_STR_1_r33 857 -#define _GUARD_CALLABLE_TUPLE_1_r03 858 -#define _GUARD_CALLABLE_TUPLE_1_r13 859 -#define _GUARD_CALLABLE_TUPLE_1_r23 860 -#define _GUARD_CALLABLE_TUPLE_1_r33 861 -#define _GUARD_CALLABLE_TYPE_1_r03 862 -#define _GUARD_CALLABLE_TYPE_1_r13 863 -#define _GUARD_CALLABLE_TYPE_1_r23 864 -#define _GUARD_CALLABLE_TYPE_1_r33 865 -#define _GUARD_CODE_VERSION_r00 866 -#define _GUARD_CODE_VERSION_r11 867 -#define _GUARD_CODE_VERSION_r22 868 -#define _GUARD_CODE_VERSION_r33 869 -#define _GUARD_DORV_NO_DICT_r01 870 -#define _GUARD_DORV_NO_DICT_r11 871 -#define _GUARD_DORV_NO_DICT_r22 872 -#define _GUARD_DORV_NO_DICT_r33 873 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 874 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 875 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 876 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 877 -#define _GUARD_GLOBALS_VERSION_r00 878 -#define _GUARD_GLOBALS_VERSION_r11 879 -#define _GUARD_GLOBALS_VERSION_r22 880 -#define _GUARD_GLOBALS_VERSION_r33 881 -#define _GUARD_IP_RETURN_GENERATOR_r00 882 -#define _GUARD_IP_RETURN_GENERATOR_r11 883 -#define _GUARD_IP_RETURN_GENERATOR_r22 884 -#define _GUARD_IP_RETURN_GENERATOR_r33 885 -#define _GUARD_IP_RETURN_VALUE_r00 886 -#define _GUARD_IP_RETURN_VALUE_r11 887 -#define _GUARD_IP_RETURN_VALUE_r22 888 -#define _GUARD_IP_RETURN_VALUE_r33 889 -#define _GUARD_IP_YIELD_VALUE_r00 890 -#define _GUARD_IP_YIELD_VALUE_r11 891 -#define _GUARD_IP_YIELD_VALUE_r22 892 -#define _GUARD_IP_YIELD_VALUE_r33 893 -#define _GUARD_IP__PUSH_FRAME_r00 894 -#define _GUARD_IP__PUSH_FRAME_r11 895 -#define _GUARD_IP__PUSH_FRAME_r22 896 -#define _GUARD_IP__PUSH_FRAME_r33 897 -#define _GUARD_IS_FALSE_POP_r00 898 -#define _GUARD_IS_FALSE_POP_r10 899 -#define _GUARD_IS_FALSE_POP_r21 900 -#define _GUARD_IS_FALSE_POP_r32 901 -#define _GUARD_IS_NONE_POP_r00 902 -#define _GUARD_IS_NONE_POP_r10 903 -#define _GUARD_IS_NONE_POP_r21 904 -#define _GUARD_IS_NONE_POP_r32 905 -#define _GUARD_IS_NOT_NONE_POP_r10 906 -#define _GUARD_IS_TRUE_POP_r00 907 -#define _GUARD_IS_TRUE_POP_r10 908 -#define _GUARD_IS_TRUE_POP_r21 909 -#define _GUARD_IS_TRUE_POP_r32 910 -#define _GUARD_KEYS_VERSION_r01 911 -#define _GUARD_KEYS_VERSION_r11 912 -#define _GUARD_KEYS_VERSION_r22 913 -#define _GUARD_KEYS_VERSION_r33 914 -#define _GUARD_NOS_ANY_DICT_r02 915 -#define _GUARD_NOS_ANY_DICT_r12 916 -#define _GUARD_NOS_ANY_DICT_r22 917 -#define _GUARD_NOS_ANY_DICT_r33 918 -#define _GUARD_NOS_COMPACT_ASCII_r02 919 -#define _GUARD_NOS_COMPACT_ASCII_r12 920 -#define _GUARD_NOS_COMPACT_ASCII_r22 921 -#define _GUARD_NOS_COMPACT_ASCII_r33 922 -#define _GUARD_NOS_DICT_r02 923 -#define _GUARD_NOS_DICT_r12 924 -#define _GUARD_NOS_DICT_r22 925 -#define _GUARD_NOS_DICT_r33 926 -#define _GUARD_NOS_FLOAT_r02 927 -#define _GUARD_NOS_FLOAT_r12 928 -#define _GUARD_NOS_FLOAT_r22 929 -#define _GUARD_NOS_FLOAT_r33 930 -#define _GUARD_NOS_INT_r02 931 -#define _GUARD_NOS_INT_r12 932 -#define _GUARD_NOS_INT_r22 933 -#define _GUARD_NOS_INT_r33 934 -#define _GUARD_NOS_LIST_r02 935 -#define _GUARD_NOS_LIST_r12 936 -#define _GUARD_NOS_LIST_r22 937 -#define _GUARD_NOS_LIST_r33 938 -#define _GUARD_NOS_NOT_NULL_r02 939 -#define _GUARD_NOS_NOT_NULL_r12 940 -#define _GUARD_NOS_NOT_NULL_r22 941 -#define _GUARD_NOS_NOT_NULL_r33 942 -#define _GUARD_NOS_NULL_r02 943 -#define _GUARD_NOS_NULL_r12 944 -#define _GUARD_NOS_NULL_r22 945 -#define _GUARD_NOS_NULL_r33 946 -#define _GUARD_NOS_OVERFLOWED_r02 947 -#define _GUARD_NOS_OVERFLOWED_r12 948 -#define _GUARD_NOS_OVERFLOWED_r22 949 -#define _GUARD_NOS_OVERFLOWED_r33 950 -#define _GUARD_NOS_TUPLE_r02 951 -#define _GUARD_NOS_TUPLE_r12 952 -#define _GUARD_NOS_TUPLE_r22 953 -#define _GUARD_NOS_TUPLE_r33 954 -#define _GUARD_NOS_UNICODE_r02 955 -#define _GUARD_NOS_UNICODE_r12 956 -#define _GUARD_NOS_UNICODE_r22 957 -#define _GUARD_NOS_UNICODE_r33 958 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 959 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 960 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 961 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 962 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 963 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 964 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 965 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 966 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 967 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 968 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 969 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 970 -#define _GUARD_THIRD_NULL_r03 971 -#define _GUARD_THIRD_NULL_r13 972 -#define _GUARD_THIRD_NULL_r23 973 -#define _GUARD_THIRD_NULL_r33 974 -#define _GUARD_TOS_ANY_DICT_r01 975 -#define _GUARD_TOS_ANY_DICT_r11 976 -#define _GUARD_TOS_ANY_DICT_r22 977 -#define _GUARD_TOS_ANY_DICT_r33 978 -#define _GUARD_TOS_ANY_SET_r01 979 -#define _GUARD_TOS_ANY_SET_r11 980 -#define _GUARD_TOS_ANY_SET_r22 981 -#define _GUARD_TOS_ANY_SET_r33 982 -#define _GUARD_TOS_DICT_r01 983 -#define _GUARD_TOS_DICT_r11 984 -#define _GUARD_TOS_DICT_r22 985 -#define _GUARD_TOS_DICT_r33 986 -#define _GUARD_TOS_FLOAT_r01 987 -#define _GUARD_TOS_FLOAT_r11 988 -#define _GUARD_TOS_FLOAT_r22 989 -#define _GUARD_TOS_FLOAT_r33 990 -#define _GUARD_TOS_FROZENDICT_r01 991 -#define _GUARD_TOS_FROZENDICT_r11 992 -#define _GUARD_TOS_FROZENDICT_r22 993 -#define _GUARD_TOS_FROZENDICT_r33 994 -#define _GUARD_TOS_FROZENSET_r01 995 -#define _GUARD_TOS_FROZENSET_r11 996 -#define _GUARD_TOS_FROZENSET_r22 997 -#define _GUARD_TOS_FROZENSET_r33 998 -#define _GUARD_TOS_INT_r01 999 -#define _GUARD_TOS_INT_r11 1000 -#define _GUARD_TOS_INT_r22 1001 -#define _GUARD_TOS_INT_r33 1002 -#define _GUARD_TOS_LIST_r01 1003 -#define _GUARD_TOS_LIST_r11 1004 -#define _GUARD_TOS_LIST_r22 1005 -#define _GUARD_TOS_LIST_r33 1006 -#define _GUARD_TOS_OVERFLOWED_r01 1007 -#define _GUARD_TOS_OVERFLOWED_r11 1008 -#define _GUARD_TOS_OVERFLOWED_r22 1009 -#define _GUARD_TOS_OVERFLOWED_r33 1010 -#define _GUARD_TOS_SET_r01 1011 -#define _GUARD_TOS_SET_r11 1012 -#define _GUARD_TOS_SET_r22 1013 -#define _GUARD_TOS_SET_r33 1014 -#define _GUARD_TOS_SLICE_r01 1015 -#define _GUARD_TOS_SLICE_r11 1016 -#define _GUARD_TOS_SLICE_r22 1017 -#define _GUARD_TOS_SLICE_r33 1018 -#define _GUARD_TOS_TUPLE_r01 1019 -#define _GUARD_TOS_TUPLE_r11 1020 -#define _GUARD_TOS_TUPLE_r22 1021 -#define _GUARD_TOS_TUPLE_r33 1022 -#define _GUARD_TOS_UNICODE_r01 1023 -#define _GUARD_TOS_UNICODE_r11 1024 -#define _GUARD_TOS_UNICODE_r22 1025 -#define _GUARD_TOS_UNICODE_r33 1026 -#define _GUARD_TYPE_VERSION_r01 1027 -#define _GUARD_TYPE_VERSION_r11 1028 -#define _GUARD_TYPE_VERSION_r22 1029 -#define _GUARD_TYPE_VERSION_r33 1030 -#define _GUARD_TYPE_VERSION_AND_LOCK_r01 1031 -#define _GUARD_TYPE_VERSION_AND_LOCK_r11 1032 -#define _GUARD_TYPE_VERSION_AND_LOCK_r22 1033 -#define _GUARD_TYPE_VERSION_AND_LOCK_r33 1034 -#define _HANDLE_PENDING_AND_DEOPT_r00 1035 -#define _HANDLE_PENDING_AND_DEOPT_r10 1036 -#define _HANDLE_PENDING_AND_DEOPT_r20 1037 -#define _HANDLE_PENDING_AND_DEOPT_r30 1038 -#define _IMPORT_FROM_r12 1039 -#define _IMPORT_NAME_r21 1040 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1041 -#define _INIT_CALL_PY_EXACT_ARGS_r01 1042 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1043 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1044 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1045 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1046 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1047 -#define _INSERT_1_LOAD_CONST_INLINE_r02 1048 -#define _INSERT_1_LOAD_CONST_INLINE_r12 1049 -#define _INSERT_1_LOAD_CONST_INLINE_r23 1050 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r02 1051 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r12 1052 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r23 1053 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r03 1054 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r13 1055 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r23 1056 -#define _INSERT_NULL_r10 1057 -#define _INSTRUMENTED_FOR_ITER_r23 1058 -#define _INSTRUMENTED_INSTRUCTION_r00 1059 -#define _INSTRUMENTED_JUMP_FORWARD_r00 1060 -#define _INSTRUMENTED_JUMP_FORWARD_r11 1061 -#define _INSTRUMENTED_JUMP_FORWARD_r22 1062 -#define _INSTRUMENTED_JUMP_FORWARD_r33 1063 -#define _INSTRUMENTED_LINE_r00 1064 -#define _INSTRUMENTED_NOT_TAKEN_r00 1065 -#define _INSTRUMENTED_NOT_TAKEN_r11 1066 -#define _INSTRUMENTED_NOT_TAKEN_r22 1067 -#define _INSTRUMENTED_NOT_TAKEN_r33 1068 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1069 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1070 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1071 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1072 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1073 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1074 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1075 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1076 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1077 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1078 -#define _IS_NONE_r11 1079 -#define _IS_OP_r03 1080 -#define _IS_OP_r13 1081 -#define _IS_OP_r23 1082 -#define _ITER_CHECK_LIST_r02 1083 -#define _ITER_CHECK_LIST_r12 1084 -#define _ITER_CHECK_LIST_r22 1085 -#define _ITER_CHECK_LIST_r33 1086 -#define _ITER_CHECK_RANGE_r02 1087 -#define _ITER_CHECK_RANGE_r12 1088 -#define _ITER_CHECK_RANGE_r22 1089 -#define _ITER_CHECK_RANGE_r33 1090 -#define _ITER_CHECK_TUPLE_r02 1091 -#define _ITER_CHECK_TUPLE_r12 1092 -#define _ITER_CHECK_TUPLE_r22 1093 -#define _ITER_CHECK_TUPLE_r33 1094 -#define _ITER_JUMP_LIST_r02 1095 -#define _ITER_JUMP_LIST_r12 1096 -#define _ITER_JUMP_LIST_r22 1097 -#define _ITER_JUMP_LIST_r33 1098 -#define _ITER_JUMP_RANGE_r02 1099 -#define _ITER_JUMP_RANGE_r12 1100 -#define _ITER_JUMP_RANGE_r22 1101 -#define _ITER_JUMP_RANGE_r33 1102 -#define _ITER_JUMP_TUPLE_r02 1103 -#define _ITER_JUMP_TUPLE_r12 1104 -#define _ITER_JUMP_TUPLE_r22 1105 -#define _ITER_JUMP_TUPLE_r33 1106 -#define _ITER_NEXT_LIST_r23 1107 -#define _ITER_NEXT_LIST_TIER_TWO_r23 1108 -#define _ITER_NEXT_RANGE_r03 1109 -#define _ITER_NEXT_RANGE_r13 1110 -#define _ITER_NEXT_RANGE_r23 1111 -#define _ITER_NEXT_TUPLE_r03 1112 -#define _ITER_NEXT_TUPLE_r13 1113 -#define _ITER_NEXT_TUPLE_r23 1114 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1115 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1116 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1117 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1118 -#define _JUMP_TO_TOP_r00 1119 -#define _LIST_APPEND_r10 1120 -#define _LIST_EXTEND_r10 1121 -#define _LOAD_ATTR_r10 1122 -#define _LOAD_ATTR_CLASS_r11 1123 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1124 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 1125 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1126 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1127 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1128 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1129 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1130 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1131 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1132 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1133 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1134 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1135 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1136 -#define _LOAD_ATTR_MODULE_r12 1137 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1138 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1139 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1140 -#define _LOAD_ATTR_SLOT_r02 1141 -#define _LOAD_ATTR_SLOT_r12 1142 -#define _LOAD_ATTR_SLOT_r23 1143 -#define _LOAD_ATTR_WITH_HINT_r12 1144 -#define _LOAD_BUILD_CLASS_r01 1145 -#define _LOAD_BYTECODE_r00 1146 -#define _LOAD_COMMON_CONSTANT_r01 1147 -#define _LOAD_COMMON_CONSTANT_r12 1148 -#define _LOAD_COMMON_CONSTANT_r23 1149 -#define _LOAD_CONST_r01 1150 -#define _LOAD_CONST_r12 1151 -#define _LOAD_CONST_r23 1152 -#define _LOAD_CONST_INLINE_r01 1153 -#define _LOAD_CONST_INLINE_r12 1154 -#define _LOAD_CONST_INLINE_r23 1155 -#define _LOAD_CONST_INLINE_BORROW_r01 1156 -#define _LOAD_CONST_INLINE_BORROW_r12 1157 -#define _LOAD_CONST_INLINE_BORROW_r23 1158 -#define _LOAD_CONST_UNDER_INLINE_r02 1159 -#define _LOAD_CONST_UNDER_INLINE_r12 1160 -#define _LOAD_CONST_UNDER_INLINE_r23 1161 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1162 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1163 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1164 -#define _LOAD_DEREF_r01 1165 -#define _LOAD_FAST_r01 1166 -#define _LOAD_FAST_r12 1167 -#define _LOAD_FAST_r23 1168 -#define _LOAD_FAST_0_r01 1169 -#define _LOAD_FAST_0_r12 1170 -#define _LOAD_FAST_0_r23 1171 -#define _LOAD_FAST_1_r01 1172 -#define _LOAD_FAST_1_r12 1173 -#define _LOAD_FAST_1_r23 1174 -#define _LOAD_FAST_2_r01 1175 -#define _LOAD_FAST_2_r12 1176 -#define _LOAD_FAST_2_r23 1177 -#define _LOAD_FAST_3_r01 1178 -#define _LOAD_FAST_3_r12 1179 -#define _LOAD_FAST_3_r23 1180 -#define _LOAD_FAST_4_r01 1181 -#define _LOAD_FAST_4_r12 1182 -#define _LOAD_FAST_4_r23 1183 -#define _LOAD_FAST_5_r01 1184 -#define _LOAD_FAST_5_r12 1185 -#define _LOAD_FAST_5_r23 1186 -#define _LOAD_FAST_6_r01 1187 -#define _LOAD_FAST_6_r12 1188 -#define _LOAD_FAST_6_r23 1189 -#define _LOAD_FAST_7_r01 1190 -#define _LOAD_FAST_7_r12 1191 -#define _LOAD_FAST_7_r23 1192 -#define _LOAD_FAST_AND_CLEAR_r01 1193 -#define _LOAD_FAST_AND_CLEAR_r12 1194 -#define _LOAD_FAST_AND_CLEAR_r23 1195 -#define _LOAD_FAST_BORROW_r01 1196 -#define _LOAD_FAST_BORROW_r12 1197 -#define _LOAD_FAST_BORROW_r23 1198 -#define _LOAD_FAST_BORROW_0_r01 1199 -#define _LOAD_FAST_BORROW_0_r12 1200 -#define _LOAD_FAST_BORROW_0_r23 1201 -#define _LOAD_FAST_BORROW_1_r01 1202 -#define _LOAD_FAST_BORROW_1_r12 1203 -#define _LOAD_FAST_BORROW_1_r23 1204 -#define _LOAD_FAST_BORROW_2_r01 1205 -#define _LOAD_FAST_BORROW_2_r12 1206 -#define _LOAD_FAST_BORROW_2_r23 1207 -#define _LOAD_FAST_BORROW_3_r01 1208 -#define _LOAD_FAST_BORROW_3_r12 1209 -#define _LOAD_FAST_BORROW_3_r23 1210 -#define _LOAD_FAST_BORROW_4_r01 1211 -#define _LOAD_FAST_BORROW_4_r12 1212 -#define _LOAD_FAST_BORROW_4_r23 1213 -#define _LOAD_FAST_BORROW_5_r01 1214 -#define _LOAD_FAST_BORROW_5_r12 1215 -#define _LOAD_FAST_BORROW_5_r23 1216 -#define _LOAD_FAST_BORROW_6_r01 1217 -#define _LOAD_FAST_BORROW_6_r12 1218 -#define _LOAD_FAST_BORROW_6_r23 1219 -#define _LOAD_FAST_BORROW_7_r01 1220 -#define _LOAD_FAST_BORROW_7_r12 1221 -#define _LOAD_FAST_BORROW_7_r23 1222 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1223 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1224 -#define _LOAD_FAST_CHECK_r01 1225 -#define _LOAD_FAST_CHECK_r12 1226 -#define _LOAD_FAST_CHECK_r23 1227 -#define _LOAD_FAST_LOAD_FAST_r02 1228 -#define _LOAD_FAST_LOAD_FAST_r13 1229 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1230 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1231 -#define _LOAD_GLOBAL_r00 1232 -#define _LOAD_GLOBAL_BUILTINS_r01 1233 -#define _LOAD_GLOBAL_MODULE_r01 1234 -#define _LOAD_LOCALS_r01 1235 -#define _LOAD_LOCALS_r12 1236 -#define _LOAD_LOCALS_r23 1237 -#define _LOAD_NAME_r01 1238 -#define _LOAD_SMALL_INT_r01 1239 -#define _LOAD_SMALL_INT_r12 1240 -#define _LOAD_SMALL_INT_r23 1241 -#define _LOAD_SMALL_INT_0_r01 1242 -#define _LOAD_SMALL_INT_0_r12 1243 -#define _LOAD_SMALL_INT_0_r23 1244 -#define _LOAD_SMALL_INT_1_r01 1245 -#define _LOAD_SMALL_INT_1_r12 1246 -#define _LOAD_SMALL_INT_1_r23 1247 -#define _LOAD_SMALL_INT_2_r01 1248 -#define _LOAD_SMALL_INT_2_r12 1249 -#define _LOAD_SMALL_INT_2_r23 1250 -#define _LOAD_SMALL_INT_3_r01 1251 -#define _LOAD_SMALL_INT_3_r12 1252 -#define _LOAD_SMALL_INT_3_r23 1253 -#define _LOAD_SPECIAL_r00 1254 -#define _LOAD_SUPER_ATTR_ATTR_r31 1255 -#define _LOAD_SUPER_ATTR_METHOD_r32 1256 -#define _MAKE_CALLARGS_A_TUPLE_r33 1257 -#define _MAKE_CELL_r00 1258 -#define _MAKE_FUNCTION_r11 1259 -#define _MAKE_HEAP_SAFE_r01 1260 -#define _MAKE_HEAP_SAFE_r11 1261 -#define _MAKE_HEAP_SAFE_r22 1262 -#define _MAKE_HEAP_SAFE_r33 1263 -#define _MAKE_WARM_r00 1264 -#define _MAKE_WARM_r11 1265 -#define _MAKE_WARM_r22 1266 -#define _MAKE_WARM_r33 1267 -#define _MAP_ADD_r20 1268 -#define _MATCH_CLASS_r31 1269 -#define _MATCH_KEYS_r23 1270 -#define _MATCH_MAPPING_r02 1271 -#define _MATCH_MAPPING_r12 1272 -#define _MATCH_MAPPING_r23 1273 -#define _MATCH_SEQUENCE_r02 1274 -#define _MATCH_SEQUENCE_r12 1275 -#define _MATCH_SEQUENCE_r23 1276 -#define _MAYBE_EXPAND_METHOD_r00 1277 -#define _MAYBE_EXPAND_METHOD_KW_r11 1278 -#define _MONITOR_CALL_r00 1279 -#define _MONITOR_CALL_KW_r11 1280 -#define _MONITOR_JUMP_BACKWARD_r00 1281 -#define _MONITOR_JUMP_BACKWARD_r11 1282 -#define _MONITOR_JUMP_BACKWARD_r22 1283 -#define _MONITOR_JUMP_BACKWARD_r33 1284 -#define _MONITOR_RESUME_r00 1285 -#define _NOP_r00 1286 -#define _NOP_r11 1287 -#define _NOP_r22 1288 -#define _NOP_r33 1289 -#define _POP_CALL_r20 1290 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1291 -#define _POP_CALL_ONE_r30 1292 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1293 -#define _POP_CALL_TWO_r30 1294 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1295 -#define _POP_EXCEPT_r10 1296 -#define _POP_ITER_r20 1297 -#define _POP_JUMP_IF_FALSE_r00 1298 -#define _POP_JUMP_IF_FALSE_r10 1299 -#define _POP_JUMP_IF_FALSE_r21 1300 -#define _POP_JUMP_IF_FALSE_r32 1301 -#define _POP_JUMP_IF_TRUE_r00 1302 -#define _POP_JUMP_IF_TRUE_r10 1303 -#define _POP_JUMP_IF_TRUE_r21 1304 -#define _POP_JUMP_IF_TRUE_r32 1305 -#define _POP_TOP_r10 1306 -#define _POP_TOP_FLOAT_r00 1307 -#define _POP_TOP_FLOAT_r10 1308 -#define _POP_TOP_FLOAT_r21 1309 -#define _POP_TOP_FLOAT_r32 1310 -#define _POP_TOP_INT_r00 1311 -#define _POP_TOP_INT_r10 1312 -#define _POP_TOP_INT_r21 1313 -#define _POP_TOP_INT_r32 1314 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1315 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1316 -#define _POP_TOP_NOP_r00 1317 -#define _POP_TOP_NOP_r10 1318 -#define _POP_TOP_NOP_r21 1319 -#define _POP_TOP_NOP_r32 1320 -#define _POP_TOP_UNICODE_r00 1321 -#define _POP_TOP_UNICODE_r10 1322 -#define _POP_TOP_UNICODE_r21 1323 -#define _POP_TOP_UNICODE_r32 1324 -#define _POP_TWO_r20 1325 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1326 -#define _PUSH_EXC_INFO_r02 1327 -#define _PUSH_EXC_INFO_r12 1328 -#define _PUSH_EXC_INFO_r23 1329 -#define _PUSH_FRAME_r10 1330 -#define _PUSH_NULL_r01 1331 -#define _PUSH_NULL_r12 1332 -#define _PUSH_NULL_r23 1333 -#define _PUSH_NULL_CONDITIONAL_r00 1334 -#define _PY_FRAME_EX_r31 1335 -#define _PY_FRAME_GENERAL_r01 1336 -#define _PY_FRAME_KW_r11 1337 -#define _QUICKEN_RESUME_r00 1338 -#define _QUICKEN_RESUME_r11 1339 -#define _QUICKEN_RESUME_r22 1340 -#define _QUICKEN_RESUME_r33 1341 -#define _REPLACE_WITH_TRUE_r02 1342 -#define _REPLACE_WITH_TRUE_r12 1343 -#define _REPLACE_WITH_TRUE_r23 1344 -#define _RESUME_CHECK_r00 1345 -#define _RESUME_CHECK_r11 1346 -#define _RESUME_CHECK_r22 1347 -#define _RESUME_CHECK_r33 1348 -#define _RETURN_GENERATOR_r01 1349 -#define _RETURN_VALUE_r11 1350 -#define _SAVE_RETURN_OFFSET_r00 1351 -#define _SAVE_RETURN_OFFSET_r11 1352 -#define _SAVE_RETURN_OFFSET_r22 1353 -#define _SAVE_RETURN_OFFSET_r33 1354 -#define _SEND_r22 1355 -#define _SEND_GEN_FRAME_r22 1356 -#define _SETUP_ANNOTATIONS_r00 1357 -#define _SET_ADD_r10 1358 -#define _SET_FUNCTION_ATTRIBUTE_r01 1359 -#define _SET_FUNCTION_ATTRIBUTE_r11 1360 -#define _SET_FUNCTION_ATTRIBUTE_r21 1361 -#define _SET_FUNCTION_ATTRIBUTE_r32 1362 -#define _SET_IP_r00 1363 -#define _SET_IP_r11 1364 -#define _SET_IP_r22 1365 -#define _SET_IP_r33 1366 -#define _SET_UPDATE_r10 1367 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1368 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1369 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1370 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1371 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1372 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1373 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1374 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1375 -#define _SPILL_OR_RELOAD_r01 1376 -#define _SPILL_OR_RELOAD_r02 1377 -#define _SPILL_OR_RELOAD_r03 1378 -#define _SPILL_OR_RELOAD_r10 1379 -#define _SPILL_OR_RELOAD_r12 1380 -#define _SPILL_OR_RELOAD_r13 1381 -#define _SPILL_OR_RELOAD_r20 1382 -#define _SPILL_OR_RELOAD_r21 1383 -#define _SPILL_OR_RELOAD_r23 1384 -#define _SPILL_OR_RELOAD_r30 1385 -#define _SPILL_OR_RELOAD_r31 1386 -#define _SPILL_OR_RELOAD_r32 1387 -#define _START_EXECUTOR_r00 1388 -#define _STORE_ATTR_r20 1389 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1390 -#define _STORE_ATTR_SLOT_r21 1391 -#define _STORE_ATTR_WITH_HINT_r21 1392 -#define _STORE_DEREF_r10 1393 -#define _STORE_FAST_LOAD_FAST_r11 1394 -#define _STORE_FAST_STORE_FAST_r20 1395 -#define _STORE_GLOBAL_r10 1396 -#define _STORE_NAME_r10 1397 -#define _STORE_SLICE_r30 1398 -#define _STORE_SUBSCR_r30 1399 -#define _STORE_SUBSCR_DICT_r31 1400 -#define _STORE_SUBSCR_LIST_INT_r32 1401 -#define _SWAP_r11 1402 -#define _SWAP_2_r02 1403 -#define _SWAP_2_r12 1404 -#define _SWAP_2_r22 1405 -#define _SWAP_2_r33 1406 -#define _SWAP_3_r03 1407 -#define _SWAP_3_r13 1408 -#define _SWAP_3_r23 1409 -#define _SWAP_3_r33 1410 -#define _SWAP_FAST_r01 1411 -#define _SWAP_FAST_r11 1412 -#define _SWAP_FAST_r22 1413 -#define _SWAP_FAST_r33 1414 -#define _SWAP_FAST_0_r01 1415 -#define _SWAP_FAST_0_r11 1416 -#define _SWAP_FAST_0_r22 1417 -#define _SWAP_FAST_0_r33 1418 -#define _SWAP_FAST_1_r01 1419 -#define _SWAP_FAST_1_r11 1420 -#define _SWAP_FAST_1_r22 1421 -#define _SWAP_FAST_1_r33 1422 -#define _SWAP_FAST_2_r01 1423 -#define _SWAP_FAST_2_r11 1424 -#define _SWAP_FAST_2_r22 1425 -#define _SWAP_FAST_2_r33 1426 -#define _SWAP_FAST_3_r01 1427 -#define _SWAP_FAST_3_r11 1428 -#define _SWAP_FAST_3_r22 1429 -#define _SWAP_FAST_3_r33 1430 -#define _SWAP_FAST_4_r01 1431 -#define _SWAP_FAST_4_r11 1432 -#define _SWAP_FAST_4_r22 1433 -#define _SWAP_FAST_4_r33 1434 -#define _SWAP_FAST_5_r01 1435 -#define _SWAP_FAST_5_r11 1436 -#define _SWAP_FAST_5_r22 1437 -#define _SWAP_FAST_5_r33 1438 -#define _SWAP_FAST_6_r01 1439 -#define _SWAP_FAST_6_r11 1440 -#define _SWAP_FAST_6_r22 1441 -#define _SWAP_FAST_6_r33 1442 -#define _SWAP_FAST_7_r01 1443 -#define _SWAP_FAST_7_r11 1444 -#define _SWAP_FAST_7_r22 1445 -#define _SWAP_FAST_7_r33 1446 -#define _TIER2_RESUME_CHECK_r00 1447 -#define _TIER2_RESUME_CHECK_r11 1448 -#define _TIER2_RESUME_CHECK_r22 1449 -#define _TIER2_RESUME_CHECK_r33 1450 -#define _TO_BOOL_r11 1451 -#define _TO_BOOL_BOOL_r01 1452 -#define _TO_BOOL_BOOL_r11 1453 -#define _TO_BOOL_BOOL_r22 1454 -#define _TO_BOOL_BOOL_r33 1455 -#define _TO_BOOL_INT_r02 1456 -#define _TO_BOOL_INT_r12 1457 -#define _TO_BOOL_INT_r23 1458 -#define _TO_BOOL_LIST_r02 1459 -#define _TO_BOOL_LIST_r12 1460 -#define _TO_BOOL_LIST_r23 1461 -#define _TO_BOOL_NONE_r01 1462 -#define _TO_BOOL_NONE_r11 1463 -#define _TO_BOOL_NONE_r22 1464 -#define _TO_BOOL_NONE_r33 1465 -#define _TO_BOOL_STR_r02 1466 -#define _TO_BOOL_STR_r12 1467 -#define _TO_BOOL_STR_r23 1468 -#define _TRACE_RECORD_r00 1469 -#define _UNARY_INVERT_r12 1470 -#define _UNARY_NEGATIVE_r12 1471 -#define _UNARY_NOT_r01 1472 -#define _UNARY_NOT_r11 1473 -#define _UNARY_NOT_r22 1474 -#define _UNARY_NOT_r33 1475 -#define _UNPACK_EX_r10 1476 -#define _UNPACK_SEQUENCE_r10 1477 -#define _UNPACK_SEQUENCE_LIST_r10 1478 -#define _UNPACK_SEQUENCE_TUPLE_r10 1479 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1480 -#define _WITH_EXCEPT_START_r33 1481 -#define _YIELD_VALUE_r11 1482 -#define MAX_UOP_REGS_ID 1482 +#define _YIELD_VALUE 597 +#define MAX_UOP_ID 597 +#define _BINARY_OP_r23 598 +#define _BINARY_OP_ADD_FLOAT_r03 599 +#define _BINARY_OP_ADD_FLOAT_r13 600 +#define _BINARY_OP_ADD_FLOAT_r23 601 +#define _BINARY_OP_ADD_INT_r03 602 +#define _BINARY_OP_ADD_INT_r13 603 +#define _BINARY_OP_ADD_INT_r23 604 +#define _BINARY_OP_ADD_UNICODE_r03 605 +#define _BINARY_OP_ADD_UNICODE_r13 606 +#define _BINARY_OP_ADD_UNICODE_r23 607 +#define _BINARY_OP_EXTEND_r23 608 +#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 609 +#define _BINARY_OP_MULTIPLY_FLOAT_r03 610 +#define _BINARY_OP_MULTIPLY_FLOAT_r13 611 +#define _BINARY_OP_MULTIPLY_FLOAT_r23 612 +#define _BINARY_OP_MULTIPLY_INT_r03 613 +#define _BINARY_OP_MULTIPLY_INT_r13 614 +#define _BINARY_OP_MULTIPLY_INT_r23 615 +#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 616 +#define _BINARY_OP_SUBSCR_DICT_r23 617 +#define _BINARY_OP_SUBSCR_INIT_CALL_r01 618 +#define _BINARY_OP_SUBSCR_INIT_CALL_r11 619 +#define _BINARY_OP_SUBSCR_INIT_CALL_r21 620 +#define _BINARY_OP_SUBSCR_INIT_CALL_r31 621 +#define _BINARY_OP_SUBSCR_LIST_INT_r23 622 +#define _BINARY_OP_SUBSCR_LIST_SLICE_r23 623 +#define _BINARY_OP_SUBSCR_STR_INT_r23 624 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 625 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 626 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 627 +#define _BINARY_OP_SUBSCR_USTR_INT_r23 628 +#define _BINARY_OP_SUBTRACT_FLOAT_r03 629 +#define _BINARY_OP_SUBTRACT_FLOAT_r13 630 +#define _BINARY_OP_SUBTRACT_FLOAT_r23 631 +#define _BINARY_OP_SUBTRACT_INT_r03 632 +#define _BINARY_OP_SUBTRACT_INT_r13 633 +#define _BINARY_OP_SUBTRACT_INT_r23 634 +#define _BINARY_SLICE_r31 635 +#define _BUILD_INTERPOLATION_r01 636 +#define _BUILD_LIST_r01 637 +#define _BUILD_MAP_r01 638 +#define _BUILD_SET_r01 639 +#define _BUILD_SLICE_r01 640 +#define _BUILD_STRING_r01 641 +#define _BUILD_TEMPLATE_r21 642 +#define _BUILD_TUPLE_r01 643 +#define _CALL_BUILTIN_CLASS_r01 644 +#define _CALL_BUILTIN_FAST_r01 645 +#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 646 +#define _CALL_BUILTIN_O_r03 647 +#define _CALL_FUNCTION_EX_NON_PY_GENERAL_r31 648 +#define _CALL_INTRINSIC_1_r11 649 +#define _CALL_INTRINSIC_2_r21 650 +#define _CALL_ISINSTANCE_r31 651 +#define _CALL_KW_NON_PY_r11 652 +#define _CALL_LEN_r33 653 +#define _CALL_LIST_APPEND_r03 654 +#define _CALL_LIST_APPEND_r13 655 +#define _CALL_LIST_APPEND_r23 656 +#define _CALL_LIST_APPEND_r33 657 +#define _CALL_METHOD_DESCRIPTOR_FAST_r01 658 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 659 +#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 660 +#define _CALL_METHOD_DESCRIPTOR_O_r03 661 +#define _CALL_NON_PY_GENERAL_r01 662 +#define _CALL_STR_1_r32 663 +#define _CALL_TUPLE_1_r32 664 +#define _CALL_TYPE_1_r02 665 +#define _CALL_TYPE_1_r12 666 +#define _CALL_TYPE_1_r22 667 +#define _CALL_TYPE_1_r32 668 +#define _CHECK_AND_ALLOCATE_OBJECT_r00 669 +#define _CHECK_ATTR_CLASS_r01 670 +#define _CHECK_ATTR_CLASS_r11 671 +#define _CHECK_ATTR_CLASS_r22 672 +#define _CHECK_ATTR_CLASS_r33 673 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 674 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 675 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 676 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 677 +#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 678 +#define _CHECK_EG_MATCH_r22 679 +#define _CHECK_EXC_MATCH_r22 680 +#define _CHECK_FUNCTION_EXACT_ARGS_r00 681 +#define _CHECK_FUNCTION_VERSION_r00 682 +#define _CHECK_FUNCTION_VERSION_INLINE_r00 683 +#define _CHECK_FUNCTION_VERSION_INLINE_r11 684 +#define _CHECK_FUNCTION_VERSION_INLINE_r22 685 +#define _CHECK_FUNCTION_VERSION_INLINE_r33 686 +#define _CHECK_FUNCTION_VERSION_KW_r11 687 +#define _CHECK_IS_NOT_PY_CALLABLE_r00 688 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r03 689 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r13 690 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r23 691 +#define _CHECK_IS_NOT_PY_CALLABLE_EX_r33 692 +#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 693 +#define _CHECK_IS_PY_CALLABLE_EX_r03 694 +#define _CHECK_IS_PY_CALLABLE_EX_r13 695 +#define _CHECK_IS_PY_CALLABLE_EX_r23 696 +#define _CHECK_IS_PY_CALLABLE_EX_r33 697 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 698 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 699 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 700 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 701 +#define _CHECK_METHOD_VERSION_r00 702 +#define _CHECK_METHOD_VERSION_KW_r11 703 +#define _CHECK_PEP_523_r00 704 +#define _CHECK_PEP_523_r11 705 +#define _CHECK_PEP_523_r22 706 +#define _CHECK_PEP_523_r33 707 +#define _CHECK_PERIODIC_r00 708 +#define _CHECK_PERIODIC_AT_END_r00 709 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 710 +#define _CHECK_RECURSION_REMAINING_r00 711 +#define _CHECK_RECURSION_REMAINING_r11 712 +#define _CHECK_RECURSION_REMAINING_r22 713 +#define _CHECK_RECURSION_REMAINING_r33 714 +#define _CHECK_STACK_SPACE_r00 715 +#define _CHECK_STACK_SPACE_OPERAND_r00 716 +#define _CHECK_STACK_SPACE_OPERAND_r11 717 +#define _CHECK_STACK_SPACE_OPERAND_r22 718 +#define _CHECK_STACK_SPACE_OPERAND_r33 719 +#define _CHECK_VALIDITY_r00 720 +#define _CHECK_VALIDITY_r11 721 +#define _CHECK_VALIDITY_r22 722 +#define _CHECK_VALIDITY_r33 723 +#define _COLD_DYNAMIC_EXIT_r00 724 +#define _COLD_EXIT_r00 725 +#define _COMPARE_OP_r21 726 +#define _COMPARE_OP_FLOAT_r03 727 +#define _COMPARE_OP_FLOAT_r13 728 +#define _COMPARE_OP_FLOAT_r23 729 +#define _COMPARE_OP_INT_r23 730 +#define _COMPARE_OP_STR_r23 731 +#define _CONTAINS_OP_r23 732 +#define _CONTAINS_OP_DICT_r23 733 +#define _CONTAINS_OP_SET_r23 734 +#define _CONVERT_VALUE_r11 735 +#define _COPY_r01 736 +#define _COPY_1_r02 737 +#define _COPY_1_r12 738 +#define _COPY_1_r23 739 +#define _COPY_2_r03 740 +#define _COPY_2_r13 741 +#define _COPY_2_r23 742 +#define _COPY_3_r03 743 +#define _COPY_3_r13 744 +#define _COPY_3_r23 745 +#define _COPY_3_r33 746 +#define _COPY_FREE_VARS_r00 747 +#define _COPY_FREE_VARS_r11 748 +#define _COPY_FREE_VARS_r22 749 +#define _COPY_FREE_VARS_r33 750 +#define _CREATE_INIT_FRAME_r01 751 +#define _DELETE_ATTR_r10 752 +#define _DELETE_DEREF_r00 753 +#define _DELETE_FAST_r00 754 +#define _DELETE_GLOBAL_r00 755 +#define _DELETE_NAME_r00 756 +#define _DELETE_SUBSCR_r20 757 +#define _DEOPT_r00 758 +#define _DEOPT_r10 759 +#define _DEOPT_r20 760 +#define _DEOPT_r30 761 +#define _DICT_MERGE_r10 762 +#define _DICT_UPDATE_r10 763 +#define _DO_CALL_r01 764 +#define _DO_CALL_FUNCTION_EX_r31 765 +#define _DO_CALL_KW_r11 766 +#define _DYNAMIC_EXIT_r00 767 +#define _DYNAMIC_EXIT_r10 768 +#define _DYNAMIC_EXIT_r20 769 +#define _DYNAMIC_EXIT_r30 770 +#define _END_FOR_r10 771 +#define _END_SEND_r21 772 +#define _ERROR_POP_N_r00 773 +#define _EXIT_INIT_CHECK_r10 774 +#define _EXIT_TRACE_r00 775 +#define _EXIT_TRACE_r10 776 +#define _EXIT_TRACE_r20 777 +#define _EXIT_TRACE_r30 778 +#define _EXPAND_METHOD_r00 779 +#define _EXPAND_METHOD_KW_r11 780 +#define _FATAL_ERROR_r00 781 +#define _FATAL_ERROR_r11 782 +#define _FATAL_ERROR_r22 783 +#define _FATAL_ERROR_r33 784 +#define _FORMAT_SIMPLE_r11 785 +#define _FORMAT_WITH_SPEC_r21 786 +#define _FOR_ITER_r23 787 +#define _FOR_ITER_GEN_FRAME_r03 788 +#define _FOR_ITER_GEN_FRAME_r13 789 +#define _FOR_ITER_GEN_FRAME_r23 790 +#define _FOR_ITER_TIER_TWO_r23 791 +#define _GET_AITER_r11 792 +#define _GET_ANEXT_r12 793 +#define _GET_AWAITABLE_r11 794 +#define _GET_ITER_r12 795 +#define _GET_LEN_r12 796 +#define _GET_YIELD_FROM_ITER_r11 797 +#define _GUARD_BINARY_OP_EXTEND_r22 798 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 799 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 800 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 801 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 802 +#define _GUARD_BIT_IS_SET_POP_r00 803 +#define _GUARD_BIT_IS_SET_POP_r10 804 +#define _GUARD_BIT_IS_SET_POP_r21 805 +#define _GUARD_BIT_IS_SET_POP_r32 806 +#define _GUARD_BIT_IS_SET_POP_4_r00 807 +#define _GUARD_BIT_IS_SET_POP_4_r10 808 +#define _GUARD_BIT_IS_SET_POP_4_r21 809 +#define _GUARD_BIT_IS_SET_POP_4_r32 810 +#define _GUARD_BIT_IS_SET_POP_5_r00 811 +#define _GUARD_BIT_IS_SET_POP_5_r10 812 +#define _GUARD_BIT_IS_SET_POP_5_r21 813 +#define _GUARD_BIT_IS_SET_POP_5_r32 814 +#define _GUARD_BIT_IS_SET_POP_6_r00 815 +#define _GUARD_BIT_IS_SET_POP_6_r10 816 +#define _GUARD_BIT_IS_SET_POP_6_r21 817 +#define _GUARD_BIT_IS_SET_POP_6_r32 818 +#define _GUARD_BIT_IS_SET_POP_7_r00 819 +#define _GUARD_BIT_IS_SET_POP_7_r10 820 +#define _GUARD_BIT_IS_SET_POP_7_r21 821 +#define _GUARD_BIT_IS_SET_POP_7_r32 822 +#define _GUARD_BIT_IS_UNSET_POP_r00 823 +#define _GUARD_BIT_IS_UNSET_POP_r10 824 +#define _GUARD_BIT_IS_UNSET_POP_r21 825 +#define _GUARD_BIT_IS_UNSET_POP_r32 826 +#define _GUARD_BIT_IS_UNSET_POP_4_r00 827 +#define _GUARD_BIT_IS_UNSET_POP_4_r10 828 +#define _GUARD_BIT_IS_UNSET_POP_4_r21 829 +#define _GUARD_BIT_IS_UNSET_POP_4_r32 830 +#define _GUARD_BIT_IS_UNSET_POP_5_r00 831 +#define _GUARD_BIT_IS_UNSET_POP_5_r10 832 +#define _GUARD_BIT_IS_UNSET_POP_5_r21 833 +#define _GUARD_BIT_IS_UNSET_POP_5_r32 834 +#define _GUARD_BIT_IS_UNSET_POP_6_r00 835 +#define _GUARD_BIT_IS_UNSET_POP_6_r10 836 +#define _GUARD_BIT_IS_UNSET_POP_6_r21 837 +#define _GUARD_BIT_IS_UNSET_POP_6_r32 838 +#define _GUARD_BIT_IS_UNSET_POP_7_r00 839 +#define _GUARD_BIT_IS_UNSET_POP_7_r10 840 +#define _GUARD_BIT_IS_UNSET_POP_7_r21 841 +#define _GUARD_BIT_IS_UNSET_POP_7_r32 842 +#define _GUARD_CALLABLE_ISINSTANCE_r03 843 +#define _GUARD_CALLABLE_ISINSTANCE_r13 844 +#define _GUARD_CALLABLE_ISINSTANCE_r23 845 +#define _GUARD_CALLABLE_ISINSTANCE_r33 846 +#define _GUARD_CALLABLE_LEN_r03 847 +#define _GUARD_CALLABLE_LEN_r13 848 +#define _GUARD_CALLABLE_LEN_r23 849 +#define _GUARD_CALLABLE_LEN_r33 850 +#define _GUARD_CALLABLE_LIST_APPEND_r03 851 +#define _GUARD_CALLABLE_LIST_APPEND_r13 852 +#define _GUARD_CALLABLE_LIST_APPEND_r23 853 +#define _GUARD_CALLABLE_LIST_APPEND_r33 854 +#define _GUARD_CALLABLE_STR_1_r03 855 +#define _GUARD_CALLABLE_STR_1_r13 856 +#define _GUARD_CALLABLE_STR_1_r23 857 +#define _GUARD_CALLABLE_STR_1_r33 858 +#define _GUARD_CALLABLE_TUPLE_1_r03 859 +#define _GUARD_CALLABLE_TUPLE_1_r13 860 +#define _GUARD_CALLABLE_TUPLE_1_r23 861 +#define _GUARD_CALLABLE_TUPLE_1_r33 862 +#define _GUARD_CALLABLE_TYPE_1_r03 863 +#define _GUARD_CALLABLE_TYPE_1_r13 864 +#define _GUARD_CALLABLE_TYPE_1_r23 865 +#define _GUARD_CALLABLE_TYPE_1_r33 866 +#define _GUARD_CODE_VERSION_r00 867 +#define _GUARD_CODE_VERSION_r11 868 +#define _GUARD_CODE_VERSION_r22 869 +#define _GUARD_CODE_VERSION_r33 870 +#define _GUARD_DORV_NO_DICT_r01 871 +#define _GUARD_DORV_NO_DICT_r11 872 +#define _GUARD_DORV_NO_DICT_r22 873 +#define _GUARD_DORV_NO_DICT_r33 874 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 875 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 876 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 877 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 878 +#define _GUARD_GLOBALS_VERSION_r00 879 +#define _GUARD_GLOBALS_VERSION_r11 880 +#define _GUARD_GLOBALS_VERSION_r22 881 +#define _GUARD_GLOBALS_VERSION_r33 882 +#define _GUARD_IP_RETURN_GENERATOR_r00 883 +#define _GUARD_IP_RETURN_GENERATOR_r11 884 +#define _GUARD_IP_RETURN_GENERATOR_r22 885 +#define _GUARD_IP_RETURN_GENERATOR_r33 886 +#define _GUARD_IP_RETURN_VALUE_r00 887 +#define _GUARD_IP_RETURN_VALUE_r11 888 +#define _GUARD_IP_RETURN_VALUE_r22 889 +#define _GUARD_IP_RETURN_VALUE_r33 890 +#define _GUARD_IP_YIELD_VALUE_r00 891 +#define _GUARD_IP_YIELD_VALUE_r11 892 +#define _GUARD_IP_YIELD_VALUE_r22 893 +#define _GUARD_IP_YIELD_VALUE_r33 894 +#define _GUARD_IP__PUSH_FRAME_r00 895 +#define _GUARD_IP__PUSH_FRAME_r11 896 +#define _GUARD_IP__PUSH_FRAME_r22 897 +#define _GUARD_IP__PUSH_FRAME_r33 898 +#define _GUARD_IS_FALSE_POP_r00 899 +#define _GUARD_IS_FALSE_POP_r10 900 +#define _GUARD_IS_FALSE_POP_r21 901 +#define _GUARD_IS_FALSE_POP_r32 902 +#define _GUARD_IS_NONE_POP_r00 903 +#define _GUARD_IS_NONE_POP_r10 904 +#define _GUARD_IS_NONE_POP_r21 905 +#define _GUARD_IS_NONE_POP_r32 906 +#define _GUARD_IS_NOT_NONE_POP_r10 907 +#define _GUARD_IS_TRUE_POP_r00 908 +#define _GUARD_IS_TRUE_POP_r10 909 +#define _GUARD_IS_TRUE_POP_r21 910 +#define _GUARD_IS_TRUE_POP_r32 911 +#define _GUARD_KEYS_VERSION_r01 912 +#define _GUARD_KEYS_VERSION_r11 913 +#define _GUARD_KEYS_VERSION_r22 914 +#define _GUARD_KEYS_VERSION_r33 915 +#define _GUARD_NOS_ANY_DICT_r02 916 +#define _GUARD_NOS_ANY_DICT_r12 917 +#define _GUARD_NOS_ANY_DICT_r22 918 +#define _GUARD_NOS_ANY_DICT_r33 919 +#define _GUARD_NOS_COMPACT_ASCII_r02 920 +#define _GUARD_NOS_COMPACT_ASCII_r12 921 +#define _GUARD_NOS_COMPACT_ASCII_r22 922 +#define _GUARD_NOS_COMPACT_ASCII_r33 923 +#define _GUARD_NOS_DICT_r02 924 +#define _GUARD_NOS_DICT_r12 925 +#define _GUARD_NOS_DICT_r22 926 +#define _GUARD_NOS_DICT_r33 927 +#define _GUARD_NOS_FLOAT_r02 928 +#define _GUARD_NOS_FLOAT_r12 929 +#define _GUARD_NOS_FLOAT_r22 930 +#define _GUARD_NOS_FLOAT_r33 931 +#define _GUARD_NOS_INT_r02 932 +#define _GUARD_NOS_INT_r12 933 +#define _GUARD_NOS_INT_r22 934 +#define _GUARD_NOS_INT_r33 935 +#define _GUARD_NOS_LIST_r02 936 +#define _GUARD_NOS_LIST_r12 937 +#define _GUARD_NOS_LIST_r22 938 +#define _GUARD_NOS_LIST_r33 939 +#define _GUARD_NOS_NOT_NULL_r02 940 +#define _GUARD_NOS_NOT_NULL_r12 941 +#define _GUARD_NOS_NOT_NULL_r22 942 +#define _GUARD_NOS_NOT_NULL_r33 943 +#define _GUARD_NOS_NULL_r02 944 +#define _GUARD_NOS_NULL_r12 945 +#define _GUARD_NOS_NULL_r22 946 +#define _GUARD_NOS_NULL_r33 947 +#define _GUARD_NOS_OVERFLOWED_r02 948 +#define _GUARD_NOS_OVERFLOWED_r12 949 +#define _GUARD_NOS_OVERFLOWED_r22 950 +#define _GUARD_NOS_OVERFLOWED_r33 951 +#define _GUARD_NOS_TUPLE_r02 952 +#define _GUARD_NOS_TUPLE_r12 953 +#define _GUARD_NOS_TUPLE_r22 954 +#define _GUARD_NOS_TUPLE_r33 955 +#define _GUARD_NOS_UNICODE_r02 956 +#define _GUARD_NOS_UNICODE_r12 957 +#define _GUARD_NOS_UNICODE_r22 958 +#define _GUARD_NOS_UNICODE_r33 959 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 960 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 961 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 962 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 963 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 964 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 965 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 966 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 967 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 968 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 969 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 970 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 971 +#define _GUARD_THIRD_NULL_r03 972 +#define _GUARD_THIRD_NULL_r13 973 +#define _GUARD_THIRD_NULL_r23 974 +#define _GUARD_THIRD_NULL_r33 975 +#define _GUARD_TOS_ANY_DICT_r01 976 +#define _GUARD_TOS_ANY_DICT_r11 977 +#define _GUARD_TOS_ANY_DICT_r22 978 +#define _GUARD_TOS_ANY_DICT_r33 979 +#define _GUARD_TOS_ANY_SET_r01 980 +#define _GUARD_TOS_ANY_SET_r11 981 +#define _GUARD_TOS_ANY_SET_r22 982 +#define _GUARD_TOS_ANY_SET_r33 983 +#define _GUARD_TOS_DICT_r01 984 +#define _GUARD_TOS_DICT_r11 985 +#define _GUARD_TOS_DICT_r22 986 +#define _GUARD_TOS_DICT_r33 987 +#define _GUARD_TOS_FLOAT_r01 988 +#define _GUARD_TOS_FLOAT_r11 989 +#define _GUARD_TOS_FLOAT_r22 990 +#define _GUARD_TOS_FLOAT_r33 991 +#define _GUARD_TOS_FROZENDICT_r01 992 +#define _GUARD_TOS_FROZENDICT_r11 993 +#define _GUARD_TOS_FROZENDICT_r22 994 +#define _GUARD_TOS_FROZENDICT_r33 995 +#define _GUARD_TOS_FROZENSET_r01 996 +#define _GUARD_TOS_FROZENSET_r11 997 +#define _GUARD_TOS_FROZENSET_r22 998 +#define _GUARD_TOS_FROZENSET_r33 999 +#define _GUARD_TOS_INT_r01 1000 +#define _GUARD_TOS_INT_r11 1001 +#define _GUARD_TOS_INT_r22 1002 +#define _GUARD_TOS_INT_r33 1003 +#define _GUARD_TOS_LIST_r01 1004 +#define _GUARD_TOS_LIST_r11 1005 +#define _GUARD_TOS_LIST_r22 1006 +#define _GUARD_TOS_LIST_r33 1007 +#define _GUARD_TOS_OVERFLOWED_r01 1008 +#define _GUARD_TOS_OVERFLOWED_r11 1009 +#define _GUARD_TOS_OVERFLOWED_r22 1010 +#define _GUARD_TOS_OVERFLOWED_r33 1011 +#define _GUARD_TOS_SET_r01 1012 +#define _GUARD_TOS_SET_r11 1013 +#define _GUARD_TOS_SET_r22 1014 +#define _GUARD_TOS_SET_r33 1015 +#define _GUARD_TOS_SLICE_r01 1016 +#define _GUARD_TOS_SLICE_r11 1017 +#define _GUARD_TOS_SLICE_r22 1018 +#define _GUARD_TOS_SLICE_r33 1019 +#define _GUARD_TOS_TUPLE_r01 1020 +#define _GUARD_TOS_TUPLE_r11 1021 +#define _GUARD_TOS_TUPLE_r22 1022 +#define _GUARD_TOS_TUPLE_r33 1023 +#define _GUARD_TOS_UNICODE_r01 1024 +#define _GUARD_TOS_UNICODE_r11 1025 +#define _GUARD_TOS_UNICODE_r22 1026 +#define _GUARD_TOS_UNICODE_r33 1027 +#define _GUARD_TYPE_VERSION_r01 1028 +#define _GUARD_TYPE_VERSION_r11 1029 +#define _GUARD_TYPE_VERSION_r22 1030 +#define _GUARD_TYPE_VERSION_r33 1031 +#define _GUARD_TYPE_VERSION_LOCKED_r01 1032 +#define _GUARD_TYPE_VERSION_LOCKED_r11 1033 +#define _GUARD_TYPE_VERSION_LOCKED_r22 1034 +#define _GUARD_TYPE_VERSION_LOCKED_r33 1035 +#define _HANDLE_PENDING_AND_DEOPT_r00 1036 +#define _HANDLE_PENDING_AND_DEOPT_r10 1037 +#define _HANDLE_PENDING_AND_DEOPT_r20 1038 +#define _HANDLE_PENDING_AND_DEOPT_r30 1039 +#define _IMPORT_FROM_r12 1040 +#define _IMPORT_NAME_r21 1041 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1042 +#define _INIT_CALL_PY_EXACT_ARGS_r01 1043 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1044 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1045 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1046 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1047 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1048 +#define _INSERT_1_LOAD_CONST_INLINE_r02 1049 +#define _INSERT_1_LOAD_CONST_INLINE_r12 1050 +#define _INSERT_1_LOAD_CONST_INLINE_r23 1051 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r02 1052 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r12 1053 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r23 1054 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r03 1055 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r13 1056 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r23 1057 +#define _INSERT_NULL_r10 1058 +#define _INSTRUMENTED_FOR_ITER_r23 1059 +#define _INSTRUMENTED_INSTRUCTION_r00 1060 +#define _INSTRUMENTED_JUMP_FORWARD_r00 1061 +#define _INSTRUMENTED_JUMP_FORWARD_r11 1062 +#define _INSTRUMENTED_JUMP_FORWARD_r22 1063 +#define _INSTRUMENTED_JUMP_FORWARD_r33 1064 +#define _INSTRUMENTED_LINE_r00 1065 +#define _INSTRUMENTED_NOT_TAKEN_r00 1066 +#define _INSTRUMENTED_NOT_TAKEN_r11 1067 +#define _INSTRUMENTED_NOT_TAKEN_r22 1068 +#define _INSTRUMENTED_NOT_TAKEN_r33 1069 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1070 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1071 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1072 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1073 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1074 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1075 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1076 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1077 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1078 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1079 +#define _IS_NONE_r11 1080 +#define _IS_OP_r03 1081 +#define _IS_OP_r13 1082 +#define _IS_OP_r23 1083 +#define _ITER_CHECK_LIST_r02 1084 +#define _ITER_CHECK_LIST_r12 1085 +#define _ITER_CHECK_LIST_r22 1086 +#define _ITER_CHECK_LIST_r33 1087 +#define _ITER_CHECK_RANGE_r02 1088 +#define _ITER_CHECK_RANGE_r12 1089 +#define _ITER_CHECK_RANGE_r22 1090 +#define _ITER_CHECK_RANGE_r33 1091 +#define _ITER_CHECK_TUPLE_r02 1092 +#define _ITER_CHECK_TUPLE_r12 1093 +#define _ITER_CHECK_TUPLE_r22 1094 +#define _ITER_CHECK_TUPLE_r33 1095 +#define _ITER_JUMP_LIST_r02 1096 +#define _ITER_JUMP_LIST_r12 1097 +#define _ITER_JUMP_LIST_r22 1098 +#define _ITER_JUMP_LIST_r33 1099 +#define _ITER_JUMP_RANGE_r02 1100 +#define _ITER_JUMP_RANGE_r12 1101 +#define _ITER_JUMP_RANGE_r22 1102 +#define _ITER_JUMP_RANGE_r33 1103 +#define _ITER_JUMP_TUPLE_r02 1104 +#define _ITER_JUMP_TUPLE_r12 1105 +#define _ITER_JUMP_TUPLE_r22 1106 +#define _ITER_JUMP_TUPLE_r33 1107 +#define _ITER_NEXT_LIST_r23 1108 +#define _ITER_NEXT_LIST_TIER_TWO_r23 1109 +#define _ITER_NEXT_RANGE_r03 1110 +#define _ITER_NEXT_RANGE_r13 1111 +#define _ITER_NEXT_RANGE_r23 1112 +#define _ITER_NEXT_TUPLE_r03 1113 +#define _ITER_NEXT_TUPLE_r13 1114 +#define _ITER_NEXT_TUPLE_r23 1115 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1116 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1117 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1118 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1119 +#define _JUMP_TO_TOP_r00 1120 +#define _LIST_APPEND_r10 1121 +#define _LIST_EXTEND_r10 1122 +#define _LOAD_ATTR_r10 1123 +#define _LOAD_ATTR_CLASS_r11 1124 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1125 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 1126 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 1127 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 1128 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1129 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1130 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1131 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 1132 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 1133 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 1134 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1135 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1136 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1137 +#define _LOAD_ATTR_MODULE_r12 1138 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1139 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1140 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1141 +#define _LOAD_ATTR_SLOT_r02 1142 +#define _LOAD_ATTR_SLOT_r12 1143 +#define _LOAD_ATTR_SLOT_r23 1144 +#define _LOAD_ATTR_WITH_HINT_r12 1145 +#define _LOAD_BUILD_CLASS_r01 1146 +#define _LOAD_BYTECODE_r00 1147 +#define _LOAD_COMMON_CONSTANT_r01 1148 +#define _LOAD_COMMON_CONSTANT_r12 1149 +#define _LOAD_COMMON_CONSTANT_r23 1150 +#define _LOAD_CONST_r01 1151 +#define _LOAD_CONST_r12 1152 +#define _LOAD_CONST_r23 1153 +#define _LOAD_CONST_INLINE_r01 1154 +#define _LOAD_CONST_INLINE_r12 1155 +#define _LOAD_CONST_INLINE_r23 1156 +#define _LOAD_CONST_INLINE_BORROW_r01 1157 +#define _LOAD_CONST_INLINE_BORROW_r12 1158 +#define _LOAD_CONST_INLINE_BORROW_r23 1159 +#define _LOAD_CONST_UNDER_INLINE_r02 1160 +#define _LOAD_CONST_UNDER_INLINE_r12 1161 +#define _LOAD_CONST_UNDER_INLINE_r23 1162 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1163 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1164 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1165 +#define _LOAD_DEREF_r01 1166 +#define _LOAD_FAST_r01 1167 +#define _LOAD_FAST_r12 1168 +#define _LOAD_FAST_r23 1169 +#define _LOAD_FAST_0_r01 1170 +#define _LOAD_FAST_0_r12 1171 +#define _LOAD_FAST_0_r23 1172 +#define _LOAD_FAST_1_r01 1173 +#define _LOAD_FAST_1_r12 1174 +#define _LOAD_FAST_1_r23 1175 +#define _LOAD_FAST_2_r01 1176 +#define _LOAD_FAST_2_r12 1177 +#define _LOAD_FAST_2_r23 1178 +#define _LOAD_FAST_3_r01 1179 +#define _LOAD_FAST_3_r12 1180 +#define _LOAD_FAST_3_r23 1181 +#define _LOAD_FAST_4_r01 1182 +#define _LOAD_FAST_4_r12 1183 +#define _LOAD_FAST_4_r23 1184 +#define _LOAD_FAST_5_r01 1185 +#define _LOAD_FAST_5_r12 1186 +#define _LOAD_FAST_5_r23 1187 +#define _LOAD_FAST_6_r01 1188 +#define _LOAD_FAST_6_r12 1189 +#define _LOAD_FAST_6_r23 1190 +#define _LOAD_FAST_7_r01 1191 +#define _LOAD_FAST_7_r12 1192 +#define _LOAD_FAST_7_r23 1193 +#define _LOAD_FAST_AND_CLEAR_r01 1194 +#define _LOAD_FAST_AND_CLEAR_r12 1195 +#define _LOAD_FAST_AND_CLEAR_r23 1196 +#define _LOAD_FAST_BORROW_r01 1197 +#define _LOAD_FAST_BORROW_r12 1198 +#define _LOAD_FAST_BORROW_r23 1199 +#define _LOAD_FAST_BORROW_0_r01 1200 +#define _LOAD_FAST_BORROW_0_r12 1201 +#define _LOAD_FAST_BORROW_0_r23 1202 +#define _LOAD_FAST_BORROW_1_r01 1203 +#define _LOAD_FAST_BORROW_1_r12 1204 +#define _LOAD_FAST_BORROW_1_r23 1205 +#define _LOAD_FAST_BORROW_2_r01 1206 +#define _LOAD_FAST_BORROW_2_r12 1207 +#define _LOAD_FAST_BORROW_2_r23 1208 +#define _LOAD_FAST_BORROW_3_r01 1209 +#define _LOAD_FAST_BORROW_3_r12 1210 +#define _LOAD_FAST_BORROW_3_r23 1211 +#define _LOAD_FAST_BORROW_4_r01 1212 +#define _LOAD_FAST_BORROW_4_r12 1213 +#define _LOAD_FAST_BORROW_4_r23 1214 +#define _LOAD_FAST_BORROW_5_r01 1215 +#define _LOAD_FAST_BORROW_5_r12 1216 +#define _LOAD_FAST_BORROW_5_r23 1217 +#define _LOAD_FAST_BORROW_6_r01 1218 +#define _LOAD_FAST_BORROW_6_r12 1219 +#define _LOAD_FAST_BORROW_6_r23 1220 +#define _LOAD_FAST_BORROW_7_r01 1221 +#define _LOAD_FAST_BORROW_7_r12 1222 +#define _LOAD_FAST_BORROW_7_r23 1223 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1224 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1225 +#define _LOAD_FAST_CHECK_r01 1226 +#define _LOAD_FAST_CHECK_r12 1227 +#define _LOAD_FAST_CHECK_r23 1228 +#define _LOAD_FAST_LOAD_FAST_r02 1229 +#define _LOAD_FAST_LOAD_FAST_r13 1230 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1231 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1232 +#define _LOAD_GLOBAL_r00 1233 +#define _LOAD_GLOBAL_BUILTINS_r01 1234 +#define _LOAD_GLOBAL_MODULE_r01 1235 +#define _LOAD_LOCALS_r01 1236 +#define _LOAD_LOCALS_r12 1237 +#define _LOAD_LOCALS_r23 1238 +#define _LOAD_NAME_r01 1239 +#define _LOAD_SMALL_INT_r01 1240 +#define _LOAD_SMALL_INT_r12 1241 +#define _LOAD_SMALL_INT_r23 1242 +#define _LOAD_SMALL_INT_0_r01 1243 +#define _LOAD_SMALL_INT_0_r12 1244 +#define _LOAD_SMALL_INT_0_r23 1245 +#define _LOAD_SMALL_INT_1_r01 1246 +#define _LOAD_SMALL_INT_1_r12 1247 +#define _LOAD_SMALL_INT_1_r23 1248 +#define _LOAD_SMALL_INT_2_r01 1249 +#define _LOAD_SMALL_INT_2_r12 1250 +#define _LOAD_SMALL_INT_2_r23 1251 +#define _LOAD_SMALL_INT_3_r01 1252 +#define _LOAD_SMALL_INT_3_r12 1253 +#define _LOAD_SMALL_INT_3_r23 1254 +#define _LOAD_SPECIAL_r00 1255 +#define _LOAD_SUPER_ATTR_ATTR_r31 1256 +#define _LOAD_SUPER_ATTR_METHOD_r32 1257 +#define _LOCK_OBJECT_r01 1258 +#define _LOCK_OBJECT_r11 1259 +#define _LOCK_OBJECT_r22 1260 +#define _LOCK_OBJECT_r33 1261 +#define _MAKE_CALLARGS_A_TUPLE_r33 1262 +#define _MAKE_CELL_r00 1263 +#define _MAKE_FUNCTION_r11 1264 +#define _MAKE_HEAP_SAFE_r01 1265 +#define _MAKE_HEAP_SAFE_r11 1266 +#define _MAKE_HEAP_SAFE_r22 1267 +#define _MAKE_HEAP_SAFE_r33 1268 +#define _MAKE_WARM_r00 1269 +#define _MAKE_WARM_r11 1270 +#define _MAKE_WARM_r22 1271 +#define _MAKE_WARM_r33 1272 +#define _MAP_ADD_r20 1273 +#define _MATCH_CLASS_r31 1274 +#define _MATCH_KEYS_r23 1275 +#define _MATCH_MAPPING_r02 1276 +#define _MATCH_MAPPING_r12 1277 +#define _MATCH_MAPPING_r23 1278 +#define _MATCH_SEQUENCE_r02 1279 +#define _MATCH_SEQUENCE_r12 1280 +#define _MATCH_SEQUENCE_r23 1281 +#define _MAYBE_EXPAND_METHOD_r00 1282 +#define _MAYBE_EXPAND_METHOD_KW_r11 1283 +#define _MONITOR_CALL_r00 1284 +#define _MONITOR_CALL_KW_r11 1285 +#define _MONITOR_JUMP_BACKWARD_r00 1286 +#define _MONITOR_JUMP_BACKWARD_r11 1287 +#define _MONITOR_JUMP_BACKWARD_r22 1288 +#define _MONITOR_JUMP_BACKWARD_r33 1289 +#define _MONITOR_RESUME_r00 1290 +#define _NOP_r00 1291 +#define _NOP_r11 1292 +#define _NOP_r22 1293 +#define _NOP_r33 1294 +#define _POP_CALL_r20 1295 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1296 +#define _POP_CALL_ONE_r30 1297 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1298 +#define _POP_CALL_TWO_r30 1299 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1300 +#define _POP_EXCEPT_r10 1301 +#define _POP_ITER_r20 1302 +#define _POP_JUMP_IF_FALSE_r00 1303 +#define _POP_JUMP_IF_FALSE_r10 1304 +#define _POP_JUMP_IF_FALSE_r21 1305 +#define _POP_JUMP_IF_FALSE_r32 1306 +#define _POP_JUMP_IF_TRUE_r00 1307 +#define _POP_JUMP_IF_TRUE_r10 1308 +#define _POP_JUMP_IF_TRUE_r21 1309 +#define _POP_JUMP_IF_TRUE_r32 1310 +#define _POP_TOP_r10 1311 +#define _POP_TOP_FLOAT_r00 1312 +#define _POP_TOP_FLOAT_r10 1313 +#define _POP_TOP_FLOAT_r21 1314 +#define _POP_TOP_FLOAT_r32 1315 +#define _POP_TOP_INT_r00 1316 +#define _POP_TOP_INT_r10 1317 +#define _POP_TOP_INT_r21 1318 +#define _POP_TOP_INT_r32 1319 +#define _POP_TOP_LOAD_CONST_INLINE_r11 1320 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1321 +#define _POP_TOP_NOP_r00 1322 +#define _POP_TOP_NOP_r10 1323 +#define _POP_TOP_NOP_r21 1324 +#define _POP_TOP_NOP_r32 1325 +#define _POP_TOP_UNICODE_r00 1326 +#define _POP_TOP_UNICODE_r10 1327 +#define _POP_TOP_UNICODE_r21 1328 +#define _POP_TOP_UNICODE_r32 1329 +#define _POP_TWO_r20 1330 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1331 +#define _PUSH_EXC_INFO_r02 1332 +#define _PUSH_EXC_INFO_r12 1333 +#define _PUSH_EXC_INFO_r23 1334 +#define _PUSH_FRAME_r10 1335 +#define _PUSH_NULL_r01 1336 +#define _PUSH_NULL_r12 1337 +#define _PUSH_NULL_r23 1338 +#define _PUSH_NULL_CONDITIONAL_r00 1339 +#define _PY_FRAME_EX_r31 1340 +#define _PY_FRAME_GENERAL_r01 1341 +#define _PY_FRAME_KW_r11 1342 +#define _QUICKEN_RESUME_r00 1343 +#define _QUICKEN_RESUME_r11 1344 +#define _QUICKEN_RESUME_r22 1345 +#define _QUICKEN_RESUME_r33 1346 +#define _REPLACE_WITH_TRUE_r02 1347 +#define _REPLACE_WITH_TRUE_r12 1348 +#define _REPLACE_WITH_TRUE_r23 1349 +#define _RESUME_CHECK_r00 1350 +#define _RESUME_CHECK_r11 1351 +#define _RESUME_CHECK_r22 1352 +#define _RESUME_CHECK_r33 1353 +#define _RETURN_GENERATOR_r01 1354 +#define _RETURN_VALUE_r11 1355 +#define _SAVE_RETURN_OFFSET_r00 1356 +#define _SAVE_RETURN_OFFSET_r11 1357 +#define _SAVE_RETURN_OFFSET_r22 1358 +#define _SAVE_RETURN_OFFSET_r33 1359 +#define _SEND_r22 1360 +#define _SEND_GEN_FRAME_r22 1361 +#define _SETUP_ANNOTATIONS_r00 1362 +#define _SET_ADD_r10 1363 +#define _SET_FUNCTION_ATTRIBUTE_r01 1364 +#define _SET_FUNCTION_ATTRIBUTE_r11 1365 +#define _SET_FUNCTION_ATTRIBUTE_r21 1366 +#define _SET_FUNCTION_ATTRIBUTE_r32 1367 +#define _SET_IP_r00 1368 +#define _SET_IP_r11 1369 +#define _SET_IP_r22 1370 +#define _SET_IP_r33 1371 +#define _SET_UPDATE_r10 1372 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1373 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1374 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1375 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1376 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1377 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1378 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1379 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1380 +#define _SPILL_OR_RELOAD_r01 1381 +#define _SPILL_OR_RELOAD_r02 1382 +#define _SPILL_OR_RELOAD_r03 1383 +#define _SPILL_OR_RELOAD_r10 1384 +#define _SPILL_OR_RELOAD_r12 1385 +#define _SPILL_OR_RELOAD_r13 1386 +#define _SPILL_OR_RELOAD_r20 1387 +#define _SPILL_OR_RELOAD_r21 1388 +#define _SPILL_OR_RELOAD_r23 1389 +#define _SPILL_OR_RELOAD_r30 1390 +#define _SPILL_OR_RELOAD_r31 1391 +#define _SPILL_OR_RELOAD_r32 1392 +#define _START_EXECUTOR_r00 1393 +#define _STORE_ATTR_r20 1394 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1395 +#define _STORE_ATTR_SLOT_r21 1396 +#define _STORE_ATTR_WITH_HINT_r21 1397 +#define _STORE_DEREF_r10 1398 +#define _STORE_FAST_LOAD_FAST_r11 1399 +#define _STORE_FAST_STORE_FAST_r20 1400 +#define _STORE_GLOBAL_r10 1401 +#define _STORE_NAME_r10 1402 +#define _STORE_SLICE_r30 1403 +#define _STORE_SUBSCR_r30 1404 +#define _STORE_SUBSCR_DICT_r31 1405 +#define _STORE_SUBSCR_LIST_INT_r32 1406 +#define _SWAP_r11 1407 +#define _SWAP_2_r02 1408 +#define _SWAP_2_r12 1409 +#define _SWAP_2_r22 1410 +#define _SWAP_2_r33 1411 +#define _SWAP_3_r03 1412 +#define _SWAP_3_r13 1413 +#define _SWAP_3_r23 1414 +#define _SWAP_3_r33 1415 +#define _SWAP_FAST_r01 1416 +#define _SWAP_FAST_r11 1417 +#define _SWAP_FAST_r22 1418 +#define _SWAP_FAST_r33 1419 +#define _SWAP_FAST_0_r01 1420 +#define _SWAP_FAST_0_r11 1421 +#define _SWAP_FAST_0_r22 1422 +#define _SWAP_FAST_0_r33 1423 +#define _SWAP_FAST_1_r01 1424 +#define _SWAP_FAST_1_r11 1425 +#define _SWAP_FAST_1_r22 1426 +#define _SWAP_FAST_1_r33 1427 +#define _SWAP_FAST_2_r01 1428 +#define _SWAP_FAST_2_r11 1429 +#define _SWAP_FAST_2_r22 1430 +#define _SWAP_FAST_2_r33 1431 +#define _SWAP_FAST_3_r01 1432 +#define _SWAP_FAST_3_r11 1433 +#define _SWAP_FAST_3_r22 1434 +#define _SWAP_FAST_3_r33 1435 +#define _SWAP_FAST_4_r01 1436 +#define _SWAP_FAST_4_r11 1437 +#define _SWAP_FAST_4_r22 1438 +#define _SWAP_FAST_4_r33 1439 +#define _SWAP_FAST_5_r01 1440 +#define _SWAP_FAST_5_r11 1441 +#define _SWAP_FAST_5_r22 1442 +#define _SWAP_FAST_5_r33 1443 +#define _SWAP_FAST_6_r01 1444 +#define _SWAP_FAST_6_r11 1445 +#define _SWAP_FAST_6_r22 1446 +#define _SWAP_FAST_6_r33 1447 +#define _SWAP_FAST_7_r01 1448 +#define _SWAP_FAST_7_r11 1449 +#define _SWAP_FAST_7_r22 1450 +#define _SWAP_FAST_7_r33 1451 +#define _TIER2_RESUME_CHECK_r00 1452 +#define _TIER2_RESUME_CHECK_r11 1453 +#define _TIER2_RESUME_CHECK_r22 1454 +#define _TIER2_RESUME_CHECK_r33 1455 +#define _TO_BOOL_r11 1456 +#define _TO_BOOL_BOOL_r01 1457 +#define _TO_BOOL_BOOL_r11 1458 +#define _TO_BOOL_BOOL_r22 1459 +#define _TO_BOOL_BOOL_r33 1460 +#define _TO_BOOL_INT_r02 1461 +#define _TO_BOOL_INT_r12 1462 +#define _TO_BOOL_INT_r23 1463 +#define _TO_BOOL_LIST_r02 1464 +#define _TO_BOOL_LIST_r12 1465 +#define _TO_BOOL_LIST_r23 1466 +#define _TO_BOOL_NONE_r01 1467 +#define _TO_BOOL_NONE_r11 1468 +#define _TO_BOOL_NONE_r22 1469 +#define _TO_BOOL_NONE_r33 1470 +#define _TO_BOOL_STR_r02 1471 +#define _TO_BOOL_STR_r12 1472 +#define _TO_BOOL_STR_r23 1473 +#define _TRACE_RECORD_r00 1474 +#define _UNARY_INVERT_r12 1475 +#define _UNARY_NEGATIVE_r12 1476 +#define _UNARY_NOT_r01 1477 +#define _UNARY_NOT_r11 1478 +#define _UNARY_NOT_r22 1479 +#define _UNARY_NOT_r33 1480 +#define _UNPACK_EX_r10 1481 +#define _UNPACK_SEQUENCE_r10 1482 +#define _UNPACK_SEQUENCE_LIST_r10 1483 +#define _UNPACK_SEQUENCE_TUPLE_r10 1484 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1485 +#define _WITH_EXCEPT_START_r33 1486 +#define _YIELD_VALUE_r11 1487 +#define MAX_UOP_REGS_ID 1487 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 4a8245365f805a..fbcb95baf2aa60 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -113,18 +113,18 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_BINARY_OP_ADD_FLOAT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, [_BINARY_OP_SUBTRACT_FLOAT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, [_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, - [_BINARY_OP_INPLACE_ADD_UNICODE] = HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_BINARY_OP_EXTEND] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, + [_BINARY_OP_INPLACE_ADD_UNICODE] = HAS_LOCAL_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_GUARD_BINARY_OP_EXTEND] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_EXTEND] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_BINARY_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, + [_BINARY_OP_SUBSCR_LIST_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_LIST_SLICE] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG, - [_BINARY_OP_SUBSCR_USTR_INT] = HAS_DEOPT_FLAG, + [_BINARY_OP_SUBSCR_STR_INT] = HAS_EXIT_FLAG, + [_BINARY_OP_SUBSCR_USTR_INT] = HAS_EXIT_FLAG, [_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG, - [_GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS] = HAS_DEOPT_FLAG, + [_GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS] = HAS_EXIT_FLAG, [_BINARY_OP_SUBSCR_TUPLE_INT] = 0, [_GUARD_NOS_DICT] = HAS_EXIT_FLAG, [_GUARD_NOS_ANY_DICT] = HAS_EXIT_FLAG, @@ -132,7 +132,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_GUARD_TOS_DICT] = HAS_EXIT_FLAG, [_GUARD_TOS_FROZENDICT] = HAS_EXIT_FLAG, [_BINARY_OP_SUBSCR_DICT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_BINARY_OP_SUBSCR_CHECK_FUNC] = HAS_DEOPT_FLAG, + [_BINARY_OP_SUBSCR_CHECK_FUNC] = HAS_EXIT_FLAG, [_BINARY_OP_SUBSCR_INIT_CALL] = 0, [_LIST_APPEND] = HAS_ARG_FLAG | HAS_ERROR_FLAG, [_SET_ADD] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -147,7 +147,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_GET_AITER] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_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_DEOPT_FLAG, + [_SEND_GEN_FRAME] = HAS_ARG_FLAG | HAS_EXIT_FLAG, [_YIELD_VALUE] = HAS_ARG_FLAG | HAS_NEEDS_GUARD_IP_FLAG, [_POP_EXCEPT] = HAS_ESCAPES_FLAG, [_LOAD_COMMON_CONSTANT] = HAS_ARG_FLAG, @@ -155,8 +155,8 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_STORE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_DELETE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, - [_UNPACK_SEQUENCE_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, + [_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, + [_UNPACK_SEQUENCE_TUPLE] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_EX] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -190,21 +190,22 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_DICT_UPDATE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_DICT_MERGE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_MAP_ADD] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_LOAD_SUPER_ATTR_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_LOAD_SUPER_ATTR_METHOD] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, + [_LOAD_SUPER_ATTR_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_LOAD_SUPER_ATTR_METHOD] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_LOAD_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_GUARD_TYPE_VERSION] = HAS_EXIT_FLAG, - [_GUARD_TYPE_VERSION_AND_LOCK] = HAS_EXIT_FLAG, - [_CHECK_MANAGED_OBJECT_HAS_VALUES] = HAS_DEOPT_FLAG, + [_GUARD_TYPE_VERSION_LOCKED] = HAS_EXIT_FLAG, + [_CHECK_MANAGED_OBJECT_HAS_VALUES] = HAS_EXIT_FLAG, [_LOAD_ATTR_INSTANCE_VALUE] = HAS_DEOPT_FLAG, - [_LOAD_ATTR_MODULE] = HAS_DEOPT_FLAG, - [_LOAD_ATTR_WITH_HINT] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG, - [_LOAD_ATTR_SLOT] = HAS_DEOPT_FLAG, + [_LOAD_ATTR_MODULE] = HAS_EXIT_FLAG, + [_LOAD_ATTR_WITH_HINT] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_EXIT_FLAG, + [_LOAD_ATTR_SLOT] = HAS_EXIT_FLAG, [_CHECK_ATTR_CLASS] = HAS_EXIT_FLAG, [_LOAD_ATTR_CLASS] = HAS_ESCAPES_FLAG, - [_LOAD_ATTR_PROPERTY_FRAME] = HAS_ARG_FLAG | HAS_DEOPT_FLAG, + [_LOAD_ATTR_PROPERTY_FRAME] = HAS_ARG_FLAG | HAS_EXIT_FLAG, [_GUARD_DORV_NO_DICT] = HAS_EXIT_FLAG, [_STORE_ATTR_INSTANCE_VALUE] = HAS_ESCAPES_FLAG, + [_LOCK_OBJECT] = HAS_DEOPT_FLAG, [_STORE_ATTR_WITH_HINT] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_STORE_ATTR_SLOT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_COMPARE_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -213,9 +214,9 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_COMPARE_OP_STR] = HAS_ARG_FLAG, [_IS_OP] = HAS_ARG_FLAG, [_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_TOS_ANY_SET] = HAS_DEOPT_FLAG, - [_GUARD_TOS_SET] = HAS_DEOPT_FLAG, - [_GUARD_TOS_FROZENSET] = HAS_DEOPT_FLAG, + [_GUARD_TOS_ANY_SET] = HAS_EXIT_FLAG, + [_GUARD_TOS_SET] = HAS_EXIT_FLAG, + [_GUARD_TOS_FROZENSET] = HAS_EXIT_FLAG, [_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -240,18 +241,18 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_ITER_CHECK_RANGE] = HAS_EXIT_FLAG, [_GUARD_NOT_EXHAUSTED_RANGE] = HAS_EXIT_FLAG, [_ITER_NEXT_RANGE] = HAS_ERROR_FLAG, - [_FOR_ITER_GEN_FRAME] = HAS_ARG_FLAG | HAS_DEOPT_FLAG, + [_FOR_ITER_GEN_FRAME] = HAS_ARG_FLAG | HAS_EXIT_FLAG, [_INSERT_NULL] = 0, [_LOAD_SPECIAL] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_WITH_EXCEPT_START] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_PUSH_EXC_INFO] = 0, - [_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT] = HAS_DEOPT_FLAG, - [_GUARD_KEYS_VERSION] = HAS_DEOPT_FLAG, + [_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT] = HAS_EXIT_FLAG, + [_GUARD_KEYS_VERSION] = HAS_EXIT_FLAG, [_LOAD_ATTR_METHOD_WITH_VALUES] = HAS_ARG_FLAG, [_LOAD_ATTR_METHOD_NO_DICT] = HAS_ARG_FLAG, [_LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG, [_LOAD_ATTR_NONDESCRIPTOR_NO_DICT] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG, - [_CHECK_ATTR_METHOD_LAZY_DICT] = HAS_DEOPT_FLAG, + [_CHECK_ATTR_METHOD_LAZY_DICT] = HAS_EXIT_FLAG, [_LOAD_ATTR_METHOD_LAZY_DICT] = HAS_ARG_FLAG, [_MAYBE_EXPAND_METHOD] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG, [_PY_FRAME_GENERAL] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG, @@ -274,27 +275,27 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_INIT_CALL_PY_EXACT_ARGS_4] = HAS_PURE_FLAG, [_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_DEOPT_FLAG, + [_GUARD_NOS_NULL] = HAS_EXIT_FLAG, [_GUARD_NOS_NOT_NULL] = HAS_EXIT_FLAG, - [_GUARD_THIRD_NULL] = HAS_DEOPT_FLAG, - [_GUARD_CALLABLE_TYPE_1] = HAS_DEOPT_FLAG, + [_GUARD_THIRD_NULL] = HAS_EXIT_FLAG, + [_GUARD_CALLABLE_TYPE_1] = HAS_EXIT_FLAG, [_CALL_TYPE_1] = HAS_ARG_FLAG, - [_GUARD_CALLABLE_STR_1] = HAS_DEOPT_FLAG, + [_GUARD_CALLABLE_STR_1] = HAS_EXIT_FLAG, [_CALL_STR_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_CALLABLE_TUPLE_1] = HAS_DEOPT_FLAG, + [_GUARD_CALLABLE_TUPLE_1] = HAS_EXIT_FLAG, [_CALL_TUPLE_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_CHECK_AND_ALLOCATE_OBJECT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, + [_CHECK_AND_ALLOCATE_OBJECT] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CREATE_INIT_FRAME] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_SYNC_SP_FLAG, [_EXIT_INIT_CHECK] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_CALL_BUILTIN_CLASS] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_CALL_BUILTIN_CLASS] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CALL_BUILTIN_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_CALL_BUILTIN_FAST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_CALL_BUILTIN_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_CALLABLE_LEN] = HAS_DEOPT_FLAG, + [_CALL_BUILTIN_FAST] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_CALL_BUILTIN_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_GUARD_CALLABLE_LEN] = HAS_EXIT_FLAG, [_CALL_LEN] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_CALLABLE_ISINSTANCE] = HAS_DEOPT_FLAG, + [_GUARD_CALLABLE_ISINSTANCE] = HAS_EXIT_FLAG, [_CALL_ISINSTANCE] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, - [_GUARD_CALLABLE_LIST_APPEND] = HAS_DEOPT_FLAG, + [_GUARD_CALLABLE_LIST_APPEND] = HAS_EXIT_FLAG, [_CALL_LIST_APPEND] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG, [_CALL_METHOD_DESCRIPTOR_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -1835,13 +1836,13 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _GUARD_TYPE_VERSION_r33 }, }, }, - [_GUARD_TYPE_VERSION_AND_LOCK] = { + [_GUARD_TYPE_VERSION_LOCKED] = { .best = { 0, 1, 2, 3 }, .entries = { - { 1, 0, _GUARD_TYPE_VERSION_AND_LOCK_r01 }, - { 1, 1, _GUARD_TYPE_VERSION_AND_LOCK_r11 }, - { 2, 2, _GUARD_TYPE_VERSION_AND_LOCK_r22 }, - { 3, 3, _GUARD_TYPE_VERSION_AND_LOCK_r33 }, + { 1, 0, _GUARD_TYPE_VERSION_LOCKED_r01 }, + { 1, 1, _GUARD_TYPE_VERSION_LOCKED_r11 }, + { 2, 2, _GUARD_TYPE_VERSION_LOCKED_r22 }, + { 3, 3, _GUARD_TYPE_VERSION_LOCKED_r33 }, }, }, [_CHECK_MANAGED_OBJECT_HAS_VALUES] = { @@ -1934,6 +1935,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { -1, -1, -1 }, }, }, + [_LOCK_OBJECT] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 1, 0, _LOCK_OBJECT_r01 }, + { 1, 1, _LOCK_OBJECT_r11 }, + { 2, 2, _LOCK_OBJECT_r22 }, + { 3, 3, _LOCK_OBJECT_r33 }, + }, + }, [_STORE_ATTR_WITH_HINT] = { .best = { 2, 2, 2, 2 }, .entries = { @@ -3882,10 +3892,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GUARD_TYPE_VERSION_r11] = _GUARD_TYPE_VERSION, [_GUARD_TYPE_VERSION_r22] = _GUARD_TYPE_VERSION, [_GUARD_TYPE_VERSION_r33] = _GUARD_TYPE_VERSION, - [_GUARD_TYPE_VERSION_AND_LOCK_r01] = _GUARD_TYPE_VERSION_AND_LOCK, - [_GUARD_TYPE_VERSION_AND_LOCK_r11] = _GUARD_TYPE_VERSION_AND_LOCK, - [_GUARD_TYPE_VERSION_AND_LOCK_r22] = _GUARD_TYPE_VERSION_AND_LOCK, - [_GUARD_TYPE_VERSION_AND_LOCK_r33] = _GUARD_TYPE_VERSION_AND_LOCK, + [_GUARD_TYPE_VERSION_LOCKED_r01] = _GUARD_TYPE_VERSION_LOCKED, + [_GUARD_TYPE_VERSION_LOCKED_r11] = _GUARD_TYPE_VERSION_LOCKED, + [_GUARD_TYPE_VERSION_LOCKED_r22] = _GUARD_TYPE_VERSION_LOCKED, + [_GUARD_TYPE_VERSION_LOCKED_r33] = _GUARD_TYPE_VERSION_LOCKED, [_CHECK_MANAGED_OBJECT_HAS_VALUES_r01] = _CHECK_MANAGED_OBJECT_HAS_VALUES, [_CHECK_MANAGED_OBJECT_HAS_VALUES_r11] = _CHECK_MANAGED_OBJECT_HAS_VALUES, [_CHECK_MANAGED_OBJECT_HAS_VALUES_r22] = _CHECK_MANAGED_OBJECT_HAS_VALUES, @@ -3909,6 +3919,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GUARD_DORV_NO_DICT_r22] = _GUARD_DORV_NO_DICT, [_GUARD_DORV_NO_DICT_r33] = _GUARD_DORV_NO_DICT, [_STORE_ATTR_INSTANCE_VALUE_r21] = _STORE_ATTR_INSTANCE_VALUE, + [_LOCK_OBJECT_r01] = _LOCK_OBJECT, + [_LOCK_OBJECT_r11] = _LOCK_OBJECT, + [_LOCK_OBJECT_r22] = _LOCK_OBJECT, + [_LOCK_OBJECT_r33] = _LOCK_OBJECT, [_STORE_ATTR_WITH_HINT_r21] = _STORE_ATTR_WITH_HINT, [_STORE_ATTR_SLOT_r21] = _STORE_ATTR_SLOT, [_COMPARE_OP_r21] = _COMPARE_OP, @@ -4946,11 +4960,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_GUARD_TYPE_VERSION_r11] = "_GUARD_TYPE_VERSION_r11", [_GUARD_TYPE_VERSION_r22] = "_GUARD_TYPE_VERSION_r22", [_GUARD_TYPE_VERSION_r33] = "_GUARD_TYPE_VERSION_r33", - [_GUARD_TYPE_VERSION_AND_LOCK] = "_GUARD_TYPE_VERSION_AND_LOCK", - [_GUARD_TYPE_VERSION_AND_LOCK_r01] = "_GUARD_TYPE_VERSION_AND_LOCK_r01", - [_GUARD_TYPE_VERSION_AND_LOCK_r11] = "_GUARD_TYPE_VERSION_AND_LOCK_r11", - [_GUARD_TYPE_VERSION_AND_LOCK_r22] = "_GUARD_TYPE_VERSION_AND_LOCK_r22", - [_GUARD_TYPE_VERSION_AND_LOCK_r33] = "_GUARD_TYPE_VERSION_AND_LOCK_r33", + [_GUARD_TYPE_VERSION_LOCKED] = "_GUARD_TYPE_VERSION_LOCKED", + [_GUARD_TYPE_VERSION_LOCKED_r01] = "_GUARD_TYPE_VERSION_LOCKED_r01", + [_GUARD_TYPE_VERSION_LOCKED_r11] = "_GUARD_TYPE_VERSION_LOCKED_r11", + [_GUARD_TYPE_VERSION_LOCKED_r22] = "_GUARD_TYPE_VERSION_LOCKED_r22", + [_GUARD_TYPE_VERSION_LOCKED_r33] = "_GUARD_TYPE_VERSION_LOCKED_r33", [_HANDLE_PENDING_AND_DEOPT] = "_HANDLE_PENDING_AND_DEOPT", [_HANDLE_PENDING_AND_DEOPT_r00] = "_HANDLE_PENDING_AND_DEOPT_r00", [_HANDLE_PENDING_AND_DEOPT_r10] = "_HANDLE_PENDING_AND_DEOPT_r10", @@ -5207,6 +5221,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_LOAD_SUPER_ATTR_ATTR_r31] = "_LOAD_SUPER_ATTR_ATTR_r31", [_LOAD_SUPER_ATTR_METHOD] = "_LOAD_SUPER_ATTR_METHOD", [_LOAD_SUPER_ATTR_METHOD_r32] = "_LOAD_SUPER_ATTR_METHOD_r32", + [_LOCK_OBJECT] = "_LOCK_OBJECT", + [_LOCK_OBJECT_r01] = "_LOCK_OBJECT_r01", + [_LOCK_OBJECT_r11] = "_LOCK_OBJECT_r11", + [_LOCK_OBJECT_r22] = "_LOCK_OBJECT_r22", + [_LOCK_OBJECT_r33] = "_LOCK_OBJECT_r33", [_MAKE_CALLARGS_A_TUPLE] = "_MAKE_CALLARGS_A_TUPLE", [_MAKE_CALLARGS_A_TUPLE_r33] = "_MAKE_CALLARGS_A_TUPLE_r33", [_MAKE_CELL] = "_MAKE_CELL", @@ -5832,7 +5851,7 @@ int _PyUop_num_popped(int opcode, int oparg) return 1; case _GUARD_TYPE_VERSION: return 0; - case _GUARD_TYPE_VERSION_AND_LOCK: + case _GUARD_TYPE_VERSION_LOCKED: return 0; case _CHECK_MANAGED_OBJECT_HAS_VALUES: return 0; @@ -5854,6 +5873,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _STORE_ATTR_INSTANCE_VALUE: return 2; + case _LOCK_OBJECT: + return 0; case _STORE_ATTR_WITH_HINT: return 2; case _STORE_ATTR_SLOT: diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 55e5f06c8071ea..e106ac20809f20 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -200,6 +200,14 @@ def test_run_module_bug1764407(self): self.assertTrue(data.find(b'1 loop') != -1) self.assertTrue(data.find(b'__main__.Timer') != -1) + @support.cpython_only + def test_null_byte_in_interactive_mode(self): + # gh-140594: Fix an out of bounds read when a single NUL character + # is read from the standard input in interactive mode. + proc = spawn_python('-i') + proc.communicate(b'\x00', timeout=support.SHORT_TIMEOUT) + self.assertEqual(proc.returncode, 0) + def test_relativedir_bug46421(self): # Test `python -m unittest` with a relative directory beginning with ./ # Note: We have to switch to the project's top module's directory, as per diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 55e2ce590a2577..e3e02097b1f550 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -591,27 +591,36 @@ def test_Struct_reinitialization(self): # Struct instance. This test can be used to detect the leak # when running with regrtest -L. s = struct.Struct('>h') - s.__init__('>hh') + msg = 'Re-initialization .* will not work' + with self.assertWarnsRegex(FutureWarning, msg): + s.__init__('>hh') self.assertEqual(s.format, '>hh') packed = b'\x00\x01\x00\x02' self.assertEqual(s.pack(1, 2), packed) self.assertEqual(s.unpack(packed), (1, 2)) - with self.assertRaises(UnicodeEncodeError): - s.__init__('\udc00') + s.__init__('>hh') # same format self.assertEqual(s.format, '>hh') self.assertEqual(s.pack(1, 2), packed) self.assertEqual(s.unpack(packed), (1, 2)) - with self.assertRaises(struct.error): - s.__init__('$') + with self.assertWarnsRegex(FutureWarning, msg): + with self.assertRaises(UnicodeEncodeError): + s.__init__('\udc00') + self.assertEqual(s.format, '>hh') + self.assertEqual(s.pack(1, 2), packed) + self.assertEqual(s.unpack(packed), (1, 2)) + + with self.assertWarnsRegex(FutureWarning, msg): + with self.assertRaises(struct.error): + s.__init__('$') self.assertEqual(s.format, '>hh') self.assertEqual(s.pack(1, 2), packed) self.assertEqual(s.unpack(packed), (1, 2)) def check_sizeof(self, format_str, number_of_codes): # The size of 'PyStructObject' - totalsize = support.calcobjsize('2n3P') + totalsize = support.calcobjsize('2n3P?0P') # The size taken up by the 'formatcode' dynamic array totalsize += struct.calcsize('P3n0P') * (number_of_codes + 1) support.check_sizeof(self, struct.Struct(format_str), totalsize) @@ -809,14 +818,152 @@ def test_error_propagation(fmt_str): test_error_propagation('N') test_error_propagation('n') - def test_struct_subclass_instantiation(self): + def test_custom_struct_init(self): # Regression test for https://github.com/python/cpython/issues/112358 class MyStruct(struct.Struct): - def __init__(self): + def __init__(self, *args, **kwargs): super().__init__('>h') + my_struct = MyStruct('>h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + my_struct = MyStruct(format='>h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + + warnmsg = r"Different format arguments for __new__\(\) and __init__\(\) methods of Struct" + with self.assertWarnsRegex(FutureWarning, warnmsg): + my_struct = MyStruct('h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + + warnmsg = r"Struct\(\) takes at most 1 argument \(2 given\)" + with self.assertWarnsRegex(DeprecationWarning, warnmsg): + my_struct = MyStruct('>h', 42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg): + my_struct = MyStruct('>h', arg=42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg): + my_struct = MyStruct('>h', format=42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg): + my_struct = MyStruct(format='>h', arg=42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + + warnmsg = r"Invalid 'format' argument for Struct\.__new__\(\): " + with self.assertWarnsRegex(DeprecationWarning, warnmsg + '.*must be'): + my_struct = MyStruct(42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg + '.*must be'): + my_struct = MyStruct(format=42) + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg + 'bad char'): + my_struct = MyStruct('$') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg + 'bad char'): + my_struct = MyStruct(format='$') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg + ".*can't encode"): + my_struct = MyStruct('\udc00') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertWarnsRegex(DeprecationWarning, warnmsg + ".*can't encode"): + my_struct = MyStruct(format='\udc00') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + + def test_custom_struct_new(self): + # New way, no warnings: + class MyStruct(struct.Struct): + def __new__(cls, *args, **kwargs): + return super().__new__(cls, '>h') + + for format in '>h', 'h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + my_struct = MyStruct(format='h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') my_struct = MyStruct() + self.assertEqual(my_struct.format, '>h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + my_struct = MyStruct('h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + + def test_custom_struct_new_and_init(self): + # New way, no warnings: + class MyStruct(struct.Struct): + def __new__(cls, newargs, initargs): + return super().__new__(cls, *newargs) + def __init__(self, newargs, initargs): + if initargs is not None: + super().__init__(*initargs) + + my_struct = MyStruct(('>h',), ('>h',)) + self.assertEqual(my_struct.format, '>h') self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertRaises(TypeError): + MyStruct((), ()) + with self.assertRaises(TypeError): + MyStruct(('>h',), ()) + with self.assertRaises(TypeError): + MyStruct((), ('>h',)) + with self.assertRaises(TypeError): + MyStruct((42,), ('>h',)) + with self.assertWarns(FutureWarning): + with self.assertRaises(TypeError): + MyStruct(('>h',), (42,)) + with self.assertRaises(struct.error): + MyStruct(('$',), ('>h',)) + with self.assertWarns(FutureWarning): + with self.assertRaises(struct.error): + MyStruct(('>h',), ('$',)) + with self.assertRaises(UnicodeEncodeError): + MyStruct(('\udc00',), ('>h',)) + with self.assertWarns(FutureWarning): + with self.assertRaises(UnicodeEncodeError): + MyStruct(('>h',), ('\udc00',)) + with self.assertWarns(FutureWarning): + my_struct = MyStruct(('>h',), ('h') + self.assertEqual(my_struct.format, '>h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + my_struct = MyStruct(format='>h') + self.assertEqual(my_struct.format, '>h') + self.assertEqual(my_struct.pack(12345), b'\x30\x39') + with self.assertRaises(TypeError): + MyStruct() + with self.assertRaises(TypeError): + MyStruct(42) + with self.assertRaises(struct.error): + MyStruct('$') + with self.assertRaises(UnicodeEncodeError): + MyStruct('\udc00') + with self.assertRaises(TypeError): + MyStruct('>h', 42) + with self.assertRaises(TypeError): + MyStruct('>h', arg=42) + with self.assertRaises(TypeError): + MyStruct(arg=42) + with self.assertRaises(TypeError): + MyStruct('>h', format='>h') def test_repr(self): s = struct.Struct('=i2H') diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-11-02-16-23-17.gh-issue-140594.YIWUpl.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-11-02-16-23-17.gh-issue-140594.YIWUpl.rst new file mode 100644 index 00000000000000..aa126e7e25bba7 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-11-02-16-23-17.gh-issue-140594.YIWUpl.rst @@ -0,0 +1,2 @@ +Fix an out of bounds read when a single NUL character is read from the standard input. +Patch by Shamil Abdulaev. diff --git a/Misc/NEWS.d/next/Library/2026-01-10-16-23-21.gh-issue-143715.HZrfSA.rst b/Misc/NEWS.d/next/Library/2026-01-10-16-23-21.gh-issue-143715.HZrfSA.rst new file mode 100644 index 00000000000000..90aae6bee835f0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-01-10-16-23-21.gh-issue-143715.HZrfSA.rst @@ -0,0 +1,3 @@ +Calling the ``Struct.__new__()`` without required argument now is deprecated. +Calling :meth:`~object.__init__` method on initialized :class:`~struct.Struct` +objects is deprecated. diff --git a/Modules/_struct.c b/Modules/_struct.c index f8574322b40c8d..7eddc9bdc38a89 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -70,6 +70,7 @@ typedef struct { formatcode *s_codes; PyObject *s_format; PyObject *weakreflist; /* List of weak references */ + bool init_called; } PyStructObject; #define PyStructObject_CAST(op) ((PyStructObject *)(op)) @@ -1773,24 +1774,153 @@ prepare_s(PyStructObject *self, PyObject *format) return -1; } +/* This should be moved to Struct_impl() when Struct___init__() and + * s_new() will be removed (see gh-143715 and gh-94532). */ +static int +set_format(PyStructObject *self, PyObject *format) +{ + if (PyUnicode_Check(format)) { + format = PyUnicode_AsASCIIString(format); + if (format == NULL) + return -1; + } + else if (PyBytes_Check(format)) { + Py_INCREF(format); + } + else { + PyErr_Format(PyExc_TypeError, + "Struct() argument 1 must be a str or bytes object, " + "not %T", format); + return -1; + } + if (prepare_s(self, format)) { + Py_DECREF(format); + return -1; + } + Py_DECREF(format); + return 0; +} + +/*[clinic input] +@classmethod +Struct.__new__ + + format: object + +Create a compiled struct object. + +Return a new Struct object which writes and reads binary data according +to the format string. See help(struct) for more on format strings. +[clinic start generated code]*/ + +static PyObject * +Struct_impl(PyTypeObject *type, PyObject *format) +/*[clinic end generated code: output=49468b044e334308 input=8381a9796f20f24e]*/ +{ + PyStructObject *self = (PyStructObject *)type->tp_alloc(type, 0); + if (self == NULL) { + return NULL; + } + self->s_format = Py_NewRef(Py_None); + self->s_codes = NULL; + self->s_size = -1; + self->s_len = -1; + self->init_called = false; + if (set_format(self, format) < 0) { + Py_DECREF(self); + return NULL; + } + return (PyObject *)self; +} + + +static int +s_init(PyObject *self, PyObject *args, PyObject *kwargs); + static PyObject * s_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - PyObject *self; + if (type->tp_new != s_new) { + /* Struct.__new__() was called explicitly in a subclass' __new__(). */ + return Struct(type, args, kwds); + } - assert(type != NULL); - allocfunc alloc_func = PyType_GetSlot(type, Py_tp_alloc); - assert(alloc_func != NULL); + PyObject *format = NULL; + if (PyTuple_GET_SIZE(args) == 1 && (kwds == NULL || PyDict_GET_SIZE(kwds) == 0)) { + format = Py_NewRef(PyTuple_GET_ITEM(args, 0)); + } + else if (PyTuple_GET_SIZE(args) == 0 && kwds != NULL && PyDict_GET_SIZE(kwds) == 1) { + if (PyDict_GetItemStringRef(kwds, "format", &format) < 0) { + return NULL; + } + } + if (format == NULL && type->tp_init != s_init) { + Py_ssize_t nargs = PyTuple_GET_SIZE(args) + (kwds ? PyDict_GET_SIZE(kwds) : 0); + if (nargs > 1) { + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "Struct() takes at most 1 argument (%zd given)", nargs)) + { + Py_XDECREF(format); + return NULL; + } + } + else { + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "Struct() missing required argument 'format' (pos 1)", 1)) + { + Py_XDECREF(format); + return NULL; + } + } + } - self = alloc_func(type, 0); - if (self != NULL) { - PyStructObject *s = (PyStructObject*)self; - s->s_format = Py_NewRef(Py_None); - s->s_codes = NULL; - s->s_size = -1; - s->s_len = -1; + PyStructObject *self = (PyStructObject *)type->tp_alloc(type, 0); + if (self == NULL) { + return NULL; + } + self->s_format = Py_NewRef(Py_None); + self->s_codes = NULL; + self->s_size = -1; + self->s_len = -1; + self->init_called = false; + if (format && set_format(self, format) < 0) { + if (type->tp_init == s_init) { + /* No custom __init__() method, so __new__() should do + * all the work. */ + Py_DECREF(format); + Py_DECREF(self); + return NULL; + } + PyObject *exc = PyErr_GetRaisedException(); + Py_SETREF(self->s_format, Py_NewRef(Py_None)); + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "Invalid 'format' argument for Struct.__new__(): %S", exc)) + { + Py_DECREF(exc); + Py_DECREF(format); + Py_DECREF(self); + return NULL; + } + Py_DECREF(exc); + } + Py_XDECREF(format); + return (PyObject *)self; +} + +static bool +same_format(PyStructObject *s, PyObject *format) +{ + Py_ssize_t size = PyBytes_GET_SIZE(s->s_format); + const void *data = PyBytes_AS_STRING(s->s_format); + if (PyUnicode_Check(format) && PyUnicode_IS_ASCII(format)) { + return PyUnicode_GET_LENGTH(format) == size + && memcmp(PyUnicode_1BYTE_DATA(format), data, size) == 0; + } + if (PyBytes_Check(format)) { + return PyBytes_GET_SIZE(format) == size + && memcmp(PyBytes_AS_STRING(format), data, size) == 0; } - return self; + return false; } /*[clinic input] @@ -1808,29 +1938,42 @@ static int Struct___init___impl(PyStructObject *self, PyObject *format) /*[clinic end generated code: output=b8e80862444e92d0 input=1af78a5f57d82cec]*/ { - int ret = 0; - - if (PyUnicode_Check(format)) { - format = PyUnicode_AsASCIIString(format); - if (format == NULL) + if (self->s_format == Py_None) { + if (set_format(self, format) < 0) { return -1; + } } - else { - Py_INCREF(format); + else if (!same_format(self, format)) { + const char *msg = self->init_called + ? "Re-initialization of Struct by calling the __init__() method " + "will not work in future Python versions" + : "Different format arguments for __new__() and __init__() " + "methods of Struct"; + if (PyErr_WarnEx(PyExc_FutureWarning, msg, 1)) { + return -1; + } + if (set_format(self, format) < 0) { + return -1; + } } + self->init_called = true; + return 0; +} - if (!PyBytes_Check(format)) { - Py_DECREF(format); - PyErr_Format(PyExc_TypeError, - "Struct() argument 1 must be a str or bytes object, " - "not %.200s", - _PyType_Name(Py_TYPE(format))); - return -1; +static int +s_init(PyObject *self, PyObject *args, PyObject *kwargs) +{ + if (!((PyStructObject *)self)->init_called + && Py_TYPE(self)->tp_init == s_init + && ((PyStructObject *)self)->s_format != Py_None) + { + /* Struct.__init__() was called implicitly. + * __new__() already did all the work. */ + ((PyStructObject *)self)->init_called = true; + return 0; } - - ret = prepare_s(self, format); - Py_DECREF(format); - return ret; + /* Struct.__init__() was called explicitly. */ + return Struct___init__(self, args, kwargs); } static int @@ -2446,10 +2589,8 @@ static PyType_Slot PyStructType_slots[] = { {Py_tp_methods, s_methods}, {Py_tp_members, s_members}, {Py_tp_getset, s_getsetlist}, - {Py_tp_init, Struct___init__}, - {Py_tp_alloc, PyType_GenericAlloc}, + {Py_tp_init, s_init}, {Py_tp_new, s_new}, - {Py_tp_free, PyObject_GC_Del}, {0, 0}, }; diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index 2615b1d4dd2b5f..b025f7b0eb7fe5 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -825,12 +825,10 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UPDATE_MISS_STATS(BINARY_OP); - assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); - JUMP_TO_PREDICTED(BINARY_OP); + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); + if (index < 0) { + index += PyList_GET_SIZE(list); } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; #ifdef Py_GIL_DISABLED _PyFrame_SetStackPointer(frame, stack_pointer); PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index); @@ -840,15 +838,13 @@ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - STAT_INC(BINARY_OP, hit); res = PyStackRef_FromPyObjectSteal(res_o); #else - if (index >= PyList_GET_SIZE(list)) { + if (index < 0 || index >= PyList_GET_SIZE(list)) { UPDATE_MISS_STATS(BINARY_OP); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - STAT_INC(BINARY_OP, hit); PyObject *res_o = PyList_GET_ITEM(list, index); assert(res_o != NULL); res = PyStackRef_FromPyObjectNew(res_o); @@ -10979,21 +10975,25 @@ next_instr += 5; INSTRUCTION_STATS(STORE_ATTR_INSTANCE_VALUE); static_assert(INLINE_CACHE_ENTRIES_STORE_ATTR == 4, "incorrect cache size"); - _PyStackRef owner; _PyStackRef value; + _PyStackRef owner; _PyStackRef o; /* Skip 1 cache entry */ - // _GUARD_TYPE_VERSION_AND_LOCK + // _LOCK_OBJECT { - owner = stack_pointer[-1]; - uint32_t type_version = read_u32(&this_instr[2].cache); - PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); - assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { + value = stack_pointer[-1]; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { UPDATE_MISS_STATS(STORE_ATTR); assert(_PyOpcode_Deopt[opcode] == (STORE_ATTR)); JUMP_TO_PREDICTED(STORE_ATTR); } + } + // _GUARD_TYPE_VERSION_LOCKED + { + owner = value; + uint32_t type_version = read_u32(&this_instr[2].cache); + PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); + assert(type_version != 0); PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -11617,18 +11617,17 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UPDATE_MISS_STATS(STORE_SUBSCR); - assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); - JUMP_TO_PREDICTED(STORE_SUBSCR); - } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); if (!LOCK_OBJECT(list)) { UPDATE_MISS_STATS(STORE_SUBSCR); assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); JUMP_TO_PREDICTED(STORE_SUBSCR); } - if (index >= PyList_GET_SIZE(list)) { + Py_ssize_t len = PyList_GET_SIZE(list); + if (index < 0) { + index += len; + } + if (index < 0 || index >= len) { UNLOCK_OBJECT(list); if (true) { UPDATE_MISS_STATS(STORE_SUBSCR); diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h index 9c9d29748fcf28..e75698e3ed00cc 100644 --- a/Modules/clinic/_struct.c.h +++ b/Modules/clinic/_struct.c.h @@ -9,6 +9,66 @@ preserve #include "pycore_abstract.h" // _PyNumber_Index() #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() +PyDoc_STRVAR(Struct__doc__, +"Struct(format)\n" +"--\n" +"\n" +"Create a compiled struct object.\n" +"\n" +"Return a new Struct object which writes and reads binary data according\n" +"to the format string. See help(struct) for more on format strings."); + +static PyObject * +Struct_impl(PyTypeObject *type, PyObject *format); + +static PyObject * +Struct(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + PyObject *return_value = NULL; + #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) + + #define NUM_KEYWORDS 1 + static struct { + PyGC_Head _this_is_not_used; + PyObject_VAR_HEAD + Py_hash_t ob_hash; + PyObject *ob_item[NUM_KEYWORDS]; + } _kwtuple = { + .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS) + .ob_hash = -1, + .ob_item = { &_Py_ID(format), }, + }; + #undef NUM_KEYWORDS + #define KWTUPLE (&_kwtuple.ob_base.ob_base) + + #else // !Py_BUILD_CORE + # define KWTUPLE NULL + #endif // !Py_BUILD_CORE + + static const char * const _keywords[] = {"format", NULL}; + static _PyArg_Parser _parser = { + .keywords = _keywords, + .fname = "Struct", + .kwtuple = KWTUPLE, + }; + #undef KWTUPLE + PyObject *argsbuf[1]; + PyObject * const *fastargs; + Py_ssize_t nargs = PyTuple_GET_SIZE(args); + PyObject *format; + + fastargs = _PyArg_UnpackKeywords(_PyTuple_CAST(args)->ob_item, nargs, kwargs, NULL, &_parser, + /*minpos*/ 1, /*maxpos*/ 1, /*minkw*/ 0, /*varpos*/ 0, argsbuf); + if (!fastargs) { + goto exit; + } + format = fastargs[0]; + return_value = Struct_impl(type, format); + +exit: + return return_value; +} + PyDoc_STRVAR(Struct___init____doc__, "Struct(format)\n" "--\n" @@ -664,4 +724,4 @@ iter_unpack(PyObject *module, PyObject *const *args, Py_ssize_t nargs) return return_value; } -/*[clinic end generated code: output=09ee4ac45b7e709b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=0f417d43a2a387c8 input=a9049054013a1b77]*/ diff --git a/Parser/myreadline.c b/Parser/myreadline.c index 64e8f5383f0602..ee77479ba7bdcc 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -344,7 +344,7 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt) break; } n += strlen(p + n); - } while (p[n-1] != '\n'); + } while (n == 0 || p[n-1] != '\n'); pr = (char *)PyMem_RawRealloc(p, n+1); if (pr == NULL) { diff --git a/Python/bytecodes.c b/Python/bytecodes.c index ac3e519398dbce..0eff5f76740f78 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -794,7 +794,7 @@ dummy_func( #endif _PyStackRef *target_local = &GETLOCAL(next_oparg); assert(PyUnicode_CheckExact(left_o)); - DEOPT_IF(PyStackRef_AsPyObjectBorrow(*target_local) != left_o); + EXIT_IF(PyStackRef_AsPyObjectBorrow(*target_local) != left_o); STAT_INC(BINARY_OP, hit); /* Handle `left = left + right` or `left += right` for str. * @@ -830,7 +830,7 @@ dummy_func( assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5); assert(d && d->guard); int res = d->guard(left_o, right_o); - DEOPT_IF(!res); + EXIT_IF(!res); } op(_BINARY_OP_EXTEND, (descr/4, left, right -- res, l, r)) { @@ -930,17 +930,16 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - // Deopt unless 0 <= sub < PyList_Size(list) - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); + if (index < 0) { + index += PyList_GET_SIZE(list); + } #ifdef Py_GIL_DISABLED PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index); - DEOPT_IF(res_o == NULL); - STAT_INC(BINARY_OP, hit); + EXIT_IF(res_o == NULL); res = PyStackRef_FromPyObjectSteal(res_o); #else - DEOPT_IF(index >= PyList_GET_SIZE(list)); - STAT_INC(BINARY_OP, hit); + EXIT_IF(index < 0 || index >= PyList_GET_SIZE(list)); PyObject *res_o = PyList_GET_ITEM(list, index); assert(res_o != NULL); res = PyStackRef_FromPyObjectNew(res_o); @@ -981,9 +980,9 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); + EXIT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; - DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); + EXIT_IF(PyUnicode_GET_LENGTH(str) <= index); uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; assert(c < 128); STAT_INC(BINARY_OP, hit); @@ -1003,12 +1002,12 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); + EXIT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; - DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); + EXIT_IF(PyUnicode_GET_LENGTH(str) <= index); // Specialize for reading an ASCII character from any string: Py_UCS4 c = PyUnicode_READ_CHAR(str, index); - DEOPT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c); + EXIT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c); STAT_INC(BINARY_OP, hit); PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; s = str_st; @@ -1045,9 +1044,9 @@ dummy_func( assert(PyTuple_CheckExact(tuple)); // Deopt unless 0 <= sub < PyTuple_Size(list) - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + EXIT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; - DEOPT_IF(index >= PyTuple_GET_SIZE(tuple)); + EXIT_IF(index >= PyTuple_GET_SIZE(tuple)); } op(_BINARY_OP_SUBSCR_TUPLE_INT, (tuple_st, sub_st -- res, ts, ss)) { @@ -1117,16 +1116,16 @@ dummy_func( op(_BINARY_OP_SUBSCR_CHECK_FUNC, (container, unused -- container, unused, getitem)) { PyTypeObject *tp = Py_TYPE(PyStackRef_AsPyObjectBorrow(container)); - DEOPT_IF(!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)); + EXIT_IF(!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)); PyHeapTypeObject *ht = (PyHeapTypeObject *)tp; PyObject *getitem_o = FT_ATOMIC_LOAD_PTR_ACQUIRE(ht->_spec_cache.getitem); - DEOPT_IF(getitem_o == NULL); + EXIT_IF(getitem_o == NULL); assert(PyFunction_Check(getitem_o)); uint32_t cached_version = FT_ATOMIC_LOAD_UINT32_RELAXED(ht->_spec_cache.getitem_version); - DEOPT_IF(((PyFunctionObject *)getitem_o)->func_version != cached_version); + EXIT_IF(((PyFunctionObject *)getitem_o)->func_version != cached_version); PyCodeObject *code = (PyCodeObject *)PyFunction_GET_CODE(getitem_o); assert(code->co_argcount == 2); - DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize)); + EXIT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize)); getitem = PyStackRef_FromPyObjectNew(getitem_o); } @@ -1196,12 +1195,14 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - // Ensure nonnegative, zero-or-one-digit ints. - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); DEOPT_IF(!LOCK_OBJECT(list)); + Py_ssize_t len = PyList_GET_SIZE(list); // Ensure index < len(list) - if (index >= PyList_GET_SIZE(list)) { + if (index < 0) { + index += len; + } + if (index < 0 || index >= len) { UNLOCK_OBJECT(list); DEOPT_IF(true); } @@ -1458,8 +1459,8 @@ dummy_func( op(_SEND_GEN_FRAME, (receiver, v -- receiver, gen_frame)) { PyGenObject *gen = (PyGenObject *)PyStackRef_AsPyObjectBorrow(receiver); - DEOPT_IF(Py_TYPE(gen) != &PyGen_Type && Py_TYPE(gen) != &PyCoro_Type); - DEOPT_IF(!gen_try_set_executing((PyGenObject *)gen)); + EXIT_IF(Py_TYPE(gen) != &PyGen_Type && Py_TYPE(gen) != &PyCoro_Type); + EXIT_IF(!gen_try_set_executing((PyGenObject *)gen)); STAT_INC(SEND, hit); _PyInterpreterFrame *pushed_frame = &gen->gi_iframe; _PyFrame_StackPush(pushed_frame, PyStackRef_MakeHeapSafe(v)); @@ -1699,7 +1700,7 @@ dummy_func( assert(oparg == 2); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); assert(PyTuple_CheckExact(seq_o)); - DEOPT_IF(PyTuple_GET_SIZE(seq_o) != 2); + EXIT_IF(PyTuple_GET_SIZE(seq_o) != 2); STAT_INC(UNPACK_SEQUENCE, hit); val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1)); @@ -1712,7 +1713,7 @@ dummy_func( op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) { PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); assert(PyTuple_CheckExact(seq_o)); - DEOPT_IF(PyTuple_GET_SIZE(seq_o) != oparg); + EXIT_IF(PyTuple_GET_SIZE(seq_o) != oparg); STAT_INC(UNPACK_SEQUENCE, hit); PyObject **items = _PyTuple_ITEMS(seq_o); for (int i = oparg; --i >= 0; ) { @@ -2362,8 +2363,8 @@ dummy_func( PyObject *self = PyStackRef_AsPyObjectBorrow(self_st); assert(!(oparg & 1)); - DEOPT_IF(global_super != (PyObject *)&PySuper_Type); - DEOPT_IF(!PyType_Check(class)); + EXIT_IF(global_super != (PyObject *)&PySuper_Type); + EXIT_IF(!PyType_Check(class)); STAT_INC(LOAD_SUPER_ATTR, hit); PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2); PyObject *attr = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL); @@ -2378,8 +2379,8 @@ dummy_func( PyObject *self = PyStackRef_AsPyObjectBorrow(self_st); assert(oparg & 1); - DEOPT_IF(global_super != (PyObject *)&PySuper_Type); - DEOPT_IF(!PyType_Check(class)); + EXIT_IF(global_super != (PyObject *)&PySuper_Type); + EXIT_IF(!PyType_Check(class)); STAT_INC(LOAD_SUPER_ATTR, hit); PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2); PyTypeObject *cls = (PyTypeObject *)class; @@ -2462,10 +2463,9 @@ dummy_func( EXIT_IF(FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version); } - op(_GUARD_TYPE_VERSION_AND_LOCK, (type_version/2, owner -- owner)) { + op(_GUARD_TYPE_VERSION_LOCKED, (type_version/2, owner -- owner)) { PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(type_version != 0); - EXIT_IF(!LOCK_OBJECT(owner_o)); PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -2477,7 +2477,7 @@ dummy_func( PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(Py_TYPE(owner_o)->tp_dictoffset < 0); assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_INLINE_VALUES); - DEOPT_IF(!FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(owner_o)->valid)); + EXIT_IF(!FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(owner_o)->valid)); } op(_LOAD_ATTR_INSTANCE_VALUE, (offset/1, owner -- attr, o)) { @@ -2510,20 +2510,20 @@ dummy_func( op(_LOAD_ATTR_MODULE, (dict_version/2, index/1, owner -- attr, o)) { PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); - DEOPT_IF(Py_TYPE(owner_o)->tp_getattro != PyModule_Type.tp_getattro); + EXIT_IF(Py_TYPE(owner_o)->tp_getattro != PyModule_Type.tp_getattro); PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner_o)->md_dict; assert(dict != NULL); PyDictKeysObject *keys = FT_ATOMIC_LOAD_PTR_ACQUIRE(dict->ma_keys); - DEOPT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(keys->dk_version) != dict_version); + EXIT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(keys->dk_version) != dict_version); assert(keys->dk_kind == DICT_KEYS_UNICODE); assert(index < FT_ATOMIC_LOAD_SSIZE_RELAXED(keys->dk_nentries)); PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(keys) + index; PyObject *attr_o = FT_ATOMIC_LOAD_PTR_RELAXED(ep->me_value); - DEOPT_IF(attr_o == NULL); + EXIT_IF(attr_o == NULL); #ifdef Py_GIL_DISABLED int increfed = _Py_TryIncrefCompareStackRef(&ep->me_value, attr_o, &attr); if (!increfed) { - DEOPT_IF(true); + EXIT_IF(true); } #else attr = PyStackRef_FromPyObjectNew(attr_o); @@ -2544,34 +2544,34 @@ dummy_func( PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_MANAGED_DICT); PyDictObject *dict = _PyObject_GetManagedDict(owner_o); - DEOPT_IF(dict == NULL); + EXIT_IF(dict == NULL); PyDictKeysObject *dk = FT_ATOMIC_LOAD_PTR(dict->ma_keys); assert(PyDict_CheckExact((PyObject *)dict)); #ifdef Py_GIL_DISABLED - DEOPT_IF(!_Py_IsOwnedByCurrentThread((PyObject *)dict) && !_PyObject_GC_IS_SHARED(dict)); + EXIT_IF(!_Py_IsOwnedByCurrentThread((PyObject *)dict) && !_PyObject_GC_IS_SHARED(dict)); #endif PyObject *attr_o; if (hint >= (size_t)FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_nentries)) { - DEOPT_IF(true); + EXIT_IF(true); } PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1); if (dk->dk_kind != DICT_KEYS_UNICODE) { - DEOPT_IF(true); + EXIT_IF(true); } PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dk) + hint; if (FT_ATOMIC_LOAD_PTR_RELAXED(ep->me_key) != name) { - DEOPT_IF(true); + EXIT_IF(true); } attr_o = FT_ATOMIC_LOAD_PTR(ep->me_value); if (attr_o == NULL) { - DEOPT_IF(true); + EXIT_IF(true); } STAT_INC(LOAD_ATTR, hit); #ifdef Py_GIL_DISABLED int increfed = _Py_TryIncrefCompareStackRef(&ep->me_value, attr_o, &attr); if (!increfed) { - DEOPT_IF(true); + EXIT_IF(true); } #else attr = PyStackRef_FromPyObjectNew(attr_o); @@ -2594,10 +2594,10 @@ dummy_func( PyObject **addr = (PyObject **)((char *)owner_o + index); PyObject *attr_o = FT_ATOMIC_LOAD_PTR(*addr); - DEOPT_IF(attr_o == NULL); + EXIT_IF(attr_o == NULL); #ifdef Py_GIL_DISABLED int increfed = _Py_TryIncrefCompareStackRef(addr, attr_o, &attr); - DEOPT_IF(!increfed); + EXIT_IF(!increfed); #else attr = PyStackRef_FromPyObjectNew(attr_o); #endif @@ -2650,10 +2650,10 @@ dummy_func( assert(Py_IS_TYPE(fget, &PyFunction_Type)); PyFunctionObject *f = (PyFunctionObject *)fget; PyCodeObject *code = (PyCodeObject *)f->func_code; - DEOPT_IF((code->co_flags & (CO_VARKEYWORDS | CO_VARARGS | CO_OPTIMIZED)) != CO_OPTIMIZED); - DEOPT_IF(code->co_kwonlyargcount); - DEOPT_IF(code->co_argcount != 1); - DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize)); + EXIT_IF((code->co_flags & (CO_VARKEYWORDS | CO_VARARGS | CO_OPTIMIZED)) != CO_OPTIMIZED); + EXIT_IF(code->co_kwonlyargcount); + EXIT_IF(code->co_argcount != 1); + EXIT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize)); STAT_INC(LOAD_ATTR, hit); _PyInterpreterFrame *pushed_frame = _PyFrame_PushUnchecked(tstate, PyStackRef_FromPyObjectNew(fget), 1, frame); pushed_frame->localsplus[0] = owner; @@ -2731,9 +2731,14 @@ dummy_func( Py_XDECREF(old_value); } + op(_LOCK_OBJECT, (value -- value)) { + DEOPT_IF(!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))); + } + macro(STORE_ATTR_INSTANCE_VALUE) = unused/1 + - _GUARD_TYPE_VERSION_AND_LOCK + + _LOCK_OBJECT + + _GUARD_TYPE_VERSION_LOCKED + _GUARD_DORV_NO_DICT + _STORE_ATTR_INSTANCE_VALUE + POP_TOP; @@ -2952,17 +2957,17 @@ dummy_func( op(_GUARD_TOS_ANY_SET, (tos -- tos)) { PyObject *o = PyStackRef_AsPyObjectBorrow(tos); - DEOPT_IF(!PyAnySet_CheckExact(o)); + EXIT_IF(!PyAnySet_CheckExact(o)); } op(_GUARD_TOS_SET, (tos -- tos)) { PyObject *o = PyStackRef_AsPyObjectBorrow(tos); - DEOPT_IF(!PySet_CheckExact(o)); + EXIT_IF(!PySet_CheckExact(o)); } op(_GUARD_TOS_FROZENSET, (tos -- tos)) { PyObject *o = PyStackRef_AsPyObjectBorrow(tos); - DEOPT_IF(!PyFrozenSet_CheckExact(o)); + EXIT_IF(!PyFrozenSet_CheckExact(o)); } macro(CONTAINS_OP_SET) = _GUARD_TOS_ANY_SET + unused/1 + _CONTAINS_OP_SET + POP_TOP + POP_TOP; @@ -3585,8 +3590,8 @@ dummy_func( op(_FOR_ITER_GEN_FRAME, (iter, null -- iter, null, gen_frame)) { PyGenObject *gen = (PyGenObject *)PyStackRef_AsPyObjectBorrow(iter); - DEOPT_IF(Py_TYPE(gen) != &PyGen_Type); - DEOPT_IF(!gen_try_set_executing((PyGenObject *)gen)); + EXIT_IF(Py_TYPE(gen) != &PyGen_Type); + EXIT_IF(!gen_try_set_executing((PyGenObject *)gen)); STAT_INC(FOR_ITER, hit); _PyInterpreterFrame *pushed_frame = &gen->gi_iframe; _PyFrame_StackPush(pushed_frame, PyStackRef_None); @@ -3711,14 +3716,14 @@ dummy_func( PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_INLINE_VALUES); PyDictValues *ivs = _PyObject_InlineValues(owner_o); - DEOPT_IF(!FT_ATOMIC_LOAD_UINT8(ivs->valid)); + EXIT_IF(!FT_ATOMIC_LOAD_UINT8(ivs->valid)); } op(_GUARD_KEYS_VERSION, (keys_version/2, owner -- owner)) { PyTypeObject *owner_cls = Py_TYPE(PyStackRef_AsPyObjectBorrow(owner)); PyHeapTypeObject *owner_heap_type = (PyHeapTypeObject *)owner_cls; PyDictKeysObject *keys = owner_heap_type->ht_cached_keys; - DEOPT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(keys->dk_version) != keys_version); + EXIT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(keys->dk_version) != keys_version); } op(_LOAD_ATTR_METHOD_WITH_VALUES, (descr/4, owner -- attr, self)) { @@ -3794,7 +3799,7 @@ dummy_func( char *ptr = ((char *)PyStackRef_AsPyObjectBorrow(owner)) + MANAGED_DICT_OFFSET + dictoffset; PyObject *dict = FT_ATOMIC_LOAD_PTR_ACQUIRE(*(PyObject **)ptr); /* This object has a __dict__, just not yet created */ - DEOPT_IF(dict != NULL); + EXIT_IF(dict != NULL); } op(_LOAD_ATTR_METHOD_LAZY_DICT, (descr/4, owner -- attr, self)) { @@ -4150,7 +4155,7 @@ dummy_func( _PUSH_FRAME; op(_GUARD_NOS_NULL, (null, unused -- null, unused)) { - DEOPT_IF(!PyStackRef_IsNull(null)); + EXIT_IF(!PyStackRef_IsNull(null)); } op(_GUARD_NOS_NOT_NULL, (nos, unused -- nos, unused)) { @@ -4159,12 +4164,12 @@ dummy_func( } op(_GUARD_THIRD_NULL, (null, unused, unused -- null, unused, unused)) { - DEOPT_IF(!PyStackRef_IsNull(null)); + EXIT_IF(!PyStackRef_IsNull(null)); } op(_GUARD_CALLABLE_TYPE_1, (callable, unused, unused -- callable, unused, unused)) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(callable_o != (PyObject *)&PyType_Type); + EXIT_IF(callable_o != (PyObject *)&PyType_Type); } op(_CALL_TYPE_1, (callable, null, arg -- res, a)) { @@ -4187,7 +4192,7 @@ dummy_func( op(_GUARD_CALLABLE_STR_1, (callable, unused, unused -- callable, unused, unused)) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(callable_o != (PyObject *)&PyUnicode_Type); + EXIT_IF(callable_o != (PyObject *)&PyUnicode_Type); } op(_CALL_STR_1, (callable, null, arg -- res, a)) { @@ -4215,7 +4220,7 @@ dummy_func( op(_GUARD_CALLABLE_TUPLE_1, (callable, unused, unused -- callable, unused, unused)) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(callable_o != (PyObject *)&PyTuple_Type); + EXIT_IF(callable_o != (PyObject *)&PyTuple_Type); } op(_CALL_TUPLE_1, (callable, null, arg -- res, a)) { @@ -4243,17 +4248,17 @@ dummy_func( op(_CHECK_AND_ALLOCATE_OBJECT, (type_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(!PyStackRef_IsNull(self_or_null)); - DEOPT_IF(!PyType_Check(callable_o)); + EXIT_IF(!PyStackRef_IsNull(self_or_null)); + EXIT_IF(!PyType_Check(callable_o)); PyTypeObject *tp = (PyTypeObject *)callable_o; - DEOPT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(tp->tp_version_tag) != type_version); + EXIT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(tp->tp_version_tag) != type_version); assert(tp->tp_new == PyBaseObject_Type.tp_new); assert(tp->tp_flags & Py_TPFLAGS_HEAPTYPE); assert(tp->tp_alloc == PyType_GenericAlloc); PyHeapTypeObject *cls = (PyHeapTypeObject *)callable_o; PyFunctionObject *init_func = (PyFunctionObject *)FT_ATOMIC_LOAD_PTR_ACQUIRE(cls->_spec_cache.init); PyCodeObject *code = (PyCodeObject *)init_func->func_code; - DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize + _Py_InitCleanup.co_framesize)); + EXIT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize + _Py_InitCleanup.co_framesize)); STAT_INC(CALL, hit); PyObject *self_o = PyType_GenericAlloc(tp, 0); if (self_o == NULL) { @@ -4310,7 +4315,7 @@ dummy_func( op(_CALL_BUILTIN_CLASS, (callable, self_or_null, args[oparg] -- res)) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(!PyType_Check(callable_o)); + EXIT_IF(!PyType_Check(callable_o)); PyTypeObject *tp = (PyTypeObject *)callable_o; int total_args = oparg; _PyStackRef *arguments = args; @@ -4318,7 +4323,7 @@ dummy_func( arguments--; total_args++; } - DEOPT_IF(tp->tp_vectorcall == NULL); + EXIT_IF(tp->tp_vectorcall == NULL); STAT_INC(CALL, hit); PyObject *res_o = _Py_CallBuiltinClass_StackRefSteal( callable, @@ -4385,8 +4390,8 @@ dummy_func( total_args++; } PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(!PyCFunction_CheckExact(callable_o)); - DEOPT_IF(PyCFunction_GET_FLAGS(callable_o) != METH_FASTCALL); + EXIT_IF(!PyCFunction_CheckExact(callable_o)); + EXIT_IF(PyCFunction_GET_FLAGS(callable_o) != METH_FASTCALL); STAT_INC(CALL, hit); PyObject *res_o = _Py_BuiltinCallFast_StackRefSteal( callable, @@ -4416,8 +4421,8 @@ dummy_func( total_args++; } PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); - DEOPT_IF(!PyCFunction_CheckExact(callable_o)); - DEOPT_IF(PyCFunction_GET_FLAGS(callable_o) != (METH_FASTCALL | METH_KEYWORDS)); + EXIT_IF(!PyCFunction_CheckExact(callable_o)); + EXIT_IF(PyCFunction_GET_FLAGS(callable_o) != (METH_FASTCALL | METH_KEYWORDS)); STAT_INC(CALL, hit); PyObject *res_o = _Py_BuiltinCallFastWithKeywords_StackRefSteal(callable, arguments, total_args); DEAD(args); @@ -4446,7 +4451,7 @@ dummy_func( op(_GUARD_CALLABLE_LEN, (callable, unused, unused -- callable, unused, unused)){ PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); PyInterpreterState *interp = tstate->interp; - DEOPT_IF(callable_o != interp->callable_cache.len); + EXIT_IF(callable_o != interp->callable_cache.len); } op(_CALL_LEN, (callable, null, arg -- res, a, c)) { @@ -4471,7 +4476,7 @@ dummy_func( op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused, unused -- callable, unused, unused, unused)) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); PyInterpreterState *interp = tstate->interp; - DEOPT_IF(callable_o != interp->callable_cache.isinstance); + EXIT_IF(callable_o != interp->callable_cache.isinstance); } op(_CALL_ISINSTANCE, (callable, null, instance, cls -- res)) { @@ -4512,7 +4517,7 @@ dummy_func( op(_GUARD_CALLABLE_LIST_APPEND, (callable, unused, unused -- callable, unused, unused)){ PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); PyInterpreterState *interp = tstate->interp; - DEOPT_IF(callable_o != interp->callable_cache.list_append); + EXIT_IF(callable_o != interp->callable_cache.list_append); } op(_CALL_LIST_APPEND, (callable, self, arg -- none, c, s)) { diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 6271778bed4419..032d6faeda6a96 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5358,14 +5358,10 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = sub_st; - _tos_cache0 = list_st; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); + if (index < 0) { + index += PyList_GET_SIZE(list); } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; #ifdef Py_GIL_DISABLED stack_pointer[0] = list_st; stack_pointer[1] = sub_st; @@ -5383,17 +5379,15 @@ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); JUMP_TO_JUMP_TARGET(); } - STAT_INC(BINARY_OP, hit); res = PyStackRef_FromPyObjectSteal(res_o); #else - if (index >= PyList_GET_SIZE(list)) { + if (index < 0 || index >= PyList_GET_SIZE(list)) { UOP_STAT_INC(uopcode, miss); _tos_cache1 = sub_st; _tos_cache0 = list_st; SET_CURRENT_CACHED_VALUES(2); JUMP_TO_JUMP_TARGET(); } - STAT_INC(BINARY_OP, hit); PyObject *res_o = PyList_GET_ITEM(list, index); assert(res_o != NULL); res = PyStackRef_FromPyObjectNew(res_o); @@ -6705,15 +6699,7 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache2 = sub_st; - _tos_cache1 = list_st; - _tos_cache0 = value; - SET_CURRENT_CACHED_VALUES(3); - JUMP_TO_JUMP_TARGET(); - } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); if (!LOCK_OBJECT(list)) { UOP_STAT_INC(uopcode, miss); _tos_cache2 = sub_st; @@ -6722,7 +6708,11 @@ SET_CURRENT_CACHED_VALUES(3); JUMP_TO_JUMP_TARGET(); } - if (index >= PyList_GET_SIZE(list)) { + Py_ssize_t len = PyList_GET_SIZE(list); + if (index < 0) { + index += len; + } + if (index < 0 || index >= len) { UNLOCK_OBJECT(list); if (true) { UOP_STAT_INC(uopcode, miss); @@ -9189,7 +9179,7 @@ break; } - case _GUARD_TYPE_VERSION_AND_LOCK_r01: { + case _GUARD_TYPE_VERSION_LOCKED_r01: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef owner; @@ -9197,11 +9187,6 @@ uint32_t type_version = (uint32_t)CURRENT_OPERAND0_32(); PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { - UOP_STAT_INC(uopcode, miss); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_JUMP_TARGET(); - } PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -9219,7 +9204,7 @@ break; } - case _GUARD_TYPE_VERSION_AND_LOCK_r11: { + case _GUARD_TYPE_VERSION_LOCKED_r11: { CHECK_CURRENT_CACHED_VALUES(1); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef owner; @@ -9228,12 +9213,6 @@ uint32_t type_version = (uint32_t)CURRENT_OPERAND0_32(); PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache0 = owner; - SET_CURRENT_CACHED_VALUES(1); - JUMP_TO_JUMP_TARGET(); - } PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -9250,7 +9229,7 @@ break; } - case _GUARD_TYPE_VERSION_AND_LOCK_r22: { + case _GUARD_TYPE_VERSION_LOCKED_r22: { CHECK_CURRENT_CACHED_VALUES(2); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef owner; @@ -9260,13 +9239,6 @@ uint32_t type_version = (uint32_t)CURRENT_OPERAND0_32(); PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = owner; - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); - } PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -9285,7 +9257,7 @@ break; } - case _GUARD_TYPE_VERSION_AND_LOCK_r33: { + case _GUARD_TYPE_VERSION_LOCKED_r33: { CHECK_CURRENT_CACHED_VALUES(3); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef owner; @@ -9296,14 +9268,6 @@ uint32_t type_version = (uint32_t)CURRENT_OPERAND0_32(); PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache2 = owner; - _tos_cache1 = _stack_item_1; - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(3); - JUMP_TO_JUMP_TARGET(); - } PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -10153,6 +10117,87 @@ break; } + case _LOCK_OBJECT_r01: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef value; + value = stack_pointer[-1]; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _LOCK_OBJECT_r11: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + value = _stack_item_0; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _LOCK_OBJECT_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + value = _stack_item_1; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = value; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = value; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _LOCK_OBJECT_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + value = _stack_item_2; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = value; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = value; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + case _STORE_ATTR_WITH_HINT_r21: { CHECK_CURRENT_CACHED_VALUES(2); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 5d853998bf68b5..de036fb964b691 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -825,12 +825,10 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UPDATE_MISS_STATS(BINARY_OP); - assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); - JUMP_TO_PREDICTED(BINARY_OP); + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); + if (index < 0) { + index += PyList_GET_SIZE(list); } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; #ifdef Py_GIL_DISABLED _PyFrame_SetStackPointer(frame, stack_pointer); PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index); @@ -840,15 +838,13 @@ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - STAT_INC(BINARY_OP, hit); res = PyStackRef_FromPyObjectSteal(res_o); #else - if (index >= PyList_GET_SIZE(list)) { + if (index < 0 || index >= PyList_GET_SIZE(list)) { UPDATE_MISS_STATS(BINARY_OP); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - STAT_INC(BINARY_OP, hit); PyObject *res_o = PyList_GET_ITEM(list, index); assert(res_o != NULL); res = PyStackRef_FromPyObjectNew(res_o); @@ -10976,21 +10972,25 @@ next_instr += 5; INSTRUCTION_STATS(STORE_ATTR_INSTANCE_VALUE); static_assert(INLINE_CACHE_ENTRIES_STORE_ATTR == 4, "incorrect cache size"); - _PyStackRef owner; _PyStackRef value; + _PyStackRef owner; _PyStackRef o; /* Skip 1 cache entry */ - // _GUARD_TYPE_VERSION_AND_LOCK + // _LOCK_OBJECT { - owner = stack_pointer[-1]; - uint32_t type_version = read_u32(&this_instr[2].cache); - PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); - assert(type_version != 0); - if (!LOCK_OBJECT(owner_o)) { + value = stack_pointer[-1]; + if (!LOCK_OBJECT(PyStackRef_AsPyObjectBorrow(value))) { UPDATE_MISS_STATS(STORE_ATTR); assert(_PyOpcode_Deopt[opcode] == (STORE_ATTR)); JUMP_TO_PREDICTED(STORE_ATTR); } + } + // _GUARD_TYPE_VERSION_LOCKED + { + owner = value; + uint32_t type_version = read_u32(&this_instr[2].cache); + PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner); + assert(type_version != 0); PyTypeObject *tp = Py_TYPE(owner_o); if (FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version) { UNLOCK_OBJECT(owner_o); @@ -11614,18 +11614,17 @@ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); assert(PyLong_CheckExact(sub)); assert(PyList_CheckExact(list)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UPDATE_MISS_STATS(STORE_SUBSCR); - assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); - JUMP_TO_PREDICTED(STORE_SUBSCR); - } - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub); if (!LOCK_OBJECT(list)) { UPDATE_MISS_STATS(STORE_SUBSCR); assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); JUMP_TO_PREDICTED(STORE_SUBSCR); } - if (index >= PyList_GET_SIZE(list)) { + Py_ssize_t len = PyList_GET_SIZE(list); + if (index < 0) { + index += len; + } + if (index < 0 || index >= len) { UNLOCK_OBJECT(list); if (true) { UPDATE_MISS_STATS(STORE_SUBSCR); diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index f996c1f6cc70a7..fe083411b7b739 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1929,7 +1929,7 @@ break; } - case _GUARD_TYPE_VERSION_AND_LOCK: { + case _GUARD_TYPE_VERSION_LOCKED: { break; } @@ -2099,6 +2099,10 @@ break; } + case _LOCK_OBJECT: { + break; + } + case _STORE_ATTR_WITH_HINT: { JitOptRef owner; JitOptRef value;