Allow creating native subtypes of exceptions

msimacek · msimacek · commit ac57445da2ba · 2023-06-26T11:37:43.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -424,10 +424,18 @@ PyAPI_FUNC(PyTypeObject*) get_##NAME(RECEIVER obj) {  \
 PyAPI_FUNC(PyObject*) get_##NAME(RECEIVER obj) {        \
     return (PyObject*) obj->NAME;           \
 }
+#define OBJECT_FIELD_SETTER(RECEIVER, NAME) \
+PyAPI_FUNC(void) set_##NAME(RECEIVER obj, PyObject* value) {        \
+    Py_XSETREF(obj->NAME, value);           \
+}
 #define PRIMITIVE_FIELD_GETTER(RECEIVER, RESULT, NAME) \
 PyAPI_FUNC(RESULT) get_##NAME(RECEIVER obj) {                      \
     return obj->NAME;                                  \
 }
+#define PRIMITIVE_FIELD_SETTER(RECEIVER, TYPE, NAME) \
+PyAPI_FUNC(void) set_##NAME(RECEIVER obj, TYPE value) {                      \
+    obj->NAME = value;                                  \
+}
 #define PRIMITIVE_SUBFIELD_GETTER(RECEIVER, FIELD, RESULT, NAME) \
 PyAPI_FUNC(RESULT) get_##NAME(RECEIVER obj) {                    \
     return obj->FIELD? obj->FIELD->NAME : NULL;                   \
@@ -522,6 +530,20 @@ PRIMITIVE_FIELD_GETTER(PyModuleDef*, Py_ssize_t, m_size)
 PRIMITIVE_FIELD_GETTER(PyModuleDef*, const char*, m_doc)
 PRIMITIVE_EMBEDDED_FIELD_GETTER(PyComplexObject*, cval, double, real)
 PRIMITIVE_EMBEDDED_FIELD_GETTER(PyComplexObject*, cval, double, imag)
+OBJECT_FIELD_GETTER(PyBaseExceptionObject*, args);
+OBJECT_FIELD_GETTER(PyBaseExceptionObject*, context);
+OBJECT_FIELD_GETTER(PyBaseExceptionObject*, cause);
+OBJECT_FIELD_GETTER(PyBaseExceptionObject*, traceback);
+PRIMITIVE_FIELD_GETTER(PyBaseExceptionObject*, char, suppress_context);
+OBJECT_FIELD_SETTER(PyBaseExceptionObject*, args);
+OBJECT_FIELD_SETTER(PyBaseExceptionObject*, context);
+PyAPI_FUNC(void) set_cause(PyBaseExceptionObject* obj, PyObject* value) {
+    Py_XSETREF(obj->cause, value);
+    obj->suppress_context = 1;
+}
+OBJECT_FIELD_SETTER(PyBaseExceptionObject*, traceback);
+PRIMITIVE_FIELD_SETTER(PyBaseExceptionObject*, char, suppress_context);
+
 
 char* get_ob_sval(PyObject* op) {
 	return ((PyBytesObject *)(op))->ob_sval;
diff --git a/graalpython/com.oracle.graal.python.cext/src/exceptions.c b/graalpython/com.oracle.graal.python.cext/src/exceptions.c
@@ -187,3 +187,17 @@ void initialize_exceptions() {
     PyExc_ResourceWarning = PY_EXCEPTION("ResourceWarning");
 }
 
+PyObject* exception_subtype_new(PyTypeObject *type, PyObject *args) {
+    PyBaseExceptionObject *self;
+
+    self = (PyBaseExceptionObject *)type->tp_alloc(type, 0);
+    if (!self)
+        return NULL;
+    /* the dict is created on the fly in PyObject_GenericSetAttr */
+    self->dict = NULL;
+    self->traceback = self->cause = self->context = NULL;
+    self->suppress_context = 0;
+    self->args = args;
+    Py_INCREF(args);
+    return (PyObject *)self;
+}
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -125,6 +125,8 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory;
+import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes;
+import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitionsFactory.NativeToPythonNodeGen;
@@ -2920,15 +2922,26 @@ public final Object varArgExecute(VirtualFrame frame, Object self, Object[] argu
             return execute(frame, arguments[0], argsWithoutSelf, keywords);
         }
 
-        @Specialization(guards = "args.length == 0")
+        @Specialization(guards = {"!isNativeClass(cls)", "args.length == 0"})
         Object initNoArgs(Object cls, @SuppressWarnings("unused") Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs) {
             return factory().createBaseException(cls);
         }
 
-        @Specialization(guards = "args.length != 0")
+        @Specialization(guards = {"!isNativeClass(cls)", "args.length != 0"})
         Object initArgs(Object cls, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs) {
             return factory().createBaseException(cls, factory().createTuple(args));
         }
+
+        @Specialization
+        Object doNativeSubtype(PythonNativeClass cls, Object[] args, @SuppressWarnings("unused") PKeyword[] kwargs,
+                        @Cached PCallCapiFunction callCapiFunction,
+                        @Cached PythonToNativeNode toNativeNode,
+                        @Cached NativeToPythonNode toPythonNode,
+                        @Cached ExternalFunctionNodes.DefaultCheckFunctionResultNode checkFunctionResultNode) {
+            Object argsTuple = args.length > 0 ? factory().createTuple(args) : factory().createEmptyTuple();
+            Object nativeResult = callCapiFunction.call(NativeCAPISymbol.FUN_EXCEPTION_SUBTYPE_NEW, toNativeNode.execute(cls), toNativeNode.execute(argsTuple));
+            return toPythonNode.execute(checkFunctionResultNode.execute(getContext(), NativeCAPISymbol.FUN_EXCEPTION_SUBTYPE_NEW.getTsName(), nativeResult));
+        }
     }
 
     @Builtin(name = "mappingproxy", constructsClass = PythonBuiltinClassType.PMappingproxy, isPublic = false, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java
@@ -197,6 +197,16 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_GET_MP_ASS_SUBSCRIPT("get_mp_ass_subscript"),
     FUN_GET_PY_COMPLEX_CVAL_REAL("get_cval_real"),
     FUN_GET_PY_COMPLEX_CVAL_IMAG("get_cval_imag"),
+    FUN_GET_EXCEPTION_ARGS("get_args"),
+    FUN_GET_EXCEPTION_CAUSE("get_cause"),
+    FUN_GET_EXCEPTION_CONTEXT("get_context"),
+    FUN_GET_EXCEPTION_SUPPRESS_CONTEXT("get_suppress_context"),
+    FUN_GET_EXCEPTION_TRACEBACK("get_traceback"),
+    FUN_SET_EXCEPTION_ARGS("set_args"),
+    FUN_SET_EXCEPTION_CAUSE("set_cause"),
+    FUN_SET_EXCEPTION_CONTEXT("set_context"),
+    FUN_SET_EXCEPTION_SUPPRESS_CONTEXT("set_suppress_context"),
+    FUN_SET_EXCEPTION_TRACEBACK("set_traceback"),
     FUN_GET_PYMODULEDEF_M_METHODS("get_PyModuleDef_m_methods"),
     FUN_GET_PYMODULEDEF_M_SLOTS("get_PyModuleDef_m_slots"),
     FUN_GET_BYTE_ARRAY_TYPE_ID("get_byte_array_typeid"),
@@ -295,6 +305,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_TUPLE_SUBTYPE_NEW("tuple_subtype_new"),
     FUN_BYTES_SUBTYPE_NEW("bytes_subtype_new"),
     FUN_FLOAT_SUBTYPE_NEW("float_subtype_new"),
+    FUN_EXCEPTION_SUBTYPE_NEW("exception_subtype_new"),
     FUN_SUBCLASS_CHECK("truffle_subclass_check"),
     FUN_BASETYPE_CHECK("truffle_BASETYPE_check"),
     FUN_MEMCPY_BYTES("truffle_memcpy_bytes"),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java
@@ -52,6 +52,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageForEach;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageForEachCallback;
@@ -117,7 +118,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public abstract static class BaseExceptionInitNode extends PythonVarargsBuiltinNode {
         @Child private SplitArgsNode splitArgsNode;
 
-        public final Object execute(PBaseException self, Object[] args) {
+        public final Object execute(Object self, Object[] args) {
             return execute(null, self, args, PKeyword.EMPTY_KEYWORDS);
         }
 
@@ -150,7 +151,7 @@ Object doWithArguments(PBaseException self, Object[] args, @SuppressWarnings("un
         @Specialization(replaces = {"doNoArguments", "doWithArguments"})
         Object doGeneric(PBaseException self, Object[] args, PKeyword[] keywords) {
             if (keywords.length != 0) {
-                throw raise(PythonBuiltinClassType.TypeError, P_TAKES_NO_KEYWORD_ARGS, self);
+                throw raise(TypeError, P_TAKES_NO_KEYWORD_ARGS, self);
             }
             if (args.length == 0) {
                 self.setArgs(null);
@@ -159,6 +160,21 @@ Object doGeneric(PBaseException self, Object[] args, PKeyword[] keywords) {
             }
             return PNone.NONE;
         }
+
+        @Specialization
+        Object doNative(PythonAbstractNativeObject self, Object[] args, PKeyword[] keywords,
+                        @Bind("this") Node inliningTarget,
+                        @Cached ExceptionNodes.SetArgsNode setArgsNode) {
+            if (keywords.length != 0) {
+                throw raise(TypeError, P_TAKES_NO_KEYWORD_ARGS, self);
+            }
+            if (args.length == 0) {
+                setArgsNode.execute(inliningTarget, self, factory().createEmptyTuple());
+            } else {
+                setArgsNode.execute(inliningTarget, self, factory().createTuple(args));
+            }
+            return PNone.NONE;
+        }
     }
 
     @Builtin(name = "args", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/ExceptionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/ExceptionNodes.java
@@ -187,7 +187,7 @@ static boolean doNative(@SuppressWarnings("unused") Node inliningTarget, PythonA
                         @Cached CApiTransitions.PythonToNativeNode toNative,
                         @Cached CApiTransitions.NativeToPythonNode toPython,
                         @Cached CExtNodes.PCallCapiFunction callGetter) {
-            return (int) toPython.execute(callGetter.call(NativeMember.SUPPRESS_CONTEXT.getGetterFunctionName(), toNative.execute(noneToNoValue(exception)))) != 0;
+            return (byte) callGetter.call(NativeMember.SUPPRESS_CONTEXT.getGetterFunctionName(), toNative.execute(noneToNoValue(exception))) != 0;
         }
 
         @Specialization
@@ -217,7 +217,7 @@ static void doNative(@SuppressWarnings("unused") Node inliningTarget, PythonAbst
                         @SuppressWarnings("unused") @Cached PyExceptionInstanceCheckNode check,
                         @Cached CApiTransitions.PythonToNativeNode excToNative,
                         @Cached CExtNodes.PCallCapiFunction callGetter) {
-            callGetter.call(NativeMember.SUPPRESS_CONTEXT.getSetterFunctionName(), excToNative.execute(exception), value ? 1 : 0);
+            callGetter.call(NativeMember.SUPPRESS_CONTEXT.getSetterFunctionName(), excToNative.execute(exception), (byte) (value ? 1 : 0));
         }
 
         @Specialization
