Resolved review comments.

Author: tzezula

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/JFRPartialEvaluationTest.java

@@ -56,7 +56,16 @@ public void testException() throws IOException, InterruptedException {
     }
 
     private void performTestException() {
-        RootTestNode root = new RootTestNode(new FrameDescriptor(), "NewException", new NewTruffleExceptionNode());
+        RootTestNode root = new RootTestNode(new FrameDescriptor(), "NewException", new AbstractTestNode() {
+            @Override
+            public int execute(VirtualFrame frame) {
+                try {
+                    throw new TruffleExceptionImpl(42);
+                } catch (TruffleExceptionImpl e) {
+                    return e.value;
+                }
+            }
+        });
         if (Runtime.version().feature() < 22) {
             Class<?> throwableTracer = findThrowableTracerClass();
             ResolvedJavaMethod traceThrowable = getResolvedJavaMethod(throwableTracer, "traceThrowable");
@@ -72,6 +81,15 @@ private void performTestException() {
         }
     }
 
+    @SuppressWarnings("serial")
+    private static final class TruffleExceptionImpl extends AbstractTruffleException {
+        final int value;
+
+        TruffleExceptionImpl(int value) {
+            this.value = value;
+        }
+    }
+
     private static Class<?> findThrowableTracerClass() {
         try {
             return Class.forName("jdk.jfr.internal.instrument.ThrowableTracer");
@@ -86,7 +104,16 @@ public void testError() throws IOException, InterruptedException {
     }
 
     private void performTestError() {
-        RootTestNode root = new RootTestNode(new FrameDescriptor(), "NewError", new NewErrorNode());
+        RootTestNode root = new RootTestNode(new FrameDescriptor(), "NewError", new AbstractTestNode() {
+            @Override
+            public int execute(VirtualFrame frame) {
+                try {
+                    throw new ErrorImpl(42);
+                } catch (ErrorImpl e) {
+                    return e.value;
+                }
+            }
+        });
         if (Runtime.version().feature() < 22) {
             Class<?> throwableTracer = findThrowableTracerClass();
             ResolvedJavaMethod traceThrowable = getResolvedJavaMethod(throwableTracer, "traceThrowable");
@@ -104,6 +131,22 @@ private void performTestError() {
         }
     }
 
+    @SuppressWarnings("serial")
+    private static final class ErrorImpl extends Error {
+
+        final int value;
+
+        ErrorImpl(int value) {
+            this.value = value;
+        }
+
+        @Override
+        @SuppressWarnings("sync-override")
+        public Throwable fillInStackTrace() {
+            return this;
+        }
+    }
+
     @Test
     public void testJFREvent() throws IOException, InterruptedException {
         runInSubprocessWithJFREnabled(this::performTestJFREvent);
@@ -112,7 +155,16 @@ public void testJFREvent() throws IOException, InterruptedException {
     private void performTestJFREvent() {
         ResolvedJavaMethod shouldCommit = getResolvedJavaMethod(TestEvent.class, "shouldCommit");
         ResolvedJavaMethod commit = getResolvedJavaMethod(TestEvent.class, "commit");
-        RootTestNode root = new RootTestNode(new FrameDescriptor(), "JFREvent", new JFREventNode());
+        RootTestNode root = new RootTestNode(new FrameDescriptor(), "JFREvent", new AbstractTestNode() {
+            @Override
+            public int execute(VirtualFrame frame) {
+                TestEvent event = new TestEvent();
+                if (event.shouldCommit()) {
+                    event.commit();
+                }
+                return 1;
+            }
+        });
         OptimizedCallTarget callTarget = (OptimizedCallTarget) root.getCallTarget();
         StructuredGraph graph = partialEval(callTarget, new Object[0]);
         // Calls to JFR event methods must not be inlined.
@@ -122,6 +174,10 @@ private void performTestJFREvent() {
         assertTrue("The number of graal nodes for an exception instantiation exceeded 100.", graph.getNodeCount() < 100);
     }
 
+    @Name("test.JFRPartialEvaluationTestEvent")
+    private static class TestEvent extends Event {
+    }
+
     private static MethodCallTargetNode findInvoke(StructuredGraph graph, ResolvedJavaMethod expectedMethod) {
         for (MethodCallTargetNode node : graph.getNodes(MethodCallTargetNode.TYPE)) {
             ResolvedJavaMethod targetMethod = node.targetMethod();
@@ -156,69 +212,4 @@ private static void runInSubprocessWithJFREnabled(Runnable action) throws IOExce
             }
         }
     }
-
-    private static final class NewTruffleExceptionNode extends AbstractTestNode {
-
-        @Override
-        public int execute(VirtualFrame frame) {
-            try {
-                throw new TruffleExceptionImpl(42);
-            } catch (TruffleExceptionImpl e) {
-                return e.value;
-            }
-        }
-
-        @SuppressWarnings("serial")
-        private static final class TruffleExceptionImpl extends AbstractTruffleException {
-            final int value;
-
-            TruffleExceptionImpl(int value) {
-                this.value = value;
-            }
-        }
-    }
-
-    private static final class NewErrorNode extends AbstractTestNode {
-
-        @Override
-        public int execute(VirtualFrame frame) {
-            try {
-                throw new ErrorImpl(42);
-            } catch (ErrorImpl e) {
-                return e.value;
-            }
-        }
-
-        @SuppressWarnings("serial")
-        private static final class ErrorImpl extends Error {
-
-            final int value;
-
-            ErrorImpl(int value) {
-                this.value = value;
-            }
-
-            @Override
-            @SuppressWarnings("sync-override")
-            public Throwable fillInStackTrace() {
-                return this;
-            }
-        }
-    }
-
-    private static final class JFREventNode extends AbstractTestNode {
-
-        @Override
-        public int execute(VirtualFrame frame) {
-            TestEvent event = new TestEvent();
-            if (event.shouldCommit()) {
-                event.commit();
-            }
-            return 1;
-        }
-    }
-
-    @Name("test.JFRPartialEvaluationTestEvent")
-    private static class TestEvent extends Event {
-    }
 }