Make PySlice_Start etc take PySliceObject instead of PyObject

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/sliceobject.h

@@ -58,9 +58,9 @@ PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
     ((*(slicelen) = 0), -1) :                                               \
     ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
      0))
-PyAPI_FUNC(PyObject*) PySlice_Start(PyObject *slice);
-PyAPI_FUNC(PyObject*) PySlice_Stop(PyObject *slice);
-PyAPI_FUNC(PyObject*) PySlice_Step(PyObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Start(PySliceObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Stop(PySliceObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Step(PySliceObject *slice);
 PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice,
                                Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
 PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,

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

@@ -117,14 +117,14 @@ Py_ssize_t PySlice_AdjustIndices(Py_ssize_t length, Py_ssize_t *start, Py_ssize_
     return 0;
 }
 
-PyObject* PySlice_Start(PyObject *slice) {
+PyObject* PySlice_Start(PySliceObject *slice) {
     return PySliceObject_start(slice);
 }
 
-PyObject* PySlice_Stop(PyObject *slice) {
+PyObject* PySlice_Stop(PySliceObject *slice) {
     return PySliceObject_stop(slice);
 }
 
-PyObject* PySlice_Step(PyObject *slice) {
+PyObject* PySlice_Step(PySliceObject *slice) {
     return PySliceObject_step(slice);
 }

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -3670,18 +3670,18 @@ PyAPI_FUNC(PyObject*) PySlice_New(PyObject* a, PyObject* b, PyObject* c) {
     PyObject* result = (PyObject*) GraalPySlice_New(a, b, c);
     return result;
 }
-PyObject* (*__target__PySlice_Start)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Start(PyObject* a) {
+PyObject* (*__target__PySlice_Start)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Start(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Start(a);
     return result;
 }
-PyObject* (*__target__PySlice_Step)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Step(PyObject* a) {
+PyObject* (*__target__PySlice_Step)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Step(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Step(a);
     return result;
 }
-PyObject* (*__target__PySlice_Stop)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Stop(PyObject* a) {
+PyObject* (*__target__PySlice_Stop)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Stop(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Stop(a);
     return result;
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -103,6 +103,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_OPENCODEHOOKFUNCTION;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_OS_SIGHANDLER;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_SSIZE_T_PTR;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_STAT_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_STRUCT_SEQUENCE_DESC;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_THREAD_TYPE_LOCK;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_THREAD_TYPE_LOCK_PTR;
@@ -142,7 +143,6 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.SIZE_T;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.SIZE_T_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.STAT_PTR;
-import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_STAT_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIMESPEC_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIMEVAL_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIME_T;
@@ -613,9 +613,9 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyOS_vsnprintf", ret = Int, args = {CHAR_PTR, SIZE_T, ConstCharPtrAsTruffleString, VA_LIST}, call = PolyglotImpl)
     @CApiBuiltin(name = "PySequence_Fast", ret = PyObject, args = {PyObject, ConstCharPtrAsTruffleString}, call = PolyglotImpl)
     @CApiBuiltin(name = "PySlice_AdjustIndices", ret = Py_ssize_t, args = {Py_ssize_t, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR, Py_ssize_t}, call = PolyglotImpl)
-    @CApiBuiltin(name = "PySlice_Start", ret = PyObject, args = {PyObject}, call = PolyglotImpl)
-    @CApiBuiltin(name = "PySlice_Step", ret = PyObject, args = {PyObject}, call = PolyglotImpl)
-    @CApiBuiltin(name = "PySlice_Stop", ret = PyObject, args = {PyObject}, call = PolyglotImpl)
+    @CApiBuiltin(name = "PySlice_Start", ret = PyObject, args = {PySliceObject}, call = PolyglotImpl)
+    @CApiBuiltin(name = "PySlice_Step", ret = PyObject, args = {PySliceObject}, call = PolyglotImpl)
+    @CApiBuiltin(name = "PySlice_Stop", ret = PyObject, args = {PySliceObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PySlice_Unpack", ret = Int, args = {PyObject, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyState_AddModule", ret = Int, args = {PyObject, PYMODULEDEF_PTR}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyState_FindModule", ret = PyObjectBorrowed, args = {PYMODULEDEF_PTR}, call = PolyglotImpl)

graalpython/lib-graalpython/patches/torch/torch-1.13.1.patch

@@ -536,7 +536,7 @@ index 8c9ed1d7..5183a325 100644
  static inline void recordSliceTrace(PyObject* obj) {
 -  PySliceObject* sliceobj = (PySliceObject*)obj;
 -  if (THPVariable_Check(sliceobj->start)) {
-+  PyObject* slicestart = PySlice_Start(obj);
++  PyObject* slicestart = PySlice_Start(sliceobj);
 +  if (THPVariable_Check(slicestart)) {
      torch::jit::tracer::ArgumentStash::stashValue(
          std::string("start"),
@@ -546,7 +546,7 @@ index 8c9ed1d7..5183a325 100644
          torch::jit::IntType::get());
    }
 -  if (THPVariable_Check(sliceobj->stop)) {
-+  PyObject* slicestop = PySlice_Stop(obj);
++  PyObject* slicestop = PySlice_Stop(sliceobj);
 +  if (THPVariable_Check(slicestop)) {
      torch::jit::tracer::ArgumentStash::stashValue(
          std::string("end"),
@@ -556,7 +556,7 @@ index 8c9ed1d7..5183a325 100644
          torch::jit::IntType::get());
    }
 -  if (THPVariable_Check(sliceobj->step)) {
-+  PyObject* slicestep = PySlice_Step(obj);
++  PyObject* slicestep = PySlice_Step(sliceobj);
 +  if (THPVariable_Check(slicestep)) {
      torch::jit::tracer::ArgumentStash::stashValue(
          std::string("step"),