Make native exception tracebacks work

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_err.py

@@ -692,10 +692,7 @@ def test_raise_instance(self):
 
     def test_traceback(self):
         try:
-            try:
-                raise_native_exception()
-            finally:
-                assert True  # no-op, just to test implicit reraising
+            raise_native_exception()
         except ExceptionSubclass as e:
             tb = e.__traceback__
         else:
@@ -713,6 +710,22 @@ def test_traceback(self):
         e2 = e2.with_traceback(tb)
         assert e2.__traceback__ is tb
 
+    def test_traceback_reraise(self):
+        try:
+            try:
+                raise_native_exception()
+            except Exception as e1:
+                e1.__traceback__ = None
+                raise
+        except ExceptionSubclass as e:
+            tb = e.__traceback__
+        else:
+            assert False
+        assert tb
+        assert tb.tb_frame.f_code is TestNativeExceptionSubclass.test_traceback_reraise.__code__
+        assert tb.tb_next
+        assert tb.tb_next.tb_frame.f_code is raise_native_exception.__code__
+
     def test_chaining(self):
         inner_e = ExceptionSubclass()
         outer_e = ExceptionSubclass()
@@ -802,4 +815,3 @@ def gen():
         e = ExceptionSubclass()
         e1 = g.throw(e)
         assert e1 is e
-

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java

@@ -212,7 +212,7 @@ static RuntimeException doRaise(TruffleEncoder encoder, Object inputObject,
             int end = start + encoder.getErrorLength();
             Object exception = callNode.execute(UnicodeEncodeError, encoder.getEncodingName(), inputObject, start, end, encoder.getErrorReason());
             if (exception instanceof PBaseException) {
-                throw raiseNode.raiseExceptionObject((PBaseException) exception);
+                throw raiseNode.raiseExceptionObject(exception);
             } else {
                 // Shouldn't happen unless the user manually replaces the method, which is really
                 // unexpected and shouldn't be permitted at all, but currently it is
@@ -373,7 +373,7 @@ static Object doRaise(TruffleDecoder decoder, Object inputObject, boolean justMa
                 return exception;
             }
             if (exception instanceof PBaseException) {
-                throw raiseNode.raiseExceptionObject((PBaseException) exception);
+                throw raiseNode.raiseExceptionObject(exception);
             } else {
                 // Shouldn't happen unless the user manually replaces the method, which is really
                 // unexpected and shouldn't be permitted at all, but currently it is

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java

@@ -82,14 +82,14 @@
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
-import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.lib.PyCallableCheckNode;
 import com.oracle.graal.python.lib.PyDictGetItem;
+import com.oracle.graal.python.lib.PyExceptionInstanceCheckNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectIsTrueNode;
@@ -118,7 +118,6 @@
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -851,11 +850,11 @@ private static void warnExplicitPart2(PythonContext context, Node node, PythonMo
                         Object category, Object message, Object text, Object key, Object item, TruffleString action) {
 
             if (action.equalsUncached(T_ERROR, TS_ENCODING)) {
-                if (!(message instanceof PBaseException)) {
+                if (!PyExceptionInstanceCheckNode.executeUncached(message)) {
                     throw PRaiseNode.raiseUncached(node, PythonBuiltinClassType.SystemError, ErrorMessages.EXCEPTION_NOT_BASEEXCEPTION,
                                     PyObjectReprAsTruffleStringNode.getUncached().execute(null, message));
                 } else {
-                    throw PRaiseNode.raise(node, (PBaseException) message, PythonOptions.isPExceptionWithJavaStacktrace(PythonLanguage.get(node)));
+                    throw PRaiseNode.raiseExceptionObject(node, message);
                 }
             }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextErrBuiltins.java

@@ -269,10 +269,7 @@ Object create(Object type, Object value,
                         @SuppressWarnings("unused") @Cached IsSubClassNode isSubClassNode,
                         @Cached PrepareExceptionNode prepareExceptionNode) {
             Object exception = prepareExceptionNode.execute(null, type, value);
-            if (exception instanceof PBaseException managedException) {
-                managedException.ensureReified();
-            }
-            throw PRaiseNode.raiseNoReify(this, exception, PythonOptions.isPExceptionWithJavaStacktrace(PythonLanguage.get(this)));
+            throw PRaiseNode.raiseExceptionObject(this, exception);
         }
 
         protected static boolean isExceptionClass(Object obj, IsTypeNode isTypeNode, IsSubClassNode isSubClassNode) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/AbstractBufferedIOBuiltins.java

@@ -47,7 +47,6 @@
 import static com.oracle.graal.python.nodes.ErrorMessages.IO_UNINIT;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.io.BufferedIONodes.RawTellNode;
@@ -66,7 +65,6 @@
 import com.oracle.graal.python.nodes.object.InlinedGetClassNode.GetPythonObjectClassNode;
 import com.oracle.graal.python.runtime.PosixSupportLibrary;
 import com.oracle.graal.python.runtime.PosixSupportLibrary.PosixException;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -227,7 +225,7 @@ static PException raise(Node node, Object errno, TruffleString message, int writ
             attrs[OsErrorBuiltins.IDX_STRERROR] = message;
             attrs[OsErrorBuiltins.IDX_WRITTEN] = written;
             exception.setExceptionAttributes(attrs);
-            return PRaiseNode.raise(node, exception, PythonOptions.isPExceptionWithJavaStacktrace(PythonLanguage.get(node)));
+            return PRaiseNode.raiseExceptionObject(node, exception);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONScannerBuiltins.java

@@ -540,12 +540,12 @@ private static RuntimeException decodeError(Node raisingNode, String jsonString,
         Object module = AbstractImportNode.importModule(toTruffleStringUncached("json.decoder"));
         Object errorClass = PyObjectLookupAttr.getUncached().execute(null, module, T_JSON_DECODE_ERROR);
         Object exception = CallNode.getUncached().execute(errorClass, format, toTruffleStringUncached(jsonString), pos);
-        throw PRaiseNode.raise(raisingNode, (PBaseException) exception, false);
+        throw PRaiseNode.raiseExceptionObject(raisingNode, exception, false);
     }
 
     private static RuntimeException stopIteration(Node raisingNode, Object value) {
         CompilerAsserts.neverPartOfCompilation();
         Object exception = CallNode.getUncached().execute(PythonContext.get(raisingNode).lookupType(PythonBuiltinClassType.StopIteration), value);
-        throw PRaiseNode.raise(raisingNode, (PBaseException) exception, false);
+        throw PRaiseNode.raiseExceptionObject(raisingNode, exception, false);
     }
 }

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

@@ -2145,7 +2145,7 @@ private static PException raiseNullButNoError(Node node, TruffleString name, Tru
         private static PException raiseResultWithError(PythonLanguage language, Node node, TruffleString name, PException currentException, TruffleString resultWithErrorMessage) {
             PBaseException sysExc = PythonObjectFactory.getUncached().createBaseException(PythonErrorType.SystemError, resultWithErrorMessage, new Object[]{name});
             sysExc.setCause(currentException.getEscapedException());
-            throw PRaiseNode.raise(node, sysExc, PythonOptions.isPExceptionWithJavaStacktrace(language));
+            throw PRaiseNode.raiseExceptionObject(node, sysExc, PythonOptions.isPExceptionWithJavaStacktrace(language));
         }
 
         protected static boolean isNativeNull(Object object) {