Rename GraalPy-speficic PyCode/PyFrame functions

msimacek · msimacek · commit 9d6508e87a56 · 2025-07-22T15:06:53.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/code.h b/graalpython/com.oracle.graal.python.cext/include/cpython/code.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -374,9 +374,9 @@ PyAPI_FUNC(PyObject *) PyCode_GetCellvars(PyCodeObject *code);
 /* Equivalent to getattr(code, 'co_freevars') in Python. */
 PyAPI_FUNC(PyObject *) PyCode_GetFreevars(PyCodeObject *code);
 
-/* GraalPy specific to avoid direct field access. Used by (at least) pytorch */
-PyAPI_FUNC(PyObject*) PyCode_GetFileName(PyCodeObject* code);
-PyAPI_FUNC(PyObject*) PyCode_GetName(PyCodeObject* code);
+/* GraalPy public API to avoid direct field access. Used by (at least) pytorch patch */
+PyAPI_FUNC(PyObject*) GraalPyCode_GetFileName(PyCodeObject* code);
+PyAPI_FUNC(PyObject*) GraalPyCode_GetName(PyCodeObject* code);
 
 typedef enum _PyCodeLocationInfoKind {
     /* short forms are 0 to 9 */
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/frameobject.h b/graalpython/com.oracle.graal.python.cext/include/cpython/frameobject.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -33,4 +33,7 @@ PyAPI_FUNC(int) _PyFrame_IsEntryFrame(PyFrameObject *frame);
 PyAPI_FUNC(int) PyFrame_FastToLocalsWithError(PyFrameObject *f);
 PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);
 
-PyAPI_FUNC(void) _PyFrame_SetLineNumber(PyFrameObject *, int);
+// GraalPy public API to avoid struct access
+PyAPI_FUNC(void) GraalPyFrame_SetLineNumber(PyFrameObject *, int);
+// Deprecated alias used by current Cython, remove in 27.0
+#define _PyFrame_SetLineNumber GraalPyFrame_SetLineNumber
diff --git a/graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java b/graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java
@@ -750,9 +750,8 @@ private static Path resolvePath(Path path) {
                      * removing
                      */
                     "PySlice_Start", "PySlice_Step", "PySlice_Stop",
-                    "PyObject_GetDoc", "PyObject_SetDoc", "_PyFrame_SetLineNumber",
-                    "PyCode_GetName",
-                    "PyCode_GetFileName", "_PyArray_Resize", "_PyArray_Data",
+                    "PyObject_GetDoc", "PyObject_SetDoc",
+                    "_PyArray_Resize", "_PyArray_Data",
                     "_PyErr_Occurred", "_PyNamespace_New", "_Py_GetErrorHandler",
                     // Not actually additional, only defined on Windows.
                     // TODO: fix generated CAPIFunctions.txt
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCodeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCodeBuiltins.java
@@ -122,15 +122,15 @@ static int addr2line(PCode code, int lasti) {
     }
 
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyCodeObject}, call = Direct)
-    abstract static class PyCode_GetName extends CApiUnaryBuiltinNode {
+    abstract static class GraalPyCode_GetName extends CApiUnaryBuiltinNode {
         @Specialization
         static Object get(PCode code) {
             return code.getName();
         }
     }
 
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyCodeObject}, call = Direct)
-    abstract static class PyCode_GetFileName extends CApiUnaryBuiltinNode {
+    abstract static class GraalPyCode_GetFileName extends CApiUnaryBuiltinNode {
         @Specialization
         static Object get(PCode code) {
             return code.getFilename();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextFrameBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextFrameBuiltins.java
@@ -129,7 +129,7 @@ static Object get(PFrame frame,
     }
 
     @CApiBuiltin(ret = ArgDescriptor.Void, args = {PyFrameObject, Int}, call = Direct)
-    abstract static class _PyFrame_SetLineNumber extends CApiBinaryBuiltinNode {
+    abstract static class GraalPyFrame_SetLineNumber extends CApiBinaryBuiltinNode {
         @Specialization
         static Object set(PFrame frame, int value) {
             frame.setLine(value);
diff --git a/graalpython/lib-graalpython/patches/Cython-0.29.32.patch b/graalpython/lib-graalpython/patches/Cython-0.29.32.patch
@@ -248,7 +248,7 @@ index f8bf885..94d0ca6 100644
  #else
    #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
 -  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-+  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) _PyFrame_SetLineNumber((frame), (lineno))
++  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) GraalPyFrame_SetLineNumber((frame), (lineno))
  #endif
  
  #if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
diff --git a/graalpython/lib-graalpython/patches/Cython-0.29.37.patch b/graalpython/lib-graalpython/patches/Cython-0.29.37.patch
@@ -302,7 +302,7 @@ index cfff606..90876c6 100644
  #else
    #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
 -  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-+  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) _PyFrame_SetLineNumber((frame), (lineno))
++  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) GraalPyFrame_SetLineNumber((frame), (lineno))
  #endif
  
  #if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
diff --git a/graalpython/lib-graalpython/patches/Cython-3.0.10.patch b/graalpython/lib-graalpython/patches/Cython-3.0.10.patch
@@ -239,7 +239,7 @@ index d8f60a4..cd61759 100644
  #else
    #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
 -  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-+  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) _PyFrame_SetLineNumber((frame), (lineno))
++  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) GraalPyFrame_SetLineNumber((frame), (lineno))
  #endif
  
  #if CYTHON_COMPILING_IN_LIMITED_API
