Fix handling interop exceptions in TopLevelExceptionHandler

Author: msimacek

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -1213,15 +1213,15 @@ private int readEvalPrint(Context context, ConsoleHandler consoleHandler) {
                             if (e.isExit()) {
                                 // usually from quit
                                 throw new ExitException(e.getExitStatus());
-                            } else if (e.isInternalError() || e.isHostException()) {
+                            } else if (e.isInternalError()) {
                                 /*
                                  * The stacktrace should have been printed above by
                                  * TopLevelExceptionHandler. We continue the repl even though the
                                  * system may be broken
                                  */
                                 System.err.println("An internal error occurred, continue at your own risk");
                                 lastStatus = 1;
-                            } else if (e.isGuestException()) {
+                            } else {
                                 // drop through to continue REPL and remember last eval was an error
                                 lastStatus = 1;
                             }

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

@@ -139,7 +139,6 @@
 import java.util.List;
 import java.util.Set;
 
-import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -171,7 +170,6 @@
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.exception.ExceptionNodes;
 import com.oracle.graal.python.builtins.objects.exception.GetEscapedExceptionNode;
-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.frame.PFrame.Reference;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -236,6 +234,7 @@
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.Bind;
@@ -1515,15 +1514,14 @@ void printExceptionRecursive(MaterializedFrame frame, PythonModule sys, Object o
         protected void printException(MaterializedFrame frame, PythonModule sys, Object out, Object excValue) {
             Object value = excValue;
             final Object type = getObjectClass(value);
-            if (!PGuards.isPBaseException(value)) {
+            if (!PyExceptionInstanceCheckNode.executeUncached(value)) {
                 fileWriteString(frame, out, "TypeError: print_exception(): Exception expected for value, ");
                 fileWriteString(frame, out, getTypeName(type));
                 fileWriteString(frame, out, " found\n");
                 return;
             }
 
-            final PBaseException exc = (PBaseException) value;
-            final Object tb = getExceptionTraceback(exc);
+            final Object tb = getExceptionTraceback(value);
             if (tb instanceof PTraceback) {
                 printTraceBack(frame, sys, out, tb);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/exception/TopLevelExceptionHandler.java

@@ -75,6 +75,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ExceptionType;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -142,10 +143,9 @@ public Object execute(VirtualFrame frame) {
                 assert pythonContext.getThreadState(lang).getCurrentException() == null;
                 try {
                     return run(frame);
-                } catch (PException e) {
+                } catch (AbstractTruffleException e) {
                     assert !PArguments.isPythonFrame(frame);
-                    Object pythonException = e.getEscapedException();
-                    if (pythonException instanceof PBaseException managedException && getContext().isChildContext() && isSystemExit(managedException)) {
+                    if (e instanceof PException pe && pe.getEscapedException() instanceof PBaseException managedException && getContext().isChildContext() && isSystemExit(managedException)) {
                         return handleChildContextExit(managedException);
                     }
                     throw handlePythonException(e);
@@ -171,8 +171,8 @@ private void checkInitialized() {
     }
 
     @TruffleBoundary
-    private PException handlePythonException(PException pException) {
-        Object pythonException = pException.getEscapedException();
+    private AbstractTruffleException handlePythonException(AbstractTruffleException e) {
+        Object pythonException = e instanceof PException pe ? pe.getEscapedException() : e;
         if (pythonException instanceof PBaseException managedException && isSystemExit(managedException)) {
             handleSystemExit(managedException);
         }
@@ -186,8 +186,8 @@ private PException handlePythonException(PException pException) {
             sys.setAttribute(BuiltinNames.T_LAST_TRACEBACK, tb);
 
             ExceptionUtils.printExceptionTraceback(getContext(), pythonException);
-            if (PythonOptions.isPExceptionWithJavaStacktrace(getPythonLanguage())) {
-                ExceptionUtils.printJavaStackTrace(pException);
+            if (PythonOptions.isPExceptionWithJavaStacktrace(getPythonLanguage()) && e instanceof PException pe) {
+                ExceptionUtils.printJavaStackTrace(pe);
             }
             if (!getSourceSection().getSource().isInteractive()) {
                 if (getContext().isChildContext()) {
@@ -197,10 +197,10 @@ private PException handlePythonException(PException pException) {
             }
         }
         // Before we leave Python, format the message since outside the context
-        if (pythonException instanceof PBaseException managedException) {
-            pException.setMessage(managedException.getFormattedMessage());
+        if (e instanceof PException pe && pythonException instanceof PBaseException managedException) {
+            pe.setMessage(managedException.getFormattedMessage());
         }
-        throw pException;
+        throw e;
     }
 
     private static boolean isSystemExit(PBaseException pythonException) {