remove LOAD_ATTR_MUTABLE_CLASS_DESCRIPTOR

python · Fidget-Spinner · Jun 17, 2022 · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022
commit 3d5d5fd4832cfdb9e7b6a350548be1eefdf1353f
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -285,7 +285,6 @@ def jabs_op(name, op):
         "LOAD_ATTR_ADAPTIVE",
         # These potentially push [NULL, bound method] onto the stack.
         "LOAD_ATTR_CLASS",
-        "LOAD_ATTR_CLASS_MUTABLE_DESCRIPTOR",
         "LOAD_ATTR_INSTANCE_VALUE",
         "LOAD_ATTR_MODULE",
         "LOAD_ATTR_PROPERTY",

@@ -3649,33 +3649,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             NOTRACE_DISPATCH();
         }
 
-        TARGET(LOAD_ATTR_CLASS_MUTABLE_DESCRIPTOR) {
-            assert(cframe.use_tracing == 0);
-            _PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
-
-            PyObject *cls = TOP();
-            DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
-            uint32_t type_version = read_u32(cache->type_version);
-            DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
-                LOAD_ATTR);
-            assert(type_version != 0);
-            PyObject *descr = read_obj(cache->descr);
-            descrgetfunc get = Py_TYPE(descr)->tp_descr_get;
-            DEOPT_IF(get == NULL, LOAD_ATTR);
-            STAT_INC(LOAD_ATTR, hit);
-            PyObject *res = get(descr, NULL, cls);
-            if (res == NULL) {
-                goto error;
-            }
-            assert(res != NULL);
-            SET_TOP(NULL);
-            STACK_GROW((oparg & 1));
-            SET_TOP(res);
-            Py_DECREF(cls);
-            JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
-            NOTRACE_DISPATCH();
-        }
-
         TARGET(LOAD_ATTR_PROPERTY) {
             assert(cframe.use_tracing == 0);
             _PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h