diff --git a/graalpython/lib-graalpython/patches/catboost-1.2.2.patch b/graalpython/lib-graalpython/patches/catboost-1.2.2.patch
@@ -376,7 +376,7 @@ index 85036794..11c9ce42 100644
  #else
    #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
 -  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-+  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) _PyFrame_SetLineNumber((frame), (lineno))
++  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) GraalPyFrame_SetLineNumber((frame), (lineno))
  #endif
  
  #if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
diff --git a/graalpython/lib-graalpython/patches/catboost-1.2.3.patch b/graalpython/lib-graalpython/patches/catboost-1.2.3.patch
@@ -376,7 +376,7 @@ index 85036794..11c9ce42 100644
  #else
    #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
 -  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-+  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) _PyFrame_SetLineNumber((frame), (lineno))
++  #define __Pyx_PyFrame_SetLineNumber(frame, lineno) GraalPyFrame_SetLineNumber((frame), (lineno))
  #endif
  
  #if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
diff --git a/graalpython/lib-graalpython/patches/torch-1.13.1.patch b/graalpython/lib-graalpython/patches/torch-1.13.1.patch
@@ -581,9 +581,9 @@ index 78676e2e..e6a3caf0 100644
      size_t line = PyCode_Addr2Line(code.get(), PyFrame_GetLasti(frame));
 -    std::string filename = THPUtils_unpackString(code->co_filename);
 -    std::string funcname = THPUtils_unpackString(code->co_name);
-+    PyObject* filenameObj = PyCode_GetFileName(code);
++    PyObject* filenameObj = GraalPyCode_GetFileName(code);
 +    std::string filename = THPUtils_unpackString(filenameObj);
