[GR-42727] Switch SVM gates from JDK 19 to JDK 20.

pejovica · tkrodriguez · commit 5debbd870f2c · 2022-12-30T14:10:32.000-08:00
PullRequest: graal/13455
diff --git a/substratevm/ci/ci.jsonnet b/substratevm/ci/ci.jsonnet
@@ -53,7 +53,6 @@
   // JDKs
   local jdk_name_to_dict = {
     "jdk17"+: common.labsjdk17,
-    "jdk19"+: common.labsjdk19,
     "jdk20"+: common.labsjdk20,
   },
 
@@ -80,6 +79,7 @@
 
   local all_jobs = {
     "windows:aarch64"+: exclude,
+    "*:*:jdk19"+: exclude,
   },
   local no_jobs = all_jobs {
     "*"+: exclude,
@@ -112,7 +112,7 @@
       "linux:amd64:jdk20": gate + t("30:00"),
     }),
     "basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
-      "linux:amd64:jdk19": gate + gdb("10.2") + t("55:00"),
+      "linux:amd64:jdk20": gate + gdb("10.2") + t("55:00"),
       "windows:amd64:jdk17": gate + t("1:30:00"),
     }) + variants({
       "optlevel:quickbuild": {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK19OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK19OrEarlier.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022, 2022, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jdk;
+
+import java.util.function.BooleanSupplier;
+
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+
+public class JDK19OrEarlier implements BooleanSupplier {
+    @Override
+    public boolean getAsBoolean() {
+        return JavaVersionUtil.JAVA_SPEC <= 19;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK20OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK20OrLater.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022, 2022, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jdk;
+
+import java.util.function.BooleanSupplier;
+
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+
+public class JDK20OrLater implements BooleanSupplier {
+    @Override
+    public boolean getAsBoolean() {
+        return JavaVersionUtil.JAVA_SPEC >= 20;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java
@@ -25,6 +25,7 @@
 package com.oracle.svm.core.jfr;
 
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.UnsignedWord;
@@ -135,8 +136,11 @@ private void persistBuffers(JfrChunkWriter chunkWriter) {
             if (isFullEnough(buffer)) {
                 boolean shouldNotify = persistBuffer(chunkWriter, buffer);
                 if (shouldNotify) {
-                    synchronized (Target_jdk_jfr_internal_JVM.FILE_DELTA_CHANGE) {
-                        Target_jdk_jfr_internal_JVM.FILE_DELTA_CHANGE.notifyAll();
+                    Object chunkRotationMonitor = JavaVersionUtil.JAVA_SPEC >= 20
+                                    ? Target_jdk_jfr_internal_JVM.CHUNK_ROTATION_MONITOR
+                                    : Target_jdk_jfr_internal_JVM.FILE_DELTA_CHANGE;
+                    synchronized (chunkRotationMonitor) {
+                        chunkRotationMonitor.notifyAll();
                     }
                 }
             }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java
@@ -37,7 +37,9 @@
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrLater;
+import com.oracle.svm.core.jdk.JDK19OrEarlier;
 import com.oracle.svm.core.jdk.JDK19OrLater;
+import com.oracle.svm.core.jdk.JDK20OrLater;
 import com.oracle.svm.core.jfr.traceid.JfrTraceId;
 import com.oracle.svm.core.util.VMError;
 
@@ -49,7 +51,11 @@
 @TargetClass(value = jdk.jfr.internal.JVM.class, onlyWith = HasJfrSupport.class)
 public final class Target_jdk_jfr_internal_JVM {
     // Checkstyle: stop
-    @Alias static Object FILE_DELTA_CHANGE;
+    @Alias @TargetElement(onlyWith = JDK20OrLater.class) //
+    static Object CHUNK_ROTATION_MONITOR;
+
+    @Alias @TargetElement(onlyWith = JDK19OrEarlier.class) //
+    static Object FILE_DELTA_CHANGE;
     // Checkstyle: resume
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_java_lang_reflect_Executable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_java_lang_reflect_Executable.java
@@ -38,11 +38,19 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK19OrEarlier;
+import com.oracle.svm.core.jdk.JDK20OrLater;
 import com.oracle.svm.core.reflect.ReflectionMetadataDecoder;
 
 @TargetClass(value = Executable.class)
 public final class Target_java_lang_reflect_Executable {
 
+    @TargetElement(onlyWith = JDK20OrLater.class)//
+    @Alias @RecomputeFieldValue(kind = Kind.Reset)//
+    Target_java_lang_reflect_Executable_ParameterData parameterData;
+
+    @TargetElement(onlyWith = JDK19OrEarlier.class)//
     @Alias @RecomputeFieldValue(kind = Kind.Reset)//
     Parameter[] parameters;
 
@@ -72,3 +80,7 @@ public Object transform(Object receiver, Object originalValue) {
         }
     }
 }
+
+@TargetClass(value = Executable.class, innerClass = "ParameterData", onlyWith = JDK20OrLater.class)
+final class Target_java_lang_reflect_Executable_ParameterData {
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java
@@ -28,6 +28,9 @@
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK19OrEarlier;
+import com.oracle.svm.core.jdk.JDK20OrLater;
 import com.oracle.svm.core.reflect.serialize.SerializationRegistry;
 
 @TargetClass(className = "jdk.internal.reflect.AccessorGenerator")
@@ -37,8 +40,18 @@ public final class Target_jdk_internal_reflect_AccessorGenerator {
 @TargetClass(className = "jdk.internal.reflect.MethodAccessorGenerator")
 final class Target_jdk_internal_reflect_MethodAccessorGenerator {
 
+    @Substitute
+    @TargetElement(onlyWith = JDK20OrLater.class)
+    public Target_jdk_internal_reflect_SerializationConstructorAccessorImpl generateSerializationConstructor(Class<?> declaringClass,
+                    @SuppressWarnings("unused") Class<?>[] parameterTypes,
+                    @SuppressWarnings("unused") int modifiers,
+                    Class<?> targetConstructorClass) {
+        return generateSerializationConstructor(declaringClass, parameterTypes, null, modifiers, targetConstructorClass);
+    }
+
     @SuppressWarnings("static-method")
     @Substitute
+    @TargetElement(onlyWith = JDK19OrEarlier.class)
     public Target_jdk_internal_reflect_SerializationConstructorAccessorImpl generateSerializationConstructor(Class<?> declaringClass,
                     @SuppressWarnings("unused") Class<?>[] parameterTypes,
                     @SuppressWarnings("unused") Class<?>[] checkedExceptions,
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationsFeature.java
@@ -46,7 +46,7 @@ public class ContinuationsFeature implements InternalFeature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         boolean supportLoom = false;
-        if (JavaVersionUtil.JAVA_SPEC == 19) {
+        if (JavaVersionUtil.JAVA_SPEC >= 19) {
             boolean haveLoom = false;
             try {
                 haveLoom = (Boolean) Class.forName("jdk.internal.misc.PreviewFeatures")
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
@@ -54,6 +54,7 @@
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrEarlier;
 import com.oracle.svm.core.jdk.JDK17OrLater;
+import com.oracle.svm.core.jdk.JDK19OrEarlier;
 import com.oracle.svm.core.jdk.JDK19OrLater;
 import com.oracle.svm.core.jdk.LoomJDK;
 import com.oracle.svm.core.jdk.NotLoomJDK;
@@ -483,18 +484,21 @@ void interrupt0() {
     }
 
     @Substitute
+    @TargetElement(onlyWith = JDK19OrEarlier.class)
     @SuppressWarnings({"static-method"})
     private void stop0(Object o) {
         throw VMError.unsupportedFeature("The deprecated method Thread.stop is not supported");
     }
 
     @Substitute
+    @TargetElement(onlyWith = JDK19OrEarlier.class)
     @SuppressWarnings({"static-method"})
     private void suspend0() {
         throw VMError.unsupportedFeature("The deprecated method Thread.suspend is not supported");
     }
 
     @Substitute
+    @TargetElement(onlyWith = JDK19OrEarlier.class)
     @SuppressWarnings({"static-method"})
     private void resume0() {
         throw VMError.unsupportedFeature("The deprecated method Thread.resume is not supported");
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java
@@ -38,6 +38,8 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK20OrLater;
 import com.oracle.svm.core.jdk.LoomJDK;
 import com.oracle.svm.core.monitor.MonitorSupport;
 import com.oracle.svm.core.util.VMError;
@@ -66,6 +68,18 @@ public final class Target_java_lang_VirtualThread {
     private static void registerNatives() {
     }
 
+    @Substitute
+    @TargetElement(onlyWith = JDK20OrLater.class)
+    @SuppressWarnings({"static-method", "unused"})
+    private void notifyJvmtiHideFrames(boolean hide) {
+        /*
+         * Unfortunately, resetting the `notifyJvmtiEvents` field is not enough to completely remove
+         * calls to this method due to the way it's used from the `switchToVirtualThread` method, so
+         * unlike the other `notifyJvmti*` methods, we need a substitution to prevent linker errors.
+         */
+        throw VMError.shouldNotReachHere();
+    }
+
     @Alias Executor scheduler;
 
     @Alias volatile Thread carrierThread;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java
@@ -38,6 +38,7 @@
 import java.util.stream.Stream;
 
 import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
@@ -510,6 +511,10 @@ public List<String> getCommand() {
             cmd.add("secur32.lib");
             cmd.add("iphlpapi.lib");
             cmd.add("userenv.lib");
+            if (JavaVersionUtil.JAVA_SPEC >= 20) {
+                /* JDK-8295231 removed implicit linking via pragma directives in source files. */
+                cmd.add("mswsock.lib");
+            }
 
             if (SubstrateOptions.EnableWildcardExpansion.getValue() && imageKind == AbstractImage.NativeImageKind.EXECUTABLE) {
                 /*
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java
@@ -211,7 +211,10 @@ private static void registerNetworkInterfaceInit(DuringAnalysisAccess a) {
         RuntimeJNIAccess.register(constructor(a, "java.net.NetworkInterface"));
         RuntimeJNIAccess.register(fields(a, "java.net.NetworkInterface", "name", "displayName", "index", "addrs", "bindings", "childs"));
         if (isPosix()) {
-            RuntimeJNIAccess.register(fields(a, "java.net.NetworkInterface", "virtual", "parent", "defaultIndex"));
+            RuntimeJNIAccess.register(fields(a, "java.net.NetworkInterface", "virtual", "parent"));
+            if (JavaVersionUtil.JAVA_SPEC < 20) {
+                RuntimeJNIAccess.register(fields(a, "java.net.NetworkInterface", "defaultIndex"));
+            }
         }
 
         RuntimeJNIAccess.register(constructor(a, "java.net.InterfaceAddress"));
