Address code review

python · corona10 · Dec 2, 2024 · Nov 23, 2024 · Nov 27, 2024 · Nov 27, 2024
commit 0637d486d22d4d33ad0ed130b7c9daaea4de061e
diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
@@ -10,6 +10,7 @@ extern "C" {
 
 PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject *, PyObject *);
 extern void _PyList_DebugMallocStats(FILE *out);
+extern PyObject* _PyList_GetItemRef(PyObject *, Py_ssize_t i);
 
 #define _PyList_ITEMS(op) _Py_RVALUE(_PyList_CAST(op)->ob_item)
 

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -391,6 +391,12 @@ PyList_GetItemRef(PyObject *op, Py_ssize_t i)
     return item;
 }
 
+PyObject *
+_PyList_GetItemRef(PyObject *op, Py_ssize_t i)
+{
+    return list_get_item_ref((PyListObject *)op, i);
+}
+
 int
 PyList_SetItem(PyObject *op, Py_ssize_t i,
                PyObject *newitem)

@@ -790,16 +790,17 @@ dummy_func(
             // Deopt unless 0 <= sub < PyList_Size(list)
             DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub));
             Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
-            DEOPT_IF(!LOCK_OBJECT(list));
-            if (index >= PyList_GET_SIZE(list)) {
-                UNLOCK_OBJECT(list);
-                DEOPT_IF(true);
-            }
+#ifdef Py_GIL_DISABLED
+            STAT_INC(BINARY_SUBSCR, hit);
+            PyObject *res_o = _PyList_GetItemRef(list, index);
 #else 
 static inline PyObject* 
 list_get_item_ref(PyListObject *op, Py_ssize_t i) 
 { 
     if (!valid_index(i, Py_SIZE(op))) { 
         return NULL; 
     } 
     return Py_NewRef(PyList_GET_ITEM(op, i)); 
 } 
 #endif 
 #else 
 static inline PyObject* 
 list_get_item_ref(PyListObject *op, Py_ssize_t i) 
 { 
     if (!valid_index(i, Py_SIZE(op))) { 
         return NULL; 
     } 
     return Py_NewRef(PyList_GET_ITEM(op, i)); 
 } 
 #endif 
+            DEOPT_IF(res_o == NULL);
+#else
+            DEOPT_IF(index >= PyList_GET_SIZE(list));
             STAT_INC(BINARY_SUBSCR, hit);
             PyObject *res_o = PyList_GET_ITEM(list, index);
             assert(res_o != NULL);
             Py_INCREF(res_o);
-            UNLOCK_OBJECT(list);
+#endif
             PyStackRef_CLOSE_SPECIALIZED(sub_st, (destructor)PyObject_Free);
             DEAD(sub_st);
             PyStackRef_CLOSE(list_st);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h