Remove leading underscore from internal C functions

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/cpython/unicodeobject.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -244,24 +244,24 @@ enum PyUnicode_Kind {
     PyUnicode_4BYTE_KIND = 4
 };
 
-PyAPI_FUNC(int) _PyTruffleUnicode_KIND(PyObject*);
+PyAPI_FUNC(int) PyTruffleUnicode_KIND(PyObject*);
 // PyUnicode_KIND(): Return one of the PyUnicode_*_KIND values defined above.
 //
 // gh-89653: Converting this macro to a static inline function would introduce
 // new compiler warnings on "kind < PyUnicode_KIND(str)" (compare signed and
 // unsigned numbers) where kind type is an int or on
 // "unsigned int kind = PyUnicode_KIND(str)" (cast signed to unsigned).
-#define PyUnicode_KIND(op) ((enum PyUnicode_Kind)_PyTruffleUnicode_KIND(_PyObject_CAST(op)))
+#define PyUnicode_KIND(op) ((enum PyUnicode_Kind)PyTruffleUnicode_KIND(_PyObject_CAST(op)))
 
 /* Return a void pointer to the raw unicode buffer. */
 static inline void* _PyUnicode_COMPACT_DATA(PyObject *Py_UNUSED(op)) {
     // strings are never compact in GraalPy
     return NULL;
 }
 
-PyAPI_FUNC(void*) _PyTruffleUnicode_NONCOMPACT_DATA(PyObject *op);
+PyAPI_FUNC(void*) PyTruffleUnicode_NONCOMPACT_DATA(PyObject *op);
 static inline void* _PyUnicode_NONCOMPACT_DATA(PyObject *op) {
-    return _PyTruffleUnicode_NONCOMPACT_DATA(op);
+    return PyTruffleUnicode_NONCOMPACT_DATA(op);
 }
 
 static inline void* PyUnicode_DATA(PyObject *op) {

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

@@ -289,18 +289,18 @@ static inline void Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) {
 #endif
 
 
-PyAPI_FUNC(void) PyTruffle_SET_TYPE(PyObject *ob, PyTypeObject *type);
+PyAPI_FUNC(void) GraalPy_SET_TYPE(PyObject *ob, PyTypeObject *type);
 static inline void Py_SET_TYPE(PyObject *ob, PyTypeObject *type) {
-    PyTruffle_SET_TYPE(ob, type);
+    GraalPy_SET_TYPE(ob, type);
 }
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
 #  define Py_SET_TYPE(ob, type) Py_SET_TYPE(_PyObject_CAST(ob), type)
 #endif
 
 
-PyAPI_FUNC(void) PyTruffle_SET_SIZE(PyVarObject *ob, Py_ssize_t size);
+PyAPI_FUNC(void) GraalPy_SET_SIZE(PyVarObject *ob, Py_ssize_t size);
 static inline void Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) {
-    PyTruffle_SET_SIZE(ob, size);
+    GraalPy_SET_SIZE(ob, size);
 }
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
 #  define Py_SET_SIZE(ob, size) Py_SET_SIZE(_PyVarObject_CAST(ob), (size))
