Revert "gh-153486: Specialize negative list int subscripts"

This reverts commit 7b711cc.

Author: KRRT7

Include/internal/pycore_opcode_metadata.h

@@ -1134,8 +1134,8 @@ dummy_func(
         macro(STORE_SLICE) = _SPECIALIZE_STORE_SLICE + _STORE_SLICE;
 
         macro(BINARY_OP_SUBSCR_LIST_INT) =
-            _GUARD_TOS_INT + _GUARD_NOS_LIST + unused/5 +
-            _BINARY_OP_SUBSCR_LIST_INT + _POP_TOP_INT + POP_TOP;
+            _GUARD_TOS_NON_NEGATIVE_COMPACT_INT + _GUARD_NOS_LIST +
+            unused/5 + _BINARY_OP_SUBSCR_LIST_INT + _POP_TOP_INT + POP_TOP;
 
         op(_BINARY_OP_SUBSCR_LIST_INT, (list_st, sub_st -- res, ls, ss)) {
             PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
@@ -1145,9 +1145,6 @@ dummy_func(
             assert(PyList_CheckExact(list));
 
             Py_ssize_t index = _PyLong_CompactValue((PyLongObject *)sub);
-            if (index < 0) {
-                index += PyList_GET_SIZE(list);
-            }
 #ifdef Py_GIL_DISABLED
             PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index);
             EXIT_IF(res_o == NULL);

Modules/_testinternalcapi/test_cases.c.h

@@ -2015,9 +2015,7 @@ binary_op_fail_kind(int oparg, PyObject *lhs, PyObject *rhs)
             return SPEC_FAIL_BINARY_OP_XOR;
         case NB_SUBSCR:
             if (PyList_CheckExact(lhs)) {
-                if (PyLong_CheckExact(rhs) &&
-                    !_PyLong_CheckExactAndCompact(rhs))
-                {
+                if (PyLong_CheckExact(rhs) && !_PyLong_IsNonNegativeCompact((PyLongObject *)rhs)) {
                     return SPEC_FAIL_OUT_OF_RANGE;
                 }
                 if (PySlice_Check(rhs)) {
@@ -2400,16 +2398,16 @@ _Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *in
             }
             break;
         case NB_SUBSCR:
-            if (_PyLong_CheckExactAndCompact(rhs) && PyList_CheckExact(lhs)) {
-                specialize(instr, BINARY_OP_SUBSCR_LIST_INT);
-                return;
-            }
             if (PyLong_CheckExact(rhs) && _PyLong_IsNonNegativeCompact((PyLongObject *)rhs)) {
+                if (PyList_CheckExact(lhs)) {
+                    specialize(instr, BINARY_OP_SUBSCR_LIST_INT);
+                    return;
+                }
                 if (PyTuple_CheckExact(lhs)) {
                     specialize(instr, BINARY_OP_SUBSCR_TUPLE_INT);
                     return;
                 }
-                if (PyUnicode_CheckExact(lhs)) {
+                if (PyUnicode_CheckExact(lhs) && _PyLong_IsNonNegativeCompact((PyLongObject*)rhs)) {
                     if (PyUnicode_IS_COMPACT_ASCII(lhs)) {
                         specialize(instr, BINARY_OP_SUBSCR_STR_INT);
                         return;