Rename PyInterpreterState_GetIDFromThreadState

Author: msimacek

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -39,8 +39,10 @@ PyAPI_FUNC(PyObject *) PyInterpreterState_GetDict(PyInterpreterState *);
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
 /* New in 3.7 */
 PyAPI_FUNC(int64_t) PyInterpreterState_GetID(PyInterpreterState *);
-// GraalPy-specific
-PyAPI_FUNC(int64_t) PyInterpreterState_GetIDFromThreadState(PyThreadState *);
+// GraalPy public API
+PyAPI_FUNC(int64_t) GraalPyInterpreterState_GetIDFromThreadState(PyThreadState *);
+// Deprecated alias used by current Cython, remove in 27.0
+#define PyInterpreterState_GetIDFromThreadState GraalPyInterpreterState_GetIDFromThreadState
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 

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

@@ -3212,7 +3212,7 @@ _PyThreadState_MustExit(PyThreadState *tstate)
 
 // GraalPy specific
 
-int64_t PyInterpreterState_GetIDFromThreadState(PyThreadState *state) {
+int64_t GraalPyInterpreterState_GetIDFromThreadState(PyThreadState *state) {
 	return 0;
 }
 

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java

@@ -750,7 +750,6 @@ private static Path resolvePath(Path path) {
                      * removing
                      */
                     "PySlice_Start", "PySlice_Step", "PySlice_Stop",
-                    "PyInterpreterState_GetIDFromThreadState",
                     "PyObject_GetDoc", "PyObject_SetDoc", "_PyFrame_SetLineNumber",
                     "PyCode_GetName",
                     "PyCode_GetFileName", "_PyArray_Resize", "_PyArray_Data",

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

@@ -317,7 +317,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyInstanceMethod_Function", ret = PyObject, args = {PyObject}, call = CImpl)
     @CApiBuiltin(name = "PyInterpreterState_GetDict", ret = PyObject, args = {PyInterpreterState}, call = CImpl)
     @CApiBuiltin(name = "PyInterpreterState_GetID", ret = INT64_T, args = {PyInterpreterState}, call = CImpl)
-    @CApiBuiltin(name = "PyInterpreterState_GetIDFromThreadState", ret = INT64_T, args = {PyThreadState}, call = CImpl)
     @CApiBuiltin(name = "PyInterpreterState_Main", ret = PyInterpreterState, args = {}, call = CImpl)
     @CApiBuiltin(name = "PyIter_Send", ret = PySendResult, args = {PyObject, PyObject, PyObjectPtr}, call = CImpl)
     @CApiBuiltin(name = "PyList_SetItem", ret = Int, args = {PyObject, Py_ssize_t, PyObjectTransfer}, call = CImpl)

graalpython/lib-graalpython/patches/Cython-0.29.32.patch

@@ -270,7 +270,7 @@ index f8bf885..94d0ca6 100644
      #if PY_VERSION_HEX >= 0x030700A1
      static PY_INT64_T main_interpreter_id = -1;
 -    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-+    PY_INT64_T current_id = PyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
++    PY_INT64_T current_id = GraalPyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
      if (main_interpreter_id == -1) {
          main_interpreter_id = current_id;
          return (unlikely(current_id == -1)) ? -1 : 0;

graalpython/lib-graalpython/patches/Cython-0.29.37.patch

@@ -324,7 +324,7 @@ index cfff606..90876c6 100644
      #if PY_VERSION_HEX >= 0x030700A1
      static PY_INT64_T main_interpreter_id = -1;
 -    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-+    PY_INT64_T current_id = PyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
++    PY_INT64_T current_id = GraalPyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
      if (main_interpreter_id == -1) {
          main_interpreter_id = current_id;
          return (unlikely(current_id == -1)) ? -1 : 0;

graalpython/lib-graalpython/patches/Cython-3.0.10.patch

@@ -261,7 +261,7 @@ index d8f60a4..cd61759 100644
      #if PY_VERSION_HEX >= 0x030700A1
      static PY_INT64_T main_interpreter_id = -1;
 -    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-+    PY_INT64_T current_id = PyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
++    PY_INT64_T current_id = GraalPyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
      if (main_interpreter_id == -1) {
          main_interpreter_id = current_id;
          return (unlikely(current_id == -1)) ? -1 : 0;

graalpython/lib-graalpython/patches/catboost-1.2.2.patch

@@ -398,7 +398,7 @@ index 85036794..11c9ce42 100644
      #if PY_VERSION_HEX >= 0x030700A1
      static PY_INT64_T main_interpreter_id = -1;
 -    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-+    PY_INT64_T current_id = PyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
++    PY_INT64_T current_id = GraalPyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
      if (main_interpreter_id == -1) {
          main_interpreter_id = current_id;
          return (unlikely(current_id == -1)) ? -1 : 0;

graalpython/lib-graalpython/patches/catboost-1.2.3.patch

@@ -398,7 +398,7 @@ index 85036794..11c9ce42 100644
      #if PY_VERSION_HEX >= 0x030700A1
      static PY_INT64_T main_interpreter_id = -1;
 -    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-+    PY_INT64_T current_id = PyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
++    PY_INT64_T current_id = GraalPyInterpreterState_GetIDFromThreadState(PyThreadState_Get());
      if (main_interpreter_id == -1) {
          main_interpreter_id = current_id;
          return (unlikely(current_id == -1)) ? -1 : 0;