From bdd86741bebd3efb51e540d5148e658cb34fd3ce Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Wed, 14 Dec 2022 17:39:00 -0700 Subject: [PATCH] GH-100222: fix typo _py_set_opocde -> _py_set_opcode (GH-100259) Typo introduced in #100223. Automerge-Triggered-By: GH:brandtbucher --- Include/cpython/code.h | 2 +- Python/specialize.c | 130 ++++++++++++++++++++--------------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Include/cpython/code.h b/Include/cpython/code.h index 6a13ff2dfd9..1c619322926 100644 --- a/Include/cpython/code.h +++ b/Include/cpython/code.h @@ -28,7 +28,7 @@ typedef union { #define _Py_OPARG(word) ((word).oparg) static inline void -_py_set_opocde(_Py_CODEUNIT *word, uint8_t opcode) +_py_set_opcode(_Py_CODEUNIT *word, uint8_t opcode) { word->opcode = opcode; } diff --git a/Python/specialize.c b/Python/specialize.c index 4fa2c2ffc04..e88fdde79a6 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -488,7 +488,7 @@ specialize_module_load_attr( } write_u32(cache->version, keys_version); cache->index = (uint16_t)index; - _py_set_opocde(instr, LOAD_ATTR_MODULE); + _py_set_opcode(instr, LOAD_ATTR_MODULE); return 0; } @@ -643,7 +643,7 @@ specialize_dict_access( } write_u32(cache->version, type->tp_version_tag); cache->index = (uint16_t)index; - _py_set_opocde(instr, values_op); + _py_set_opcode(instr, values_op); } else { PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv); @@ -663,7 +663,7 @@ specialize_dict_access( } cache->index = (uint16_t)index; write_u32(cache->version, type->tp_version_tag); - _py_set_opocde(instr, hint_op); + _py_set_opcode(instr, hint_op); } return 1; } @@ -743,7 +743,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) write_u32(lm_cache->type_version, type->tp_version_tag); /* borrowed */ write_obj(lm_cache->descr, fget); - _py_set_opocde(instr, LOAD_ATTR_PROPERTY); + _py_set_opcode(instr, LOAD_ATTR_PROPERTY); goto success; } case OBJECT_SLOT: @@ -767,7 +767,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) assert(offset > 0); cache->index = (uint16_t)offset; write_u32(cache->version, type->tp_version_tag); - _py_set_opocde(instr, LOAD_ATTR_SLOT); + _py_set_opcode(instr, LOAD_ATTR_SLOT); goto success; } case DUNDER_CLASS: @@ -776,7 +776,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) assert(offset == (uint16_t)offset); cache->index = (uint16_t)offset; write_u32(cache->version, type->tp_version_tag); - _py_set_opocde(instr, LOAD_ATTR_SLOT); + _py_set_opcode(instr, LOAD_ATTR_SLOT); goto success; } case OTHER_SLOT: @@ -804,7 +804,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) /* borrowed */ write_obj(lm_cache->descr, descr); write_u32(lm_cache->type_version, type->tp_version_tag); - _py_set_opocde(instr, LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN); + _py_set_opcode(instr, LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN); goto success; } case BUILTIN_CLASSMETHOD: @@ -822,7 +822,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) fail: STAT_INC(LOAD_ATTR, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, LOAD_ATTR); + _py_set_opcode(instr, LOAD_ATTR); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -881,7 +881,7 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) assert(offset > 0); cache->index = (uint16_t)offset; write_u32(cache->version, type->tp_version_tag); - _py_set_opocde(instr, STORE_ATTR_SLOT); + _py_set_opcode(instr, STORE_ATTR_SLOT); goto success; } case DUNDER_CLASS: @@ -910,7 +910,7 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name) fail: STAT_INC(STORE_ATTR, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, STORE_ATTR); + _py_set_opcode(instr, STORE_ATTR); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -974,7 +974,7 @@ specialize_class_load_attr(PyObject *owner, _Py_CODEUNIT *instr, case NON_DESCRIPTOR: write_u32(cache->type_version, ((PyTypeObject *)owner)->tp_version_tag); write_obj(cache->descr, descr); - _py_set_opocde(instr, LOAD_ATTR_CLASS); + _py_set_opcode(instr, LOAD_ATTR_CLASS); return 0; #ifdef Py_STATS case ABSENT: @@ -1056,21 +1056,21 @@ PyObject *descr, DescriptorClassification kind) } switch(dictkind) { case NO_DICT: - _py_set_opocde(instr, LOAD_ATTR_METHOD_NO_DICT); + _py_set_opcode(instr, LOAD_ATTR_METHOD_NO_DICT); break; case MANAGED_VALUES: - _py_set_opocde(instr, LOAD_ATTR_METHOD_WITH_VALUES); + _py_set_opcode(instr, LOAD_ATTR_METHOD_WITH_VALUES); break; case MANAGED_DICT: SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_HAS_MANAGED_DICT); goto fail; case OFFSET_DICT: assert(owner_cls->tp_dictoffset > 0 && owner_cls->tp_dictoffset <= INT16_MAX); - _py_set_opocde(instr, LOAD_ATTR_METHOD_WITH_DICT); + _py_set_opcode(instr, LOAD_ATTR_METHOD_WITH_DICT); break; case LAZY_DICT: assert(owner_cls->tp_dictoffset > 0 && owner_cls->tp_dictoffset <= INT16_MAX); - _py_set_opocde(instr, LOAD_ATTR_METHOD_LAZY_DICT); + _py_set_opcode(instr, LOAD_ATTR_METHOD_LAZY_DICT); break; } /* `descr` is borrowed. This is safe for methods (even inherited ones from @@ -1129,7 +1129,7 @@ _Py_Specialize_LoadGlobal( } cache->index = (uint16_t)index; write_u32(cache->module_keys_version, keys_version); - _py_set_opocde(instr, LOAD_GLOBAL_MODULE); + _py_set_opcode(instr, LOAD_GLOBAL_MODULE); goto success; } if (!PyDict_CheckExact(builtins)) { @@ -1167,12 +1167,12 @@ _Py_Specialize_LoadGlobal( cache->index = (uint16_t)index; write_u32(cache->module_keys_version, globals_version); cache->builtin_keys_version = (uint16_t)builtins_version; - _py_set_opocde(instr, LOAD_GLOBAL_BUILTIN); + _py_set_opcode(instr, LOAD_GLOBAL_BUILTIN); goto success; fail: STAT_INC(LOAD_GLOBAL, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, LOAD_GLOBAL); + _py_set_opcode(instr, LOAD_GLOBAL); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -1276,7 +1276,7 @@ _Py_Specialize_BinarySubscr( PyTypeObject *container_type = Py_TYPE(container); if (container_type == &PyList_Type) { if (PyLong_CheckExact(sub)) { - _py_set_opocde(instr, BINARY_SUBSCR_LIST_INT); + _py_set_opcode(instr, BINARY_SUBSCR_LIST_INT); goto success; } SPECIALIZATION_FAIL(BINARY_SUBSCR, @@ -1285,7 +1285,7 @@ _Py_Specialize_BinarySubscr( } if (container_type == &PyTuple_Type) { if (PyLong_CheckExact(sub)) { - _py_set_opocde(instr, BINARY_SUBSCR_TUPLE_INT); + _py_set_opcode(instr, BINARY_SUBSCR_TUPLE_INT); goto success; } SPECIALIZATION_FAIL(BINARY_SUBSCR, @@ -1293,7 +1293,7 @@ _Py_Specialize_BinarySubscr( goto fail; } if (container_type == &PyDict_Type) { - _py_set_opocde(instr, BINARY_SUBSCR_DICT); + _py_set_opcode(instr, BINARY_SUBSCR_DICT); goto success; } PyTypeObject *cls = Py_TYPE(container); @@ -1324,7 +1324,7 @@ _Py_Specialize_BinarySubscr( } cache->func_version = version; ((PyHeapTypeObject *)container_type)->_spec_cache.getitem = descriptor; - _py_set_opocde(instr, BINARY_SUBSCR_GETITEM); + _py_set_opcode(instr, BINARY_SUBSCR_GETITEM); goto success; } SPECIALIZATION_FAIL(BINARY_SUBSCR, @@ -1332,7 +1332,7 @@ _Py_Specialize_BinarySubscr( fail: STAT_INC(BINARY_SUBSCR, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, BINARY_SUBSCR); + _py_set_opcode(instr, BINARY_SUBSCR); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -1351,7 +1351,7 @@ _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *ins if ((Py_SIZE(sub) == 0 || Py_SIZE(sub) == 1) && ((PyLongObject *)sub)->ob_digit[0] < (size_t)PyList_GET_SIZE(container)) { - _py_set_opocde(instr, STORE_SUBSCR_LIST_INT); + _py_set_opcode(instr, STORE_SUBSCR_LIST_INT); goto success; } else { @@ -1369,7 +1369,7 @@ _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *ins } } if (container_type == &PyDict_Type) { - _py_set_opocde(instr, STORE_SUBSCR_DICT); + _py_set_opcode(instr, STORE_SUBSCR_DICT); goto success; } #ifdef Py_STATS @@ -1436,7 +1436,7 @@ _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *ins fail: STAT_INC(STORE_SUBSCR, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, STORE_SUBSCR); + _py_set_opcode(instr, STORE_SUBSCR); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -1458,20 +1458,20 @@ specialize_class_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs, int oparg = _Py_OPARG(*instr); if (nargs == 1 && kwnames == NULL && oparg == 1) { if (tp == &PyUnicode_Type) { - _py_set_opocde(instr, CALL_NO_KW_STR_1); + _py_set_opcode(instr, CALL_NO_KW_STR_1); return 0; } else if (tp == &PyType_Type) { - _py_set_opocde(instr, CALL_NO_KW_TYPE_1); + _py_set_opcode(instr, CALL_NO_KW_TYPE_1); return 0; } else if (tp == &PyTuple_Type) { - _py_set_opocde(instr, CALL_NO_KW_TUPLE_1); + _py_set_opcode(instr, CALL_NO_KW_TUPLE_1); return 0; } } if (tp->tp_vectorcall != NULL) { - _py_set_opocde(instr, CALL_BUILTIN_CLASS); + _py_set_opcode(instr, CALL_BUILTIN_CLASS); return 0; } SPECIALIZATION_FAIL(CALL, tp == &PyUnicode_Type ? @@ -1523,7 +1523,7 @@ specialize_method_descriptor(PyMethodDescrObject *descr, _Py_CODEUNIT *instr, SPECIALIZATION_FAIL(CALL, SPEC_FAIL_WRONG_NUMBER_ARGUMENTS); return -1; } - _py_set_opocde(instr, CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS); + _py_set_opcode(instr, CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS); return 0; } case METH_O: { @@ -1537,18 +1537,18 @@ specialize_method_descriptor(PyMethodDescrObject *descr, _Py_CODEUNIT *instr, bool pop = (_Py_OPCODE(next) == POP_TOP); int oparg = _Py_OPARG(*instr); if ((PyObject *)descr == list_append && oparg == 1 && pop) { - _py_set_opocde(instr, CALL_NO_KW_LIST_APPEND); + _py_set_opcode(instr, CALL_NO_KW_LIST_APPEND); return 0; } - _py_set_opocde(instr, CALL_NO_KW_METHOD_DESCRIPTOR_O); + _py_set_opcode(instr, CALL_NO_KW_METHOD_DESCRIPTOR_O); return 0; } case METH_FASTCALL: { - _py_set_opocde(instr, CALL_NO_KW_METHOD_DESCRIPTOR_FAST); + _py_set_opcode(instr, CALL_NO_KW_METHOD_DESCRIPTOR_FAST); return 0; } case METH_FASTCALL|METH_KEYWORDS: { - _py_set_opocde(instr, CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS); + _py_set_opcode(instr, CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS); return 0; } } @@ -1599,14 +1599,14 @@ specialize_py_call(PyFunctionObject *func, _Py_CODEUNIT *instr, int nargs, write_u32(cache->func_version, version); cache->min_args = min_args; if (argcount == nargs) { - _py_set_opocde(instr, bound_method ? CALL_BOUND_METHOD_EXACT_ARGS : CALL_PY_EXACT_ARGS); + _py_set_opcode(instr, bound_method ? CALL_BOUND_METHOD_EXACT_ARGS : CALL_PY_EXACT_ARGS); } else if (bound_method) { SPECIALIZATION_FAIL(CALL, SPEC_FAIL_CALL_BOUND_METHOD); return -1; } else { - _py_set_opocde(instr, CALL_PY_WITH_DEFAULTS); + _py_set_opcode(instr, CALL_PY_WITH_DEFAULTS); } return 0; } @@ -1633,10 +1633,10 @@ specialize_c_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs, /* len(o) */ PyInterpreterState *interp = _PyInterpreterState_GET(); if (callable == interp->callable_cache.len) { - _py_set_opocde(instr, CALL_NO_KW_LEN); + _py_set_opcode(instr, CALL_NO_KW_LEN); return 0; } - _py_set_opocde(instr, CALL_NO_KW_BUILTIN_O); + _py_set_opcode(instr, CALL_NO_KW_BUILTIN_O); return 0; } case METH_FASTCALL: { @@ -1648,15 +1648,15 @@ specialize_c_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs, /* isinstance(o1, o2) */ PyInterpreterState *interp = _PyInterpreterState_GET(); if (callable == interp->callable_cache.isinstance) { - _py_set_opocde(instr, CALL_NO_KW_ISINSTANCE); + _py_set_opcode(instr, CALL_NO_KW_ISINSTANCE); return 0; } } - _py_set_opocde(instr, CALL_NO_KW_BUILTIN_FAST); + _py_set_opcode(instr, CALL_NO_KW_BUILTIN_FAST); return 0; } case METH_FASTCALL | METH_KEYWORDS: { - _py_set_opocde(instr, CALL_BUILTIN_FAST_WITH_KEYWORDS); + _py_set_opcode(instr, CALL_BUILTIN_FAST_WITH_KEYWORDS); return 0; } default: @@ -1749,7 +1749,7 @@ _Py_Specialize_Call(PyObject *callable, _Py_CODEUNIT *instr, int nargs, if (fail) { STAT_INC(CALL, failure); assert(!PyErr_Occurred()); - _py_set_opocde(instr, CALL); + _py_set_opcode(instr, CALL); cache->counter = adaptive_counter_backoff(cache->counter); } else { @@ -1846,18 +1846,18 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, bool to_store = (_Py_OPCODE(next) == STORE_FAST || _Py_OPCODE(next) == STORE_FAST__LOAD_FAST); if (to_store && locals[_Py_OPARG(next)] == lhs) { - _py_set_opocde(instr, BINARY_OP_INPLACE_ADD_UNICODE); + _py_set_opcode(instr, BINARY_OP_INPLACE_ADD_UNICODE); goto success; } - _py_set_opocde(instr, BINARY_OP_ADD_UNICODE); + _py_set_opcode(instr, BINARY_OP_ADD_UNICODE); goto success; } if (PyLong_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_ADD_INT); + _py_set_opcode(instr, BINARY_OP_ADD_INT); goto success; } if (PyFloat_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_ADD_FLOAT); + _py_set_opcode(instr, BINARY_OP_ADD_FLOAT); goto success; } break; @@ -1867,11 +1867,11 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, break; } if (PyLong_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_MULTIPLY_INT); + _py_set_opcode(instr, BINARY_OP_MULTIPLY_INT); goto success; } if (PyFloat_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_MULTIPLY_FLOAT); + _py_set_opcode(instr, BINARY_OP_MULTIPLY_FLOAT); goto success; } break; @@ -1881,18 +1881,18 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, break; } if (PyLong_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_SUBTRACT_INT); + _py_set_opcode(instr, BINARY_OP_SUBTRACT_INT); goto success; } if (PyFloat_CheckExact(lhs)) { - _py_set_opocde(instr, BINARY_OP_SUBTRACT_FLOAT); + _py_set_opcode(instr, BINARY_OP_SUBTRACT_FLOAT); goto success; } break; } SPECIALIZATION_FAIL(BINARY_OP, binary_op_fail_kind(oparg, lhs, rhs)); STAT_INC(BINARY_OP, failure); - _py_set_opocde(instr, BINARY_OP); + _py_set_opcode(instr, BINARY_OP); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -1974,13 +1974,13 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, goto failure; } if (PyFloat_CheckExact(lhs)) { - _py_set_opocde(instr, COMPARE_OP_FLOAT_JUMP); + _py_set_opcode(instr, COMPARE_OP_FLOAT_JUMP); cache->mask = when_to_jump_mask; goto success; } if (PyLong_CheckExact(lhs)) { if (Py_ABS(Py_SIZE(lhs)) <= 1 && Py_ABS(Py_SIZE(rhs)) <= 1) { - _py_set_opocde(instr, COMPARE_OP_INT_JUMP); + _py_set_opcode(instr, COMPARE_OP_INT_JUMP); cache->mask = when_to_jump_mask; goto success; } @@ -1995,7 +1995,7 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, goto failure; } else { - _py_set_opocde(instr, COMPARE_OP_STR_JUMP); + _py_set_opcode(instr, COMPARE_OP_STR_JUMP); cache->mask = (when_to_jump_mask & 2) == 0; goto success; } @@ -2003,7 +2003,7 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, SPECIALIZATION_FAIL(COMPARE_OP, compare_op_fail_kind(lhs, rhs)); failure: STAT_INC(COMPARE_OP, failure); - _py_set_opocde(instr, COMPARE_OP); + _py_set_opcode(instr, COMPARE_OP); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -2037,10 +2037,10 @@ _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr, int oparg) goto failure; } if (PyTuple_GET_SIZE(seq) == 2) { - _py_set_opocde(instr, UNPACK_SEQUENCE_TWO_TUPLE); + _py_set_opcode(instr, UNPACK_SEQUENCE_TWO_TUPLE); goto success; } - _py_set_opocde(instr, UNPACK_SEQUENCE_TUPLE); + _py_set_opcode(instr, UNPACK_SEQUENCE_TUPLE); goto success; } if (PyList_CheckExact(seq)) { @@ -2048,13 +2048,13 @@ _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr, int oparg) SPECIALIZATION_FAIL(UNPACK_SEQUENCE, SPEC_FAIL_EXPECTED_ERROR); goto failure; } - _py_set_opocde(instr, UNPACK_SEQUENCE_LIST); + _py_set_opcode(instr, UNPACK_SEQUENCE_LIST); goto success; } SPECIALIZATION_FAIL(UNPACK_SEQUENCE, unpack_sequence_fail_kind(seq)); failure: STAT_INC(UNPACK_SEQUENCE, failure); - _py_set_opocde(instr, UNPACK_SEQUENCE); + _py_set_opcode(instr, UNPACK_SEQUENCE); cache->counter = adaptive_counter_backoff(cache->counter); return; success: @@ -2143,26 +2143,26 @@ _Py_Specialize_ForIter(PyObject *iter, _Py_CODEUNIT *instr, int oparg) _Py_CODEUNIT next = instr[1+INLINE_CACHE_ENTRIES_FOR_ITER]; int next_op = _PyOpcode_Deopt[_Py_OPCODE(next)]; if (tp == &PyListIter_Type) { - _py_set_opocde(instr, FOR_ITER_LIST); + _py_set_opcode(instr, FOR_ITER_LIST); goto success; } else if (tp == &PyTupleIter_Type) { - _py_set_opocde(instr, FOR_ITER_TUPLE); + _py_set_opcode(instr, FOR_ITER_TUPLE); goto success; } else if (tp == &PyRangeIter_Type && next_op == STORE_FAST) { - _py_set_opocde(instr, FOR_ITER_RANGE); + _py_set_opcode(instr, FOR_ITER_RANGE); goto success; } else if (tp == &PyGen_Type && oparg <= SHRT_MAX) { assert(_Py_OPCODE(instr[oparg + INLINE_CACHE_ENTRIES_FOR_ITER + 1]) == END_FOR); - _py_set_opocde(instr, FOR_ITER_GEN); + _py_set_opcode(instr, FOR_ITER_GEN); goto success; } SPECIALIZATION_FAIL(FOR_ITER, _PySpecialization_ClassifyIterator(iter)); STAT_INC(FOR_ITER, failure); - _py_set_opocde(instr, FOR_ITER); + _py_set_opcode(instr, FOR_ITER); cache->counter = adaptive_counter_backoff(cache->counter); return; success: