8000 GH-100288: Remove LOAD_ATTR_METHOD_WITH_DICT instruction. (GH-100753) · python/cpython@f20c553 · GitHub
[go: up one dir, main page]
Skip to content

Commit f20c553

Browse files
markshannonmarkshannon
authored
GH-100288: Remove LOAD_ATTR_METHOD_WITH_DICT instruction. (GH-100753)
1 parent 105e373 commit f20c553

File tree

8 files changed

+40
-95
lines changed

8 files changed

+40
-95
lines changed

‎Include/internal/pycore_opcode.h

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/opcode.h

Lines changed: 16 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/opcode.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ def pseudo_op(name, op, real_ops):
336336
# These will always push [unbound method, self] onto the stack.
337337
"LOAD_ATTR_METHOD_LAZY_DICT",
338338
"LOAD_ATTR_METHOD_NO_DICT",
339-
"LOAD_ATTR_METHOD_WITH_DICT",
340339
"LOAD_ATTR_METHOD_WITH_VALUES",
341340
],
342341
"LOAD_CONST": [

‎Misc/NEWS.d/next/Core and Builtins/2023-01-04-16-40-55.gh-issue-100288.hRSRaT.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Remove the LOAD_ATTR_METHOD_WITH_DICT specialized instruction. Stats show it
2+
is not useful.

‎Python/bytecodes.c

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,33 +2605,6 @@ dummy_func(
26052605
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
26062606
}
26072607

2608-
// error: LOAD_ATTR has irregular stack effect
2609-
inst(LOAD_ATTR_METHOD_WITH_DICT) {
2610-
/* Can be either a managed dict, or a tp_dictoffset offset.*/
2611-
assert(cframe.use_tracing == 0);
2612-
PyObject *self = TOP();
2613-
PyTypeObject *self_cls = Py_TYPE(self);
2614-
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
2615-
2616-
DEOPT_IF(self_cls->tp_version_tag != read_u32(cache->type_version),
2617-
LOAD_ATTR);
2618-
/* Treat index as a signed 16 bit value */
2619-
Py_ssize_t dictoffset = self_cls->tp_dictoffset;
2620-
assert(dictoffset > 0);
2621-
PyDictObject **dictptr = (PyDictObject**)(((char *)self)+dictoffset);
2622-
PyDictObject *dict = *dictptr;
2623-
DEOPT_IF(dict == NULL, LOAD_ATTR);
2624-
DEOPT_IF(dict->ma_keys->dk_version != read_u32(cache->keys_version),
2625-
LOAD_ATTR);
2626-
STAT_INC(LOAD_ATTR, hit);
2627-
PyObject *res = read_obj(cache->descr);
2628-
assert(res != NULL);
2629-
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
2630-
SET_TOP(Py_NewRef(res));
2631-
PUSH(self);
2632-
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
2633-
}
2634-
26352608
// error: LOAD_ATTR has irregular stack effect
26362609
inst(LOAD_ATTR_METHOD_NO_DICT) {
26372610
assert(cframe.use_tracing == 0);
@@ -3517,7 +3490,7 @@ family(load_attr) = {
35173490
LOAD_ATTR, LOAD_ATTR_CLASS,
35183491
LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN, LOAD_ATTR_INSTANCE_VALUE, LOAD_ATTR_MODULE,
35193492
LOAD_ATTR_PROPERTY, LOAD_ATTR_SLOT, LOAD_ATTR_WITH_HINT,
3520-
LOAD_ATTR_METHOD_LAZY_DICT, LOAD_ATTR_METHOD_NO_DICT, LOAD_ATTR_METHOD_WITH_DICT,
3493+
LOAD_ATTR_METHOD_LAZY_DICT, LOAD_ATTR_METHOD_NO_DICT,
35213494
LOAD_ATTR_METHOD_WITH_VALUES };
35223495
family(load_global) = {
35233496
LOAD_GLOBAL, LOAD_GLOBAL_BUILTIN,

‎Python/generated_cases.c.h

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/opcode_targets.h

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/specialize.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,9 +1091,8 @@ PyObject *descr, DescriptorClassification kind)
10911091
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_HAS_MANAGED_DICT);
10921092
goto fail;
10931093
case OFFSET_DICT:
1094-
assert(owner_cls->tp_dictoffset > 0 && owner_cls->tp_dictoffset <= INT16_MAX);
1095-
_py_set_opcode(instr, LOAD_ATTR_METHOD_WITH_DICT);
1096-
break;
1094+
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_NOT_MANAGED_DICT);
1095+
goto fail;
10971096
case LAZY_DICT:
10981097
assert(owner_cls->tp_dictoffset > 0 && owner_cls->tp_dictoffset <= INT16_MAX);
10991098
_py_set_opcode(instr, LOAD_ATTR_METHOD_LAZY_DICT);

0 commit comments

Comments
 (0)
0