Show the Java stacktrace for internal errors by default

* This is very useful when something e.g. fails in CI.
* All internal errors are bugs so the concern to spam the user is low here.
* There is no overhead except when about to print the internal error.
* Review and fix usages of isWithJavaStacktrace() to only print a stacktrace
  for internal errors when the value is 1, as documented.

Author: eregon

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

@@ -136,7 +136,7 @@ private static void dump(PythonLanguage language, PythonContext context, Object
             }
 
             if (allThreads) {
-                if (PythonOptions.isWithJavaStacktrace(language)) {
+                if (PythonOptions.isPExceptionWithJavaStacktrace(language)) {
                     PrintWriter err = new PrintWriter(context.getStandardErr());
                     Thread[] ths = context.getThreads();
                     for (Map.Entry<Thread, StackTraceElement[]> e : Thread.getAllStackTraces().entrySet()) {
@@ -165,7 +165,7 @@ protected void perform(ThreadLocalAction.Access access) {
                     }
                 });
             } else {
-                if (PythonOptions.isWithJavaStacktrace(language)) {
+                if (PythonOptions.isPExceptionWithJavaStacktrace(language)) {
                     PrintWriter err = new PrintWriter(context.getStandardErr());
                     err.println();
                     err.println(Thread.currentThread());

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

@@ -42,7 +42,6 @@
 
 import static com.oracle.graal.python.builtins.modules.io.IONodes.T_WRITE;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
-import static com.oracle.graal.python.runtime.exception.ExceptionUtils.printToStdErr;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemExit;
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 
@@ -218,11 +217,7 @@ private void handleJavaException(Throwable e) {
             boolean exitException = InteropLibrary.getUncached().isException(e) && InteropLibrary.getUncached().getExceptionType(e) == ExceptionType.EXIT;
             if (!exitException) {
                 ExceptionUtils.printPythonLikeStackTrace(getContext(), e);
-                boolean withJavaStacktrace = PythonOptions.isWithJavaStacktrace(getPythonLanguage());
-                if (e instanceof AssertionError && !withJavaStacktrace) {
-                    printToStdErr("To get more information about the failed assertion rerun with --python.WithJavaStacktrace=3\n");
-                }
-                if (withJavaStacktrace) {
+                if (PythonOptions.shouldPrintJavaStacktrace(getPythonLanguage(), e)) {
                     e.printStackTrace();
                 }
             }

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

@@ -2191,7 +2191,7 @@ private void shutdownThreads() {
                     boolean exitException = InteropLibrary.getUncached().isException(e) && InteropLibrary.getUncached().getExceptionType(e) == ExceptionType.EXIT;
                     if (!exitException) {
                         ExceptionUtils.printPythonLikeStackTrace(e);
-                        if (PythonOptions.isWithJavaStacktrace(getLanguage())) {
+                        if (PythonOptions.shouldPrintJavaStacktrace(getLanguage(), e)) {
                             e.printStackTrace(new PrintWriter(getStandardErr()));
                         }
                     }

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

@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import com.oracle.truffle.api.exception.AbstractTruffleException;
 import org.graalvm.options.OptionCategory;
 import org.graalvm.options.OptionDescriptor;
 import org.graalvm.options.OptionDescriptors;
@@ -230,11 +231,12 @@ private PythonOptions() {
     @EngineOption @Option(category = OptionCategory.INTERNAL, help = "Eagerly initialize source sections.", usageSyntax = "true|false") //
     public static final OptionKey<Boolean> ForceInitializeSourceSections = new OptionKey<>(false);
 
-    @EngineOption @Option(category = OptionCategory.INTERNAL, help = "Print the java stacktrace. Possible modes:" +
-                    "    1   Print Java stacktrace for Java exceptions only." +
+    @EngineOption @Option(category = OptionCategory.INTERNAL, help = "Print the Java stacktrace for exceptions. Possible modes:" +
+                    "    0   Do not print any Java stacktraces." +
+                    "    1   Print Java stacktrace for Java exceptions only (default)." +
                     "    2   Print Java stacktrace for Python exceptions only (ATTENTION: this will have a notable performance impact)." +
-                    "    3   Combines 1 and 2.", usageSyntax = "1|2|3") //
-    public static final OptionKey<Integer> WithJavaStacktrace = new OptionKey<>(0);
+                    "    3   Combines 1 and 2.", usageSyntax = "0|1|2|3") //
+    public static final OptionKey<Integer> WithJavaStacktrace = new OptionKey<>(1);
 
     @Option(category = OptionCategory.INTERNAL, usageSyntax = "true|false", help = "") //
     public static final OptionKey<Boolean> CatchGraalPythonExceptionForUnitTesting = new OptionKey<>(false);
@@ -522,12 +524,19 @@ public static int getNodeRecursionLimit() {
         return result;
     }
 
-    public static boolean isWithJavaStacktrace(PythonLanguage language) {
-        return language.getEngineOption(WithJavaStacktrace) > 0;
+    public static boolean isPExceptionWithJavaStacktrace(PythonLanguage language) {
+        return language.getEngineOption(WithJavaStacktrace) >= 2;
     }
 
-    public static boolean isPExceptionWithJavaStacktrace(PythonLanguage language) {
-        return language.getEngineOption(WithJavaStacktrace) > 1;
+    public static boolean shouldPrintJavaStacktrace(PythonLanguage language, Throwable throwable) {
+        int mode = language.getEngineOption(WithJavaStacktrace);
+        if (mode == 1) {
+            return !(throwable instanceof AbstractTruffleException);
+        } else if (mode == 2) {
+            return throwable instanceof AbstractTruffleException;
+        } else {
+            return mode == 3;
+        }
     }
 
     @TruffleBoundary

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -133,7 +133,7 @@ public static String format(String format, Object... args) {
     @TruffleBoundary
     private static String getMessage(Throwable exception) {
         String message = exception.getClass().getSimpleName() + ": " + exception.getMessage();
-        if (PythonOptions.isWithJavaStacktrace(PythonLanguage.get(null))) {
+        if (PythonOptions.shouldPrintJavaStacktrace(PythonLanguage.get(null), exception)) {
             StringWriter writer = new StringWriter();
             try (PrintWriter pw = new PrintWriter(writer)) {
                 exception.printStackTrace(pw);