gh-110020: Fix unused variable warnings in bytecodes.c (GH-110023)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 0f89779fb9245f0394c9a783917325aac76f278f..f7681bd234a43f30f2a17ee03e4fdb8222807e86 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2023,8 +2023,7 @@ dummy_func(
         }
 
         op(_GUARD_DORV_VALUES, (owner -- owner)) {
-            PyTypeObject *tp = Py_TYPE(owner);
-            assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+            assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
             PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
             DEOPT_IF(!_PyDictOrValues_IsValues(dorv), STORE_ATTR);
         }
@@ -2789,8 +2788,7 @@ dummy_func(
         }
 
         op(_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT, (owner -- owner)) {
-            PyTypeObject *owner_cls = Py_TYPE(owner);
-            assert(owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+            assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
             PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
             DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
                      !_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
@@ -2823,8 +2821,7 @@ dummy_func(
 
         op(_LOAD_ATTR_METHOD_NO_DICT, (descr/4, owner -- attr, self if (1))) {
             assert(oparg & 1);
-            PyTypeObject *owner_cls = Py_TYPE(owner);
-            assert(owner_cls->tp_dictoffset == 0);
+            assert(Py_TYPE(owner)->tp_dictoffset == 0);
             STAT_INC(LOAD_ATTR, hit);
             assert(descr != NULL);
             assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 981db6973f281ab999f85f41486174d980176119..55a03c9a23a572afac2ba0ce024bb0664db69314 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1736,8 +1736,7 @@
         case _GUARD_DORV_VALUES: {
             PyObject *owner;
             owner = stack_pointer[-1];
-            PyTypeObject *tp = Py_TYPE(owner);
-            assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+            assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
             PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
             DEOPT_IF(!_PyDictOrValues_IsValues(dorv), STORE_ATTR);
             break;
@@ -2299,8 +2298,7 @@
         case _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT: {
             PyObject *owner;
             owner = stack_pointer[-1];
-            PyTypeObject *owner_cls = Py_TYPE(owner);
-            assert(owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+            assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
             PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
             DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
                      !_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
@@ -2345,8 +2343,7 @@
             owner = stack_pointer[-1];
             PyObject *descr = (PyObject *)operand;
             assert(oparg & 1);
-            PyTypeObject *owner_cls = Py_TYPE(owner);
-            assert(owner_cls->tp_dictoffset == 0);
+            assert(Py_TYPE(owner)->tp_dictoffset == 0);
             STAT_INC(LOAD_ATTR, hit);
             assert(descr != NULL);
             assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 17df44019a658146c28c992032419c6ce9663ccc..2701d416648a207bf07328d8338559972e4b3412 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2631,8 +2631,7 @@
             }
             // _GUARD_DORV_VALUES
             {
-                PyTypeObject *tp = Py_TYPE(owner);
-                assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+                assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
                 PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
                 DEOPT_IF(!_PyDictOrValues_IsValues(dorv), STORE_ATTR);
             }
@@ -3590,8 +3589,7 @@
             }
             // _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT
             {
-                PyTypeObject *owner_cls = Py_TYPE(owner);
-                assert(owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
+                assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
                 PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
                 DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
                          !_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
@@ -3639,8 +3637,7 @@
             {
                 PyObject *descr = read_obj(&next_instr[5].cache);
                 assert(oparg & 1);
-                PyTypeObject *owner_cls = Py_TYPE(owner);
-                assert(owner_cls->tp_dictoffset == 0);
+                assert(Py_TYPE(owner)->tp_dictoffset == 0);
                 STAT_INC(LOAD_ATTR, hit);
                 assert(descr != NULL);
                 assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));