@@ -1037,7 +1037,7 @@ static inline int PyType_CheckExact(PyObject *op) {
 #endif
 
 // GraalPy additions
-PyAPI_FUNC(void) _PyTruffle_DebugTrace(void);
+PyAPI_FUNC(void) PyTruffle_DebugTrace(void);
 
 typedef struct {
     PyObject_HEAD

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

@@ -1065,7 +1065,7 @@ warn_unicode(PyObject *category, PyObject *message,
         category = PyExc_RuntimeWarning;
 
     // GraalPy change
-    res = _PyTruffleErr_Warn(message, category, stack_level, source);
+    res = PyTruffleErr_Warn(message, category, stack_level, source);
     if (res == NULL)
         return -1;
     Py_DECREF(res);

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

@@ -2927,7 +2927,7 @@ int
 _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
 {
     // GraalPy change: different implementation
-    return _PyTruffleBytes_Resize(*pv, newsize);
+    return PyTruffleBytes_Resize(*pv, newsize);
 }
 
 

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

@@ -137,7 +137,7 @@ PyObject_CallNoArgs(PyObject *func)
     PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
 #else // GraalPy change
-    return _PyTruffleObject_Call1(func, NULL, NULL, 0);
+    return PyTruffleObject_Call1(func, NULL, NULL, 0);
 #endif // GraalPy change
 }
 
@@ -417,7 +417,7 @@ PyObject *
 PyObject_Call(PyObject *callable, PyObject *args, PyObject *kwargs)
 {
     // GraalPy change: different implementation
-    return _PyTruffleObject_Call1(callable, args, kwargs, 0);
+    return PyTruffleObject_Call1(callable, args, kwargs, 0);
 }
 
 
@@ -514,7 +514,7 @@ PyObject *
 PyObject_CallObject(PyObject *callable, PyObject *args)
 {
     // GraalPy change: different implementation
-    return _PyTruffleObject_Call1(callable, args, NULL, 0);
+    return PyTruffleObject_Call1(callable, args, NULL, 0);
 }
 
 
@@ -621,17 +621,17 @@ PyObject_CallFunction(PyObject *callable, const char *format, ...)
 {
     // GraalPy change: different implementation
     if (format == NULL || format[0] == '\0') {
-        return _PyTruffleObject_Call1(callable, NULL, NULL, 0);
+        return PyTruffleObject_Call1(callable, NULL, NULL, 0);
     }
     va_list va;
     va_start(va, format);
     PyObject* args = Py_VaBuildValue(format, va);
     va_end(va);
     // A special case in CPython for backwards compatibility
     if (is_single_arg(format) && PyTuple_Check(args)) {
-        return _PyTruffleObject_Call1(callable, args, NULL, 0);
+        return PyTruffleObject_Call1(callable, args, NULL, 0);
     }
-    return _PyTruffleObject_Call1(callable, args, NULL, is_single_arg(format));
+    return PyTruffleObject_Call1(callable, args, NULL, is_single_arg(format));
 }
 
 
@@ -660,17 +660,17 @@ _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
 {
     // GraalPy change: different implementation
     if (format == NULL || format[0] == '\0') {
-        return _PyTruffleObject_Call1(callable, NULL, NULL, 0);
+        return PyTruffleObject_Call1(callable, NULL, NULL, 0);
     }
     va_list va;
     va_start(va, format);
     PyObject* args = _Py_VaBuildValue_SizeT(format, va);
     va_end(va);
     // A special case in CPython for backwards compatibility
     if (is_single_arg(format) && PyTuple_Check(args)) {
-        return _PyTruffleObject_Call1(callable, args, NULL, 0);
+        return PyTruffleObject_Call1(callable, args, NULL, 0);
     }
-    return _PyTruffleObject_Call1(callable, args, NULL, is_single_arg(format));
+    return PyTruffleObject_Call1(callable, args, NULL, is_single_arg(format));
 }
 
 
@@ -696,13 +696,13 @@ PyObject_CallMethod(PyObject *obj, const char *name, const char *format, ...)
     // GraalPy change: different implementation
     PyObject* args;
     if (format == NULL || format[0] == '\0') {
-        return _PyTruffleObject_CallMethod1(obj, name, NULL, 0);
+        return PyTruffleObject_CallMethod1(obj, name, NULL, 0);
     }
     va_list va;
     va_start(va, format);
     args = Py_VaBuildValue(format, va);
     va_end(va);
-    return _PyTruffleObject_CallMethod1(obj, name, args, is_single_arg(format));
+    return PyTruffleObject_CallMethod1(obj, name, args, is_single_arg(format));
 }
 
 
@@ -800,13 +800,13 @@ _PyObject_CallMethod_SizeT(PyObject *obj, const char *name,
     // GraalPy change: different implementation
     PyObject* args;
     if (format == NULL || format[0] == '\0') {
-        return _PyTruffleObject_CallMethod1(obj, name, NULL, 0);
+        return PyTruffleObject_CallMethod1(obj, name, NULL, 0);
     }
     va_list va;
     va_start(va, format);
     args = _Py_VaBuildValue_SizeT(format, va);
     va_end(va);
-    return _PyTruffleObject_CallMethod1(obj, name, args, is_single_arg(format));
+    return PyTruffleObject_CallMethod1(obj, name, args, is_single_arg(format));
 }
 
 

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

@@ -1794,7 +1794,7 @@ PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
         PyErr_SetString(PyExc_SystemError, "PyEval_EvalCodeEx: NULL globals");
         return NULL;
     }
-    return _PyTruffleEval_EvalCodeEx(_co, globals, locals != NULL ? locals : Py_None,
+    return PyTruffleEval_EvalCodeEx(_co, globals, locals != NULL ? locals : Py_None,
                                   args, argcount,
                                   kws, kwcount,
                                   defs, defcount,

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

@@ -263,7 +263,7 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
         tb = PyException_GetTraceback(value);
     _PyErr_Restore(tstate, Py_NewRef(Py_TYPE(value)), value, tb);
 #else // GraalPy change: different implementation
-	_PyTruffleErr_CreateAndSetException(exception, value);
+	PyTruffleErr_CreateAndSetException(exception, value);
 #endif // GraalPy change
 }
 

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

@@ -229,7 +229,7 @@ _PyModule_CreateInitialized(PyModuleDef* module, int module_api_version)
         return NULL;
     }
     // GraalPy change
-    m = _PyTruffleModule_CreateInitialized_PyModule_New(name);
+    m = PyTruffleModule_CreateInitialized_PyModule_New(name);
 
     if (module->m_size > 0) {
         // GraalPy change: avoid direct struct access

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

@@ -531,7 +531,7 @@ int
 _PyObject_IsFreed(PyObject *op)
 {
     if (points_to_py_handle_space(op)) {
-        return _PyTruffleObject_IsFreed(op);
+        return PyTruffleObject_IsFreed(op);
     }
 #if 0 // GraalPy change
     if (_PyMem_IsPtrFreed(op) || _PyMem_IsPtrFreed(Py_TYPE(op))) {
@@ -556,7 +556,7 @@ void
 _PyObject_Dump(PyObject* op)
 {
     if (points_to_py_handle_space(op)) {
-        _PyTruffleObject_Dump(op);
+        PyTruffleObject_Dump(op);
         return;
     }
     if (_PyObject_IsFreed(op)) {
@@ -2946,7 +2946,7 @@ PyAPI_FUNC(Py_ssize_t) _Py_SIZE(PyObject *obj) {
 }
 
 void
-PyTruffle_SET_TYPE(PyObject *a, PyTypeObject *b)
+GraalPy_SET_TYPE(PyObject *a, PyTypeObject *b)
 {
     if (points_to_py_handle_space(a)) {
         PyTruffle_Log(PY_TRUFFLE_LOG_INFO,
@@ -2957,10 +2957,10 @@ PyTruffle_SET_TYPE(PyObject *a, PyTypeObject *b)
 }
 
 void
-PyTruffle_SET_SIZE(PyVarObject *a, Py_ssize_t b)
+GraalPy_SET_SIZE(PyVarObject *a, Py_ssize_t b)
 {
     if (points_to_py_handle_space(a)) {
-        _PyTruffle_SET_SIZE(a, b);
+        PyTruffle_SET_SIZE(a, b);
     } else {
         a->ob_size = b;
     }

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

@@ -110,7 +110,7 @@ _Py_HashDouble(PyObject *inst, double v)
             return _Py_HashPointer(inst);
     }
     // GraalPy change: different implementation
-    return _PyTruffle_HashDouble(v);
+    return PyTruffle_HashDouble(v);
 }
 
 Py_hash_t