[GR-38866] [GR-45327] Enable Truffle JFR support for JDK 20 and later.

PullRequest: graal/14406

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java

@@ -40,7 +40,6 @@
 import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.common.inlining.policy.InlineEverythingPolicy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
@@ -120,7 +119,6 @@ public void testStandard() throws IOException {
     @Test
     public void testCompiled() throws IOException {
         Assume.assumeFalse("Crashes on AArch64 (GR-8351)", System.getProperty("os.arch").equalsIgnoreCase("aarch64"));
-        Assume.assumeTrue("JDK-8259360", JavaVersionUtil.JAVA_SPEC < 16);
         ResolvedJavaMethod getMethod = asResolvedJavaMethod(getMethod(ByteBuffer.class, "get", new Class<?>[]{}));
         ResolvedJavaType mbbClass = getMetaAccess().lookupJavaType(MappedByteBuffer.class);
         AssumptionResult<ResolvedJavaMethod> answer = mbbClass.findUniqueConcreteMethod(getMethod);

compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/BoxDeoptimizationTest.java

@@ -24,20 +24,13 @@
  */
 package org.graalvm.compiler.hotspot.test;
 
-import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPEC;
-
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
 public class BoxDeoptimizationTest extends GraalCompilerTest {
 
-    private static void checkJDK() {
-        Assume.assumeTrue(JAVA_SPEC >= 13);
-    }
-
     public static void testIntegerSnippet() {
         Object[] values = {42, -42, new Exception()};
         GraalDirectives.deoptimize();
@@ -47,7 +40,6 @@ public static void testIntegerSnippet() {
 
     @Test
     public void testInteger() {
-        checkJDK();
         test("testIntegerSnippet");
     }
 
@@ -62,7 +54,6 @@ public static void testLongSnippet() {
 
     @Test
     public void testLong() {
-        checkJDK();
         test("testLongSnippet");
     }
 
@@ -75,7 +66,6 @@ public static void testCharSnippet() {
 
     @Test
     public void testChar() {
-        checkJDK();
         test("testCharSnippet");
     }
 
@@ -88,7 +78,6 @@ public static void testShortSnippet() {
 
     @Test
     public void testShort() {
-        checkJDK();
         test("testShortSnippet");
     }
 
@@ -101,7 +90,6 @@ public static void testByteSnippet() {
 
     @Test
     public void testByte() {
-        checkJDK();
         test("testByteSnippet");
     }
 
@@ -114,7 +102,6 @@ public static void testBooleanSnippet() {
 
     @Test
     public void testBoolean() {
-        checkJDK();
         test("testBooleanSnippet");
     }
 }

compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java

@@ -27,9 +27,6 @@
 import java.lang.reflect.Field;
 
 import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 public class UnsafeBooleanAccessTest extends GraalCompilerTest {
@@ -49,13 +46,6 @@ public class UnsafeBooleanAccessTest extends GraalCompilerTest {
         }
     }
 
-    @Before
-    public void testJDK() {
-        // Prior to JDK-8250825, C2 does not support reading a short field via an unaligned
-        // Unsafe.getBoolean, so -Xcomp can crash this test.
-        Assume.assumeTrue(JavaVersionUtil.JAVA_SPEC >= 16);
-    }
-
     public static boolean testGetBooleanSnippet() {
         UNSAFE.putShort(onHeapMemoryBase, onHeapMemoryOffset, (short) 0x0204);
         return UNSAFE.getBoolean(onHeapMemoryBase, onHeapMemoryOffset);

compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java

@@ -459,7 +459,7 @@ private GraphBuilderConfiguration createGraphBuilderConfig(GraphBuilderConfigura
     }
 
     protected void appendParsingNodePlugins(Plugins plugins) {
-        if (JavaVersionUtil.JAVA_SPEC >= 16 && JavaVersionUtil.JAVA_SPEC < 19) {
+        if (JavaVersionUtil.JAVA_SPEC < 19) {
             ResolvedJavaType memorySegmentProxyType = TruffleCompilerEnvironment.get().runtime().resolveType(config.lastTier().providers().getMetaAccess(),
                             "jdk.internal.access.foreign.MemorySegmentProxy");
             for (ResolvedJavaMethod m : memorySegmentProxyType.getDeclaredMethods(false)) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java

@@ -69,7 +69,6 @@
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.util.TypeConversion;
 import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
@@ -323,7 +322,7 @@ private void registerEnclosingMethodInfo(Object[] enclosingMethodInfo) {
     private static final Method getPermittedSubclasses = ReflectionUtil.lookupMethod(true, Class.class, "getPermittedSubclasses");
 
     private Class<?>[] getPermittedSubclasses(MetaAccessProvider metaAccess, Class<?> clazz) {
-        if (JavaVersionUtil.JAVA_SPEC < 17 || (dataBuilder.getEnabledReflectionQueries(clazz) & ALL_PERMITTED_SUBCLASSES_FLAG) == 0) {
+        if ((dataBuilder.getEnabledReflectionQueries(clazz) & ALL_PERMITTED_SUBCLASSES_FLAG) == 0) {
             return null;
         }
         try {
@@ -335,7 +334,7 @@ private Class<?>[] getPermittedSubclasses(MetaAccessProvider metaAccess, Class<?
     }
 
     private Class<?>[] getNestMembers(MetaAccessProvider metaAccess, Class<?> clazz) {
-        if (JavaVersionUtil.JAVA_SPEC < 17 || (dataBuilder.getEnabledReflectionQueries(clazz) & ALL_NEST_MEMBERS_FLAG) == 0) {
+        if ((dataBuilder.getEnabledReflectionQueries(clazz) & ALL_NEST_MEMBERS_FLAG) == 0) {
             return null;
         }
         return filterDeletedClasses(metaAccess, clazz.getNestMembers());
@@ -433,9 +432,6 @@ public void addReflectionExecutableMetadata(MetaAccessProvider metaAccess, Hoste
     private static final Method isFieldTrustedFinal = ReflectionUtil.lookupMethod(true, Field.class, "isTrustedFinal");
 
     private static boolean isTrustedFinal(Field field) {
-        if (JavaVersionUtil.JAVA_SPEC < 17) {
-            return false;
-        }
         try {
             return (boolean) isFieldTrustedFinal.invoke(field);
         } catch (IllegalAccessException | InvocationTargetException e) {

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleJFRFeature.java

@@ -32,9 +32,9 @@
 import org.graalvm.compiler.truffle.runtime.serviceprovider.TruffleRuntimeServices;
 import org.graalvm.nativeimage.ImageSingletons;
 
+import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.jfr.JfrFeature;
-import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.util.UserError;
 
 @AutomaticallyRegisteredFeature
@@ -54,7 +54,10 @@ public void afterRegistration(AfterRegistrationAccess access) {
     }
 
     private static boolean isEnabled() {
-        // The substratevm JFR implementation is not yet stable on the JDK 17, see GR-38866.
-        return ImageSingletons.contains(TruffleFeature.class) && ImageSingletons.contains(JfrFeature.class) && JavaVersionUtil.JAVA_SPEC < 17;
+        /*
+         * GR-38866: Does not work on JDK 17 due to the Truffle module not being open to the JFR
+         * module, but the problematic code was removed for later JDKs.
+         */
+        return ImageSingletons.contains(TruffleFeature.class) && ImageSingletons.contains(JfrFeature.class) && JavaVersionUtil.JAVA_SPEC > 17;
     }
 }