[GR-33729] Switch SVM gates from JDK 8 to JDK 17.

PullRequest: graal/9768

Author: pejovica

substratevm/ci_includes/gate.hocon

@@ -18,11 +18,11 @@ gate-svm-js: {
 }
 
 builds += [
-  ${oraclejdk8} ${svm-common-linux-gate} ${gate-svm-js} ${svm-capabilities-base} {
+  ${labsjdk-ce-17} ${svm-common-linux-gate} ${gate-svm-js} ${svm-capabilities-base} {
     name: "gate-svm-js"
     timelimit: "35:00"
   }
-  ${oraclejdk8} ${svm-common-darwin-gate} ${gate-svm-js} {
+  ${labsjdk-ce-17} ${svm-common-darwin-gate} ${gate-svm-js} {
     name: "gate-svm-darwin-js"
   }
   ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
@@ -49,7 +49,7 @@ builds += [
       ${svm-cmd-gate} ["build,hellomodule,test"]
     ]
   }
-  ${oraclejdk8} ${svm-common-linux-gate} ${eclipse} ${jdt} ${linux-deploy} {
+  ${labsjdk-ce-17} ${svm-common-linux-gate} ${eclipse} ${jdt} ${linux-deploy} {
     name: "gate-svm-style-fullbuild"
     timelimit: "45:00"
     environment : {
@@ -60,7 +60,7 @@ builds += [
       ${svm-cmd-gate} ["style,fullbuild,helloworld,test,svmjunit,maven"]
     ]
   }
-  ${oraclejdk8} ${svm-common-gate} ${svm-common-windows-oraclejdk8} {
+  ${labsjdk-ce-17} ${svm-common-gate} ${svm-common-windows-jdk17} {
     name: "gate-svm-windows-basics"
     environment: {
       PATH : "$MVN_HOME;$PATH"  # workaround until GR-10735 is resolved

substratevm/mx.substratevm/mx_substratevm.py

@@ -443,6 +443,12 @@ def native_unittests_task():
         '-H:AdditionalSecurityServiceTypes=com.oracle.svm.test.SecurityServiceTest$JCACompliantNoOpService'
     ]
 
+    if svm_java_compliance() == '17':
+        # The following tests fail with --builder-on-modulepath enabled (GR-34117)
+        mx_unittest.add_global_ignore_glob('com.oracle.svm.test.jdk11.jfr.*')
+        if mx.is_windows():
+            mx_unittest.add_global_ignore_glob('com.oracle.svm.test.SecurityServiceTest')
+
     native_unittest(['--builder-on-modulepath', '--build-args', _native_unittest_features] + additional_build_args)
 
 

substratevm/mx.substratevm/suite.py

@@ -247,10 +247,7 @@
         "com.oracle.svm.core.jdk15": {
             "subDir": "src",
             "sourceDirs": ["src"],
-            "dependencies": [
-                "com.oracle.svm.core",
-                "com.oracle.svm.core.jdk11"
-            ],
+            "dependencies": ["com.oracle.svm.core.jdk11"],
             "requiresConcealed" : {
                 "java.base" : [
                     "jdk.internal.loader",

substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/JavaLangSubstitutions_JDK11OrLater.java

@@ -54,7 +54,7 @@ final class Target_jdk_internal_loader_BootLoader_JDK11OrLater {
     static Package getDefinedPackage(String name) {
         if (name != null) {
             Target_java_lang_Package pkg = new Target_java_lang_Package(name, null, null, null,
-                    null, null, null, null, null);
+                            null, null, null, null, null);
             return SubstrateUtil.cast(pkg, Package.class);
         } else {
             return null;
@@ -90,8 +90,8 @@ private static boolean hasClassPath() {
 
     /**
      * All ClassLoaderValue are reset at run time for now. See also
-     * {@link Target_java_lang_ClassLoader_JDK11OrLater#classLoaderValueMap} for resetting of individual class
-     * loaders.
+     * {@link Target_java_lang_ClassLoader_JDK11OrLater#classLoaderValueMap} for resetting of
+     * individual class loaders.
      */
     // Checkstyle: stop
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = ConcurrentHashMap.class)//

substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/ModuleUtil.java

@@ -105,7 +105,7 @@ public static void checkIsPackageContainedInModule(String pn, Module module) {
             Module actualModule = namedPackage.module;
             if (!actualModule.equals(module)) {
                 throw new IllegalArgumentException("Package " + pn + " found in module " + actualModule.getName() +
-                        ", not in module: " + module.getName());
+                                ", not in module: " + module.getName());
             }
         }
         if (!module.getPackages().contains(pn)) {
@@ -115,23 +115,23 @@ public static void checkIsPackageContainedInModule(String pn, Module module) {
 
     public static List<String> getPackagesDefinedToLoader(ClassLoader loader) {
         return getDefinedModules().getOrDefault(loader, Set.of())
-                .stream()
-                .flatMap(m -> m.getPackages().stream())
-                .collect(Collectors.toUnmodifiableList());
+                        .stream()
+                        .flatMap(m -> m.getPackages().stream())
+                        .collect(Collectors.toUnmodifiableList());
     }
 
     public static Object getModuleContainingPackage(ClassLoader loader, String pn) {
         return getDefinedModules().getOrDefault(loader, Set.of())
-                .stream()
-                .filter(m -> m.getPackages().contains(pn))
-                .findFirst().orElse(null);
+                        .stream()
+                        .filter(m -> m.getPackages().contains(pn))
+                        .findFirst().orElse(null);
     }
 
     public static boolean bootLayerContainsModule(String name) {
         return ModuleLayer.boot().modules().stream().anyMatch(m -> m.getName().equals(name));
     }
 
-    //Checkstyle: allow synchronization
+    // Checkstyle: allow synchronization
     public static void defineModule(Module module, boolean isOpen, List<String> pns) {
         if (Objects.isNull(module)) {
             throw new NullPointerException("Null module object");
@@ -178,7 +178,7 @@ public static void defineModule(Module module, boolean isOpen, List<String> pns)
 
             if (loader != ClassLoader.getPlatformClassLoader() && ModuleUtil.isPackageNameForbidden(pn)) {
                 throw new IllegalArgumentException("Class loader (instance of): " + loader.getClass().getName() +
-                        " tried to define prohibited package name: " + pn);
+                                " tried to define prohibited package name: " + pn);
             }
         }
 
@@ -202,11 +202,9 @@ public static void defineModule(Module module, boolean isOpen, List<String> pns)
         } else if (Objects.nonNull(definedPackage)) {
             Module moduleContainingDefinedPackage = SubstrateUtil.cast(ModuleUtil.getModuleContainingPackage(loader, definedPackage), Module.class);
             if (moduleContainingDefinedPackage.isNamed()) {
-                throw new IllegalStateException("Package " + definedPackage + " is already in another module, "
-                        + moduleContainingDefinedPackage.getName() + ", defined to the class loader");
+                throw new IllegalStateException("Package " + definedPackage + " is already in another module, " + moduleContainingDefinedPackage.getName() + ", defined to the class loader");
             } else {
-                throw new IllegalStateException("Package " + definedPackage
-                        + " is already in the unnamed module defined to the class loader");
+                throw new IllegalStateException("Package " + definedPackage + " is already in the unnamed module defined to the class loader");
             }
         }
 

substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java

@@ -38,7 +38,7 @@
 @TargetClass(value = Module.class, onlyWith = JDK15OrLater.class)
 public final class Target_java_lang_Module_JDK15OrLater {
 
-    //Checkstyle: allow synchronization
+    // Checkstyle: allow synchronization
     @Substitute
     private static void defineModule0(Module module, boolean isOpen, String version, String location, Object[] pns) {
         if (Arrays.stream(pns).anyMatch(Objects::isNull)) {

substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java

@@ -47,6 +47,7 @@ public static boolean get() {
     private static boolean jvmVersionSupported() {
         return JavaVersionUtil.JAVA_SPEC == 11 || JavaVersionUtil.JAVA_SPEC == 16 || JavaVersionUtil.JAVA_SPEC == 17;
     }
+
     private static boolean osSupported() {
         return OS.getCurrent() == OS.LINUX || OS.getCurrent() == OS.DARWIN;
     }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/JVMFuncFallbackTest.java

@@ -40,10 +40,10 @@ public class JVMFuncFallbackTest {
     public void testImageCodeMethods() {
         if (Boolean.getBoolean("never.be.true.but.compiler.doesn't.know")) {
             /*
-             * Cause image to link to JVM_Clone. This will trigger a linker error if libjvm.a does
-             * not contain the autogenerated JVM_* fallbacks.
+             * Cause image to link to JVM_IHashCode. This will trigger a linker error if libjvm.a
+             * does not contain the autogenerated JVM_* fallbacks.
              */
-            Jvm.JVM_Clone(WordFactory.nullPointer());
+            Jvm.JVM_IHashCode(WordFactory.nullPointer());
         }
     }
 }
@@ -52,5 +52,5 @@ public void testImageCodeMethods() {
 @CLibrary(value = "jvm", requireStatic = true)
 class Jvm {
     @CFunction(transition = CFunction.Transition.NO_TRANSITION)
-    public static native int JVM_Clone(Pointer jni);
+    public static native int JVM_IHashCode(Pointer jni);
 }