[GR-51360] Module jdk.jfr not found, required by org.graalvm.polyglot.

PullRequest: graal/16667
oracle · Jan 23, 2024 · cb0f826 · cb0f826
2 parents bb2f3b5 + 7a3c035
commit cb0f826
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -739,12 +739,6 @@ class UniversalDetector {
             "org.graalvm.word",
             "org.graalvm.nativeimage",
             "org.graalvm.collections",
-            # needed for dynamically loading Truffle
-            "java.sql",
-            "java.management",
-            "jdk.unsupported",
-            "jdk.management",
-            "jdk.jfr",
         ],
         "exports" : [
           "org.graalvm.home",

diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -1441,6 +1441,7 @@
           "java.logging",
           "java.management",
           "static jdk.internal.vm.ci",  # JVMCI module is not on the boot layer if not enabled
+          "static jdk.jfr", # JFR is not included in the J9 JVM
         ],
         "exports" : [
           # Qualified exports

diff --git a/.../src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/ProviderImpl.java b/.../src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/ProviderImpl.java
@@ -47,6 +47,14 @@
 public final class ProviderImpl implements EventFactory.Provider {
     @Override
     public EventFactory getEventFactory() {
-        return FlightRecorder.isAvailable() ? new EventFactoryImpl() : null;
+        return hasJFRModule() && supportsJFR() ? new EventFactoryImpl() : null;
+    }
+
+    private static boolean hasJFRModule() {
+        return ModuleLayer.boot().findModule("jdk.jfr").isPresent();
+    }
+
+    private static boolean supportsJFR() {
+        return FlightRecorder.isAvailable();
     }
 }