Use _PyIndex_Check in _PyEval_SliceIndex

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/internal/pycore_abstract.h

@@ -0,0 +1,30 @@
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2023 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+#ifndef Py_INTERNAL_ABSTRACT_H
+#define Py_INTERNAL_ABSTRACT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+// Fast inlined version of PyIndex_Check()
+static inline int
+_PyIndex_Check(PyObject *obj)
+{
+    PyNumberMethods *tp_as_number = Py_TYPE(obj)->tp_as_number;
+    return (tp_as_number != NULL && tp_as_number->nb_index != NULL);
+}
+
+PyObject *_PyNumber_PowerNoMod(PyObject *lhs, PyObject *rhs);
+PyObject *_PyNumber_InPlacePowerNoMod(PyObject *lhs, PyObject *rhs);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_ABSTRACT_H */

graalpython/com.oracle.graal.python.cext/src/ceval.c

@@ -40,6 +40,7 @@
  */
 #include "capi.h"
 
+#include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_ceval.h"         // _PyEval_SignalAsyncExc()
 #include "pycore_pyerrors.h"      // _PyErr_Fetch()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
@@ -170,8 +171,7 @@ _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi)
     PyThreadState *tstate = _PyThreadState_GET();
     if (!Py_IsNone(v)) {
         Py_ssize_t x;
-        // GraalPy change: don't use '_PyIndex_Check'
-        if (PyIndex_Check(v)) {
+        if (_PyIndex_Check(v)) {
             x = PyNumber_AsSsize_t(v, NULL);
             if (x == -1 && _PyErr_Occurred(tstate))
                 return 0;

mx.graalpython/copyrights/overrides

@@ -143,6 +143,7 @@ graalpython/com.oracle.graal.python.cext/include/floatobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/frameobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/genericaliasobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/import.h,python.copyright
+graalpython/com.oracle.graal.python.cext/include/internal/pycore_abstract.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/internal/pycore_atomic.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/internal/pycore_blocks_output_buffer.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/internal/pycore_call.h,python.copyright