-+    PyObject* funcnameObj = PyCode_GetName(code);
++    PyObject* funcnameObj = GraalPyCode_GetName(code);
 +    std::string funcname = THPUtils_unpackString(funcnameObj);
      auto source = std::make_shared<Source>(funcname, filename, line);
      entries.emplace_back(
diff --git a/graalpython/lib-graalpython/patches/torch-2.2.1.patch b/graalpython/lib-graalpython/patches/torch-2.2.1.patch
@@ -645,9 +645,9 @@ index bdc62d33..e16c3715 100644
      size_t line = PyCode_Addr2Line(code.get(), PyFrame_GetLasti(frame));
 -    std::string filename = THPUtils_unpackString(code->co_filename);
 -    std::string funcname = THPUtils_unpackString(code->co_name);
-+    PyObject* filenameObj = PyCode_GetFileName(code);
++    PyObject* filenameObj = GraalPyCode_GetFileName(code);
 +    std::string filename = THPUtils_unpackString(filenameObj);
-+    PyObject* funcnameObj = PyCode_GetName(code);
++    PyObject* funcnameObj = GraalPyCode_GetName(code);
 +    std::string funcname = THPUtils_unpackString(funcnameObj);
      auto source = std::make_shared<Source>(funcname, filename, line);
      entries.emplace_back(
diff --git a/graalpython/lib-graalpython/patches/torch-2.4.1.patch b/graalpython/lib-graalpython/patches/torch-2.4.1.patch
@@ -810,9 +810,9 @@ index 92e6e2d3a..4d2ec0bfe 100644
      size_t line = PyCode_Addr2Line(code.get(), PyFrame_GetLasti(frame));
 -    std::string filename = THPUtils_unpackString(code->co_filename);
 -    std::string funcname = THPUtils_unpackString(code->co_name);
-+    PyObject* filenameObj = PyCode_GetFileName(code);
++    PyObject* filenameObj = GraalPyCode_GetFileName(code);
 +    std::string filename = THPUtils_unpackString(filenameObj);
-+    PyObject* funcnameObj = PyCode_GetName(code);
++    PyObject* funcnameObj = GraalPyCode_GetName(code);
 +    std::string funcname = THPUtils_unpackString(funcnameObj);
      auto source = std::make_shared<Source>(funcname, filename, line);
      entries.emplace_back(
@@ -832,8 +832,8 @@ index f9e20541e..f5d4d1375 100644
        auto f_code = (PyCodeObject*)f.code;
 -      py::handle filename = f_code->co_filename;
 -      py::handle funcname = f_code->co_name;
-+      py::object filename = pybind11::reinterpret_steal<py::object>(PyCode_GetFileName(f_code));
-+      py::object funcname = pybind11::reinterpret_steal<py::object>(PyCode_GetName(f_code));
++      py::object filename = pybind11::reinterpret_steal<py::object>(GraalPyCode_GetFileName(f_code));
++      py::object funcname = pybind11::reinterpret_steal<py::object>(GraalPyCode_GetName(f_code));
        auto lineno = PyCode_Addr2Line(f_code, f.lasti);
        result.tracebacks.emplace_back();
        result.tracebacks.back().push_back(result.all_frames.size());
diff --git a/graalpython/lib-graalpython/patches/torch-2.7.0.patch b/graalpython/lib-graalpython/patches/torch-2.7.0.patch
@@ -915,9 +915,9 @@ index 876186743..041348257 100644
      size_t line = PyCode_Addr2Line(code.get(), PyFrame_GetLasti(frame));
 -    std::string filename = THPUtils_unpackString(code->co_filename);
 -    std::string funcname = THPUtils_unpackString(code->co_name);
-+    PyObject* filenameObj = PyCode_GetFileName(code);
++    PyObject* filenameObj = GraalPyCode_GetFileName(code);
 +    std::string filename = THPUtils_unpackString(filenameObj);
-+    PyObject* funcnameObj = PyCode_GetName(code);
++    PyObject* funcnameObj = GraalPyCode_GetName(code);
 +    std::string funcname = THPUtils_unpackString(funcnameObj);
      auto source = std::make_shared<Source>(funcname, filename, line);
      entries.emplace_back(
@@ -937,8 +937,8 @@ index f9e20541e..f5d4d1375 100644
        auto f_code = (PyCodeObject*)f.code;
 -      py::handle filename = f_code->co_filename;
 -      py::handle funcname = f_code->co_name;
-+      py::object filename = pybind11::reinterpret_steal<py::object>(PyCode_GetFileName(f_code));
-+      py::object funcname = pybind11::reinterpret_steal<py::object>(PyCode_GetName(f_code));
++      py::object filename = pybind11::reinterpret_steal<py::object>(GraalPyCode_GetFileName(f_code));
++      py::object funcname = pybind11::reinterpret_steal<py::object>(GraalPyCode_GetName(f_code));
        auto lineno = PyCode_Addr2Line(f_code, f.lasti);
        result.tracebacks.emplace_back();
        result.tracebacks.back().push_back(result.all_frames.size());

Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,15 @@ static int addr2line(PCode code, int lasti) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@CApiBuiltin(ret = PyObjectTransfer, args = {PyCodeObject}, call = Direct)`
`125`		`- abstract static class PyCode_GetName extends CApiUnaryBuiltinNode {`
	`125`	`+ abstract static class GraalPyCode_GetName extends CApiUnaryBuiltinNode {`
`126`	`126`	`@Specialization`
`127`	`127`	`static Object get(PCode code) {`
`128`	`128`	`return code.getName();`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@CApiBuiltin(ret = PyObjectTransfer, args = {PyCodeObject}, call = Direct)`
`133`		`- abstract static class PyCode_GetFileName extends CApiUnaryBuiltinNode {`
	`133`	`+ abstract static class GraalPyCode_GetFileName extends CApiUnaryBuiltinNode {`
`134`	`134`	`@Specialization`
`135`	`135`	`static Object get(PCode code) {`
`136`	`136`	`return code.getFilename();`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ static Object get(PFrame frame,`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`@CApiBuiltin(ret = ArgDescriptor.Void, args = {PyFrameObject, Int}, call = Direct)`
`132`		`- abstract static class _PyFrame_SetLineNumber extends CApiBinaryBuiltinNode {`
	`132`	`+ abstract static class GraalPyFrame_SetLineNumber extends CApiBinaryBuiltinNode {`
`133`	`133`	`@Specialization`
`134`	`134`	`static Object set(PFrame frame, int value) {`
`135`	`135`	`frame.setLine(value);`