[GR-18483] Fix non-libgraal image building issues on jdk11.

PullRequest: graal/4482
MFrank2016 · Oct 2, 2019 · 43c34a6 · 43c34a6
2 parents e983e6d + c3805d8
commit 43c34a6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 165 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -709,21 +709,15 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management.jdk11" : {
+    "org.graalvm.compiler.management" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "org.graalvm.compiler.serviceprovider.jdk11",
-        "org.graalvm.compiler.hotspot.management",
+        "org.graalvm.compiler.serviceprovider",
       ],
-      "requiresConcealed" : {
-        "jdk.internal.vm.ci" : ["jdk.vm.ci.hotspot"],
-      },
       "requires" : [
         "jdk.management",
       ],
-      "overlayTarget" : "org.graalvm.compiler.hotspot.management",
-      "multiReleaseJarVersion" : "11",
       "checkstyle" : "org.graalvm.compiler.graph",
       "annotationProcessors" : [
         "GRAAL_SERVICEPROVIDER_PROCESSOR",
@@ -732,29 +726,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management.jdk13" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.serviceprovider.jdk13",
-        "org.graalvm.compiler.hotspot.management",
-      ],
-      "requires" : [
-        "jdk.management",
-      ],
-      "requiresConcealed" : {
-        "jdk.internal.vm.ci" : ["jdk.vm.ci.hotspot"],
-      },
-      "overlayTarget" : "org.graalvm.compiler.hotspot.management",
-      "multiReleaseJarVersion" : "13",
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : [
-        "GRAAL_SERVICEPROVIDER_PROCESSOR",
-      ],
-      "javaCompliance" : "13+",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "org.graalvm.compiler.hotspot.management.libgraal" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -2622,6 +2593,7 @@
       },
       "subDir" : "src",
       "dependencies" : [
+        "org.graalvm.compiler.management",
         "org.graalvm.compiler.hotspot.management",
       ],
       "distDependencies" : [

diff --git a/...g.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/...g.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
@@ -432,6 +432,8 @@ private static List<Class<?>> initializeClasses(InvariantsTool tool, List<String
             try {
                 Class<?> c = Class.forName(className, true, CheckGraalInvariants.class.getClassLoader());
                 classes.add(c);
+            } catch (UnsupportedClassVersionError e) {
+                // graal-test.jar can contain classes compiled for different Java versions
             } catch (Throwable t) {
                 tool.handleClassLoadingException(t);
             }

diff --git a/...er.hotspot.management.jdk11/src/org/graalvm/compiler/hotspot/management/package-info.java b/...er.hotspot.management.jdk11/src/org/graalvm/compiler/hotspot/management/package-info.java
diff --git a/...spot.management.jdk13/src/org/graalvm/compiler/hotspot/management/JMXServiceProvider.java b/...spot.management.jdk13/src/org/graalvm/compiler/hotspot/management/JMXServiceProvider.java
diff --git a/...er.hotspot.management.jdk13/src/org/graalvm/compiler/hotspot/management/package-info.java b/...er.hotspot.management.jdk13/src/org/graalvm/compiler/hotspot/management/package-info.java
diff --git a/...otspot/management/JMXServiceProvider.java → ...mpiler/management/JMXServiceProvider.java b/...otspot/management/JMXServiceProvider.java → ...mpiler/management/JMXServiceProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.management;
+package org.graalvm.compiler.management;
 
 import static java.lang.Thread.currentThread;
 
@@ -35,7 +35,7 @@
 import com.sun.management.ThreadMXBean;
 
 /**
- * Implementation of {@link JMXService} for LabsJDK 11.
+ * Implementation of {@link JMXService} for JDK 11+.
  */
 @ServiceProvider(JMXService.class)
 public class JMXServiceProvider extends JMXService {

diff --git a/...t/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/...t/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java
@@ -209,6 +209,9 @@ public void test() {
                                     }
                                     try {
                                         checkClass(metaAccess, getSnippetReflection(), className);
+                                    } catch (UnsupportedClassVersionError e) {
+                                        // graal-test.jar can contain classes compiled for different
+                                        // Java versions
                                     } catch (ClassNotFoundException e) {
                                         throw new AssertionError(e);
                                     }

diff --git a/...ompiler.serviceprovider.jdk11/src/org/graalvm/compiler/serviceprovider/GraalServices.java b/...ompiler.serviceprovider.jdk11/src/org/graalvm/compiler/serviceprovider/GraalServices.java
@@ -250,7 +250,6 @@ public static boolean isToStringTrusted(Class<?> c) {
 
         Module module = c.getModule();
         Module jvmciModule = JVMCI_MODULE;
-        assert jvmciModule.getPackages().contains("jdk.vm.ci.runtime");
         if (module == jvmciModule || jvmciModule.isOpen(JVMCI_RUNTIME_PACKAGE, module)) {
             // Can access non-statically-exported package in JVMCI
             return true;