remove now unnecessary function

Author: timfel

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

@@ -148,12 +148,6 @@ static void initialize_capi() {
     initialize_bufferprocs();
 }
 
-
-__attribute__((always_inline))
-inline PyObject* handle_exception_and_cast(void* val) {
-    return val == ERROR_MARKER ? NULL : val;
-}
-
 __attribute__((always_inline))
 inline void* handle_exception(void* val) {
     return val == ERROR_MARKER ? NULL : val;

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -86,7 +86,7 @@ PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
 /* upcall macros for calling into Python */
 
 /* Call function with return type 'PyObject *'; does polyglot cast and error handling */
-#define UPCALL_O(__recv__, __name__, ...) handle_exception_and_cast(PY_TRUFFLE_LANDING((__recv__), polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
+#define UPCALL_O(__recv__, __name__, ...) handle_exception(PY_TRUFFLE_LANDING((__recv__), polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
 
 /* Call function with a primitive return; no polyglot cast but error handling */
 #define UPCALL_P(__recv__, __name__, ...) (PY_TRUFFLE_LANDING_L((__recv__), polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
@@ -98,13 +98,13 @@ PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
 #define UPCALL_L(__recv__, __name__, ...) UPCALL_P(__recv__, __name__, ##__VA_ARGS__)
 
 /* Call function with return type 'double'; no polyglot cast but error handling */
-#define UPCALL_D(__recv__, __name__, ...) handle_exception_and_cast(PY_TRUFFLE_LANDING_D((__recv__), polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
+#define UPCALL_D(__recv__, __name__, ...) handle_exception(PY_TRUFFLE_LANDING_D((__recv__), polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
 
 /* Call function with return type 'void*'; no polyglot cast and no error handling */
 #define UPCALL_PTR(__name__, ...) (PY_TRUFFLE_LANDING_PTR(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
 
 /* Call function of 'python_cext' module with return type 'PyObject *'; does polyglot cast and error handling */
-#define UPCALL_CEXT_O(__name__, ...) handle_exception_and_cast(PY_TRUFFLE_CEXT_LANDING(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
+#define UPCALL_CEXT_O(__name__, ...) handle_exception(PY_TRUFFLE_CEXT_LANDING(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
 
 /* Call void function of 'python_cext' module; no polyglot cast and no error handling */
 #define UPCALL_CEXT_VOID(__name__, ...) (PY_TRUFFLE_CEXT_LANDING(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
@@ -139,7 +139,6 @@ PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
 #define as_float(obj) ((float)as_double(obj))
 
 
-PyObject* handle_exception_and_cast(void* val);
 void* handle_exception(void* val);
 void* native_to_java(PyObject* obj);
 extern void* to_java(PyObject* obj);

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

@@ -228,7 +228,7 @@ PyObject * PyUnicode_DecodeUTF32(const char *s, Py_ssize_t size, const char *err
     PyObject *result;
     void *jerrors = errors != NULL ? polyglot_from_string(errors, SRC_CS) : NULL;
     int bo = byteorder != NULL ? *byteorder : 0;
-    return handle_exception_and_cast(polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Unicode_DecodeUTF32", s, size, native_to_java(jerrors), bo, ERROR_MARKER));
+    return handle_exception(polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Unicode_DecodeUTF32", s, size, native_to_java(jerrors), bo, ERROR_MARKER));
 }
 
 Py_ssize_t PyUnicode_AsWideChar(PyObject *unicode, wchar_t *w, Py_ssize_t size) {