[GR-40164] Include Java exception stack traces in wrapped Java exceptions if WithJavaStacktrace is set, and few other minor improvements.

steve-s · steve-s · commit 8ab868d7f834 · 2022-08-04T16:19:00.000Z
PullRequest: graalpython/2371
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py b/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py
@@ -83,6 +83,8 @@ def test_tagged():
         if "-debug-java" in sys.argv:
             cmd.append("-debug-java")
         cmd += [RUNNER]
+        if "-vv" in sys.argv:
+            cmd += ['-v']
         for testpattern in working_test[1]:
             cmd.extend(["-k", testpattern])
         print("Running test:", working_test[0])
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
@@ -2561,7 +2561,7 @@ public abstract static class BaseExceptionNode extends PythonVarargsBuiltinNode
         public final Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
             if (arguments.length == 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new VarargsBuiltinDirectInvocationNotSupported();
+                throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
             }
             if (arguments.length == 1) {
                 return initNoArgs(arguments[0], PythonUtils.EMPTY_OBJECT_ARRAY, keywords);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CollectionsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CollectionsModuleBuiltins.java
@@ -94,7 +94,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,
                 return doGeneric(arguments[0], null, null);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new VarargsBuiltinDirectInvocationNotSupported();
+            throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
         }
 
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java
@@ -212,7 +212,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,
                 return socket(arguments[0]);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new VarargsBuiltinDirectInvocationNotSupported();
+            throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyObjectBuiltins.java
@@ -142,7 +142,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,
                 return doGeneric(frame, self, arguments, keywords);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new VarargsBuiltinDirectInvocationNotSupported();
+            throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
         }
 
         @Specialization
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
@@ -124,7 +124,7 @@ public final Object execute(PBaseException self, Object[] args) {
         public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
             if (arguments.length == 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new VarargsBuiltinDirectInvocationNotSupported();
+                throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
             }
             if (splitArgsNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/ImportErrorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/ImportErrorBuiltins.java
@@ -118,7 +118,7 @@ public abstract static class ImportErrorInitNode extends PythonVarargsBuiltinNod
         public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
             if (arguments.length == 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new VarargsBuiltinDirectInvocationNotSupported();
+                throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
             }
             if (splitArgsNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/StopIterationBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/StopIterationBuiltins.java
@@ -80,7 +80,7 @@ public abstract static class StopIterationInitNode extends PythonVarargsBuiltinN
         public final Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) {
             if (arguments.length == 0 || keywords.length != 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new VarargsBuiltinDirectInvocationNotSupported();
+                throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
             }
             if (splitArgsNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/StructSequence.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/StructSequence.java
@@ -309,7 +309,7 @@ public final Object varArgExecute(VirtualFrame frame, Object self, Object[] argu
                 return error(arguments[0], PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new VarargsBuiltinDirectInvocationNotSupported();
+            throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
         }
 
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonVarargsBuiltinNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonVarargsBuiltinNode.java
@@ -52,7 +52,11 @@
  */
 public abstract class PythonVarargsBuiltinNode extends PythonBuiltinBaseNode {
     public static final class VarargsBuiltinDirectInvocationNotSupported extends ControlFlowException {
+        public static final VarargsBuiltinDirectInvocationNotSupported INSTANCE = new VarargsBuiltinDirectInvocationNotSupported();
         private static final long serialVersionUID = 1L;
+
+        private VarargsBuiltinDirectInvocationNotSupported() {
+        }
     }
 
     /**
@@ -61,7 +65,7 @@ public static final class VarargsBuiltinDirectInvocationNotSupported extends Con
     @SuppressWarnings("unused")
     public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords)
                     throws VarargsBuiltinDirectInvocationNotSupported {
-        throw new VarargsBuiltinDirectInvocationNotSupported();
+        throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;
     }
 
     /**
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java
@@ -40,12 +40,16 @@
  */
 package com.oracle.graal.python.runtime.formatting;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Formatter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -128,7 +132,15 @@ public String format(String format, Object... args) {
 
     @TruffleBoundary
     private static String getMessage(Throwable exception) {
-        return exception.getClass().getSimpleName() + ": " + exception.getMessage();
+        String message = exception.getClass().getSimpleName() + ": " + exception.getMessage();
+        if (PythonOptions.isWithJavaStacktrace(PythonLanguage.get(null))) {
+            StringWriter writer = new StringWriter();
+            try (PrintWriter pw = new PrintWriter(writer)) {
+                exception.printStackTrace(pw);
+            }
+            message += "\n\nJava stack trace:\n" + writer;
+        }
+        return message;
     }
 
     private static String getClassName(Object obj) {
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -2449,5 +2449,6 @@ def inner(*args, **kwargs):
     'clean': [python_clean, ''],
     'python-update-hpy-import': [update_hpy_import_cmd, '[--no-pull] PATH_TO_HPY'],
     'bisect-benchmark': [mx_graalpython_bisect.bisect_benchmark, ''],
-    'python-leak-test': [run_leak_launcher, '']
+    'python-leak-test': [run_leak_launcher, ''],
+    'python-checkcopyrights': [python_checkcopyrights, '[--fix]'],
 })

Original file line number	Diff line number	Diff line change
`@@ -2561,7 +2561,7 @@ public abstract static class BaseExceptionNode extends PythonVarargsBuiltinNode`
`2561`	`2561`	`public final Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {`
`2562`	`2562`	`if (arguments.length == 0) {`
`2563`	`2563`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`2564`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`2564`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`2565`	`2565`	`}`
`2566`	`2566`	`if (arguments.length == 1) {`
`2567`	`2567`	`return initNoArgs(arguments[0], PythonUtils.EMPTY_OBJECT_ARRAY, keywords);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,`
`94`	`94`	`return doGeneric(arguments[0], null, null);`
`95`	`95`	`}`
`96`	`96`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`97`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`97`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Specialization`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,`
`212`	`212`	`return socket(arguments[0]);`
`213`	`213`	`}`
`214`	`214`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`215`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`215`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments,`
`142`	`142`	`return doGeneric(frame, self, arguments, keywords);`
`143`	`143`	`}`
`144`	`144`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`145`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`145`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`@Specialization`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public final Object execute(PBaseException self, Object[] args) {`
`124`	`124`	`public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {`
`125`	`125`	`if (arguments.length == 0) {`
`126`	`126`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`127`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`127`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`128`	`128`	`}`
`129`	`129`	`if (splitArgsNode == null) {`
`130`	`130`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public abstract static class ImportErrorInitNode extends PythonVarargsBuiltinNod`
`118`	`118`	`public Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {`
`119`	`119`	`if (arguments.length == 0) {`
`120`	`120`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`121`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`121`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`122`	`122`	`}`
`123`	`123`	`if (splitArgsNode == null) {`
`124`	`124`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public abstract static class StopIterationInitNode extends PythonVarargsBuiltinN`
`80`	`80`	`public final Object varArgExecute(VirtualFrame frame, Object self, Object[] arguments, PKeyword[] keywords) {`
`81`	`81`	`if (arguments.length == 0 \|\| keywords.length != 0) {`
`82`	`82`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`83`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`83`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`84`	`84`	`}`
`85`	`85`	`if (splitArgsNode == null) {`
`86`	`86`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public final Object varArgExecute(VirtualFrame frame, Object self, Object[] argu`
`309`	`309`	`return error(arguments[0], PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS);`
`310`	`310`	`}`
`311`	`311`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`312`		`- throw new VarargsBuiltinDirectInvocationNotSupported();`
	`312`	`+ throw VarargsBuiltinDirectInvocationNotSupported.INSTANCE;`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`@Specialization`