Improve exception printing from atexit

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_atexit.txt

@@ -4,7 +4,9 @@
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_clear
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_exit
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_order
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_print_tracebacks
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_raise
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_raise_unnormalized
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_shutdown
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_stress
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_unregister

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

@@ -45,16 +45,21 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+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.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -76,12 +81,12 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Builtin(name = "register", minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true)
     @GenerateNodeFactory
     abstract static class RegisterNode extends PythonVarargsBuiltinNode {
-        private static class AtExitCallTarget extends RootNode {
+        private static class AtExitRootNode extends RootNode {
             @Child private CallNode callNode = CallNode.create();
 
             private final ContextReference<PythonContext> contextRef = lookupContextReference(PythonLanguage.class);
 
-            protected AtExitCallTarget(TruffleLanguage<?> language) {
+            protected AtExitRootNode(TruffleLanguage<?> language) {
                 super(language);
             }
 
@@ -100,6 +105,14 @@ public Object execute(VirtualFrame frame) {
                 // from the context.
                 try {
                     return callNode.execute(null, callable, arguments, keywords);
+                } catch (PException e) {
+                    PBaseException pythonException = e.getEscapedException();
+                    PythonObjectLibrary lib = PythonObjectLibrary.getUncached();
+                    if (!IsBuiltinClassProfile.profileClassSlowPath(lib.getLazyPythonClass(pythonException), PythonBuiltinClassType.SystemExit)) {
+                        lib.lookupAndCallRegularMethod(context.getCore().getStderr(), null, "write", "Error in atexit._run_exitfuncs:\n");
+                        ExceptionUtils.printExceptionTraceback(context, pythonException);
+                    }
+                    throw e;
                 } finally {
                     context.popTopFrameInfo();
                     context.setCaughtException(null);
@@ -110,8 +123,8 @@ public Object execute(VirtualFrame frame) {
         @Specialization
         Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
             CompilerDirectives.transferToInterpreter();
-            AtExitCallTarget atExitCallTarget = new AtExitCallTarget(getContext().getLanguage());
-            getContext().registerAtexitHook(callable, arguments, keywords, PythonUtils.getOrCreateCallTarget(atExitCallTarget));
+            AtExitRootNode atExitRootNode = new AtExitRootNode(getContext().getLanguage());
+            getContext().registerAtexitHook(callable, arguments, keywords, PythonUtils.getOrCreateCallTarget(atExitRootNode));
             return callable;
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -54,7 +54,6 @@
 import org.graalvm.options.OptionKey;
 
 import com.oracle.graal.python.PythonLanguage;
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
@@ -79,7 +78,6 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.AsyncHandler.AsyncAction;
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -752,10 +750,6 @@ public void runAtexitHooks() {
                 hook.ct.call(hook.callable, hook.arguments, hook.keywords);
             } catch (PException e) {
                 lastException = e;
-                if (!IsBuiltinClassProfile.profileClassSlowPath(e.getEscapedException(), PythonBuiltinClassType.SystemExit)) {
-                    System.err.println("Error in atexit._run_exitfuncs:");
-                    ExceptionUtils.printPythonLikeStackTrace(e);
-                }
             }
         }
         atExitHooks.clear();