diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bytecodes.c | 16 | ||||
| -rw-r--r-- | Python/executor_cases.c.h | 4 | ||||
| -rw-r--r-- | Python/generated_cases.c.h | 8 |
3 files changed, 7 insertions, 21 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 2b871e8546e..7320c309884 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1348,9 +1348,6 @@ dummy_func( null = NULL; } - op(_SKIP_CACHE, (unused/1 -- )) { - } - op(_GUARD_GLOBALS_VERSION, (version/1 --)) { PyDictObject *dict = (PyDictObject *)GLOBALS(); DEOPT_IF(!PyDict_CheckExact(dict), LOAD_GLOBAL); @@ -1386,13 +1383,13 @@ dummy_func( } macro(LOAD_GLOBAL_MODULE) = - _SKIP_CACHE + // Skip over the counter + unused/1 + // Skip over the counter _GUARD_GLOBALS_VERSION + - _SKIP_CACHE + // Skip over the builtins version + unused/1 + // Skip over the builtins version _LOAD_GLOBAL_MODULE; macro(LOAD_GLOBAL_BUILTIN) = - _SKIP_CACHE + // Skip over the counter + unused/1 + // Skip over the counter _GUARD_GLOBALS_VERSION + _GUARD_BUILTINS_VERSION + _LOAD_GLOBAL_BUILTINS; @@ -1824,7 +1821,7 @@ dummy_func( DEOPT_IF(!_PyDictOrValues_IsValues(dorv), LOAD_ATTR); } - op(_LOAD_ATTR_INSTANCE_VALUE, (index/1, unused/5, owner -- res2 if (oparg & 1), res)) { + op(_LOAD_ATTR_INSTANCE_VALUE, (index/1, owner -- res2 if (oparg & 1), res)) { PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner); res = _PyDictOrValues_GetValues(dorv)->values[index]; DEOPT_IF(res == NULL, LOAD_ATTR); @@ -1835,10 +1832,11 @@ dummy_func( } macro(LOAD_ATTR_INSTANCE_VALUE) = - _SKIP_CACHE + // Skip over the counter + unused/1 + // Skip over the counter _GUARD_TYPE_VERSION + _CHECK_MANAGED_OBJECT_HAS_VALUES + - _LOAD_ATTR_INSTANCE_VALUE; + _LOAD_ATTR_INSTANCE_VALUE + + unused/5; // Skip over rest of cache inst(LOAD_ATTR_MODULE, (unused/1, type_version/2, index/1, unused/5, owner -- res2 if (oparg & 1), res)) { DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index f3e24bc0479..c2f0d0a77b1 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -1009,10 +1009,6 @@ break; } - case _SKIP_CACHE: { - break; - } - case _GUARD_GLOBALS_VERSION: { uint16_t version = (uint16_t)operand; PyDictObject *dict = (PyDictObject *)GLOBALS(); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 6ac622b11ac..dccd6da9123 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -1664,8 +1664,6 @@ PyObject *_tmp_1; PyObject *_tmp_2; { - } - { uint16_t version = read_u16(&next_instr[1].cache); PyDictObject *dict = (PyDictObject *)GLOBALS(); DEOPT_IF(!PyDict_CheckExact(dict), LOAD_GLOBAL); @@ -1673,8 +1671,6 @@ assert(DK_IS_UNICODE(dict->ma_keys)); } { - } - { PyObject *null = NULL; PyObject *res; uint16_t index = read_u16(&next_instr[3].cache); @@ -1700,8 +1696,6 @@ PyObject *_tmp_1; PyObject *_tmp_2; { - } - { uint16_t version = read_u16(&next_instr[1].cache); PyDictObject *dict = (PyDictObject *)GLOBALS(); DEOPT_IF(!PyDict_CheckExact(dict), LOAD_GLOBAL); @@ -2244,8 +2238,6 @@ PyObject *_tmp_1; PyObject *_tmp_2 = stack_pointer[-1]; { - } - { PyObject *owner = _tmp_2; uint32_t type_version = read_u32(&next_instr[1].cache); PyTypeObject *tp = Py_TYPE(owner); |