add dummy impls for _PyErr_ChainExceptions and _PyErr_FormatFromCause

Author: lukasstadler

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

@@ -176,4 +176,17 @@ int PyErr_WarnExplicitFormat(PyObject *category,
     return ret;
 }
 
+void _PyErr_ChainExceptions(PyObject* a, PyObject* b, PyObject* c) {
+	// empty dummy implementation
+}
+
+PyObject* _PyErr_FormatFromCause(PyObject *exception, const char *format, ...) {
+	// dummy implementation that ignores the cause
+    va_list args;
+    va_start(args, format);
+    PyObject* formatted_msg = PyUnicode_FromFormatV(format, args);
+    va_end(args);
+    Graal_PyTruffleErr_CreateAndSetException(exception, formatted_msg);
+    return NULL;
+}
 

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

@@ -4995,15 +4995,9 @@ void (*__target___PyErr_BadInternalCall)(const char*, int) = NULL;
 PyAPI_FUNC(void) _PyErr_BadInternalCall(const char* a, int b) {
     __target___PyErr_BadInternalCall(a, b);
 }
-PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject* a, PyObject* b, PyObject* c) {
-    unimplemented("_PyErr_ChainExceptions"); exit(-1);
-}
 PyAPI_FUNC(int) _PyErr_CheckSignals() {
     unimplemented("_PyErr_CheckSignals"); exit(-1);
 }
-PyAPI_FUNC(PyObject*) _PyErr_FormatFromCause(PyObject* a, const char* b, ...) {
-    unimplemented("_PyErr_FormatFromCause"); exit(-1);
-}
 PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState* a, PyObject** b, PyObject** c, PyObject** d) {
     unimplemented("_PyErr_GetExcInfo"); exit(-1);
 }

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

@@ -373,6 +373,8 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyByteArray_Size", ret = Py_ssize_t, args = {PyObject}, call = CImpl)
     @CApiBuiltin(name = "PyGILState_Ensure", ret = PY_GIL_STATE_STATE, args = {}, acquiresGIL = false, call = CImpl)
     @CApiBuiltin(name = "PyGILState_Release", ret = Void, args = {PY_GIL_STATE_STATE}, acquiresGIL = false, call = CImpl)
+    @CApiBuiltin(name = "_PyErr_ChainExceptions", ret = Void, args = {PyObject, PyObject, PyObject}, call = CImpl)
+    @CApiBuiltin(name = "_PyErr_FormatFromCause", ret = PyObject, args = {PyObject, ConstCharPtrAsTruffleString, VARARGS}, call = CImpl)
 
     /*
      * Functions that are implemented in C code that needs to run on Sulong:
@@ -782,9 +784,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "_PyDict_SizeOf", ret = Py_ssize_t, args = {PYDICTOBJECT_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDictView_Intersect", ret = PyObject, args = {PyObject, PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDictView_New", ret = PyObject, args = {PyObject, PyTypeObject}, call = NotImplemented)
-    @CApiBuiltin(name = "_PyErr_ChainExceptions", ret = Void, args = {PyObject, PyObject, PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "_PyErr_CheckSignals", ret = Int, args = {}, call = NotImplemented)
-    @CApiBuiltin(name = "_PyErr_FormatFromCause", ret = PyObject, args = {PyObject, ConstCharPtrAsTruffleString, VARARGS}, call = NotImplemented)
     @CApiBuiltin(name = "_PyErr_GetExcInfo", ret = Void, args = {PyThreadState, PyObjectPtr, PyObjectPtr, PyObjectPtr}, call = NotImplemented)
     @CApiBuiltin(name = "_PyErr_GetTopmostException", ret = _PYERR_STACKITEM_PTR, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "_PyErr_ProgramDecodedTextObject", ret = PyObject, args = {PyObject, Int, ConstCharPtr}, call = NotImplemented)