[GR-70700] Leave long properties out of exception messages

PullRequest: graal/22384

Author: tkrodriguez

compiler/mx.compiler/mx_graal_tools.py

@@ -63,7 +63,9 @@ def run_netbeans_app(app_name, jdkhome, args=None, dist=None):
         # Make sure that execution is allowed. The zip file does not always specfiy that correctly
         os.chmod(executable, 0o777)
 
-    launch = [executable]
+    # the current launcher .conf file enables assertions so explicitly disable them until a new IGV
+    # distribution is built
+    launch = [executable, '-J-da']
     if jdkhome:
         launch += ['--jdkhome', jdkhome]
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UncheckedInterfaceProviderTest.java

@@ -98,7 +98,7 @@ public void test() {
         for (BlackholeNode b : graph.getNodes().filter(BlackholeNode.class)) {
             MatcherAssert.assertThat(b.getValue(), is(instanceOf(UncheckedInterfaceProvider.class)));
             Stamp uncheckedStamp = ((UncheckedInterfaceProvider) b.getValue()).uncheckedStamp();
-            String context = b.getValue().toString(Verbosity.Debugger);
+            String context = b.getValue().toString(Verbosity.All);
             Assert.assertNotNull(context, uncheckedStamp);
             ResolvedJavaType uncheckedType = StampTool.typeOrNull(uncheckedStamp);
             ResolvedJavaType type = StampTool.typeOrNull(b.getValue());

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EscapeAnalysisTest.java

@@ -418,8 +418,6 @@ public static void testNewNodeSnippet() {
      */
     @Test
     public void testNewNode() {
-        // Tracking of creation interferes with escape analysis
-        Assume.assumeFalse(Node.TRACK_CREATION_POSITION);
         // JaCoco can add escaping allocations (e.g. allocation of coverage recording data
         // structures)
         Assume.assumeFalse("JaCoCo found -> skipping", SubprocessUtil.isJaCoCoAttached());

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/GraalErrorTest.java

@@ -100,7 +100,7 @@ static int foo(int limit) {
 
     // run with -Dtest.GraalErrorTest.stdout=true to inspect how error messages are formatted
     @Test
-    public void testErrorExampels() {
+    public void testErrorExamples() {
         StructuredGraph g = parseEager("foo", StructuredGraph.AllowAssumptions.NO);
 
         FixedNode loopBeginNode = g.getNodes(LoopBeginNode.TYPE).first();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GraalError.java

@@ -39,6 +39,9 @@ public class GraalError extends Error {
     private static final long serialVersionUID = 531632331813456233L;
     private final ArrayList<String> context = new ArrayList<>();
 
+    private final transient Object[] arguments;
+    private final String rawFormat;
+
     public static RuntimeException unimplemented(String msg) {
         throw new GraalError("unimplemented: %s", msg);
     }
@@ -246,6 +249,8 @@ public static void guarantee(boolean condition, String msg, Object... args) {
      */
     public GraalError(String msg) {
         super(msg);
+        this.rawFormat = msg;
+        this.arguments = null;
     }
 
     /**
@@ -260,6 +265,8 @@ public GraalError(String msg) {
     @SuppressWarnings("this-escape")
     public GraalError(String msg, Object... args) {
         super(format(msg, args));
+        this.rawFormat = msg;
+        this.arguments = args;
         potentiallyAddContext(args);
     }
 
@@ -270,6 +277,8 @@ public GraalError(String msg, Object... args) {
      */
     public GraalError(Throwable cause) {
         super(cause);
+        this.rawFormat = null;
+        this.arguments = null;
     }
 
     /**
@@ -279,9 +288,27 @@ public GraalError(Throwable cause) {
     @SuppressWarnings("this-escape")
     public GraalError(Throwable cause, String msg, Object... args) {
         super(format(msg, args), cause);
+        this.rawFormat = msg;
+        this.arguments = args;
         potentiallyAddContext(args);
     }
 
+    /**
+     * Return the raw format String passed into the constructor.
+     */
+    public String getRawFormat() {
+        return rawFormat;
+    }
+
+    /**
+     * Return the arguments passed into the constructor, with {@link Iterable} arguments expanded
+     * into a {@link List}. The expansion is performed by {@link #format(String, Object...)} when it
+     * formats the message for the constructor.
+     */
+    public Object[] getArguments() {
+        return arguments;
+    }
+
     private void potentiallyAddContext(Object[] args) {
         // be pessimistic here and ensure better reporting never causes a follow up error that is
         // unhandled
@@ -332,6 +359,8 @@ private static String potentialBetterString(Object o) {
     public GraalError(GraalError e) {
         super(e);
         context.addAll(e.context);
+        this.rawFormat = null;
+        this.arguments = null;
     }
 
     public static GraalError asGraalError(Throwable t) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraalGraphError.java

@@ -99,7 +99,7 @@ public GraalGraphError addContext(Node newNode) {
             String nodeMessage;
             try {
                 // Provide more detail about the node.
-                nodeMessage = newNode.toString(Verbosity.Debugger);
+                nodeMessage = newNode.toString(Verbosity.All);
             } catch (Throwable t) {
                 nodeMessage = newNode.toString();
             }