Skip to content

[GR-54918] Rename JDK23OrLater to JDKLatest and remove obsolete predicates #9211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 3, 2024
Merged

[GR-54918] Rename JDK23OrLater to JDKLatest and remove obsolete predicates #9211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd2f3d1
svm: replace JDK22OrEarlier with JDK21OrEarlier
zapster Jun 27, 2024
e39c7cc
svm: replace JDK22OrLater with JDK23OrLater
zapster Jun 27, 2024
1f70504
svm: replace JDK23OrLater with JDKLatest
zapster Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ....foreign/src/com/oracle/svm/core/foreign/Target_jdk_internal_misc_ScopedMemoryAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.oracle.svm.core.annotate.TargetClass;
import com.oracle.svm.core.annotate.TargetElement;
import com.oracle.svm.core.jdk.JDK21OrEarlier;
import com.oracle.svm.core.jdk.JDK22OrLater;
import com.oracle.svm.core.jdk.JDKLatest;

import jdk.internal.foreign.MemorySessionImpl;

Expand Down Expand Up @@ -68,7 +68,7 @@ static void registerNatives() {
* As one might notice, what is not supported is not creating shared arenas, but closing them.
*/
@Substitute
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
void closeScope0(MemorySessionImpl session, Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError error) {
throw unsupportedFeature("GR-52276: Arena.ofShared not supported");
}
Expand All @@ -80,6 +80,6 @@ boolean closeScope0(MemorySessionImpl session) {
}
}

@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = {JDK22OrLater.class, ForeignFunctionsEnabled.class})
@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = {JDKLatest.class, ForeignFunctionsEnabled.class})
final class Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError {
}
15 changes: 7 additions & 8 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@
import com.oracle.svm.core.heap.UnknownObjectField;
import com.oracle.svm.core.heap.UnknownPrimitiveField;
import com.oracle.svm.core.jdk.JDK21OrEarlier;
import com.oracle.svm.core.jdk.JDK22OrLater;
import com.oracle.svm.core.jdk.JDK23OrLater;
import com.oracle.svm.core.jdk.JDKLatest;
import com.oracle.svm.core.jdk.Resources;
import com.oracle.svm.core.meta.SharedType;
import com.oracle.svm.core.reflect.MissingReflectionRegistrationUtils;
Expand Down Expand Up @@ -1495,7 +1494,7 @@ private static Class<?> forName(String name, boolean initialize, ClassLoader loa
}

@KeepOriginal
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
public static native Class<?> forPrimitiveName(String primitiveName);

@KeepOriginal
Expand Down Expand Up @@ -1540,11 +1539,11 @@ public String toString() {
public native String toGenericString();

@KeepOriginal
@TargetElement(onlyWith = JDK23OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
private native void addSealingInfo(int modifiersParam, StringBuilder sb);

@KeepOriginal
@TargetElement(onlyWith = JDK23OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
private native boolean hasSealedAncestor(Class<?> clazz);

@KeepOriginal
Expand Down Expand Up @@ -1870,7 +1869,7 @@ private Class<?>[] getPermittedSubclasses0() {
private native GenericsFactory getFactory();

@KeepOriginal
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
native Method findMethod(boolean publicOnly, String nameParam, Class<?>... parameterTypes);

@KeepOriginal
Expand All @@ -1884,7 +1883,7 @@ private Class<?>[] getPermittedSubclasses0() {
private native Target_java_lang_PublicMethods_MethodList getMethodsRecursive(String methodName, Class<?>[] parameterTypes, boolean includeStatic);

@KeepOriginal
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
private native Target_java_lang_PublicMethods_MethodList getMethodsRecursive(String methodName, Class<?>[] parameterTypes, boolean includeStatic, boolean publicOnly);

@KeepOriginal
Expand Down Expand Up @@ -2137,7 +2136,7 @@ public FieldAccessor newFieldAccessor(Field field0, boolean override) {
* @see Target_jdk_internal_reflect_DirectConstructorHandleAccessor
*/
@Substitute
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
@Fold // cut off the alternative branch, already during analysis
static boolean useOldSerializableConstructor() {
return true;
Expand Down
6 changes: 3 additions & 3 deletions ...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ForeignDisabledSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ final class Target_jdk_internal_foreign_FunctionDescriptorImpl {
final class Target_java_lang_foreign_FunctionDescriptor {
}

@TargetClass(className = "jdk.internal.foreign.SegmentFactories", onlyWith = {ForeignDisabled.class, JDK22OrLater.class})
@TargetClass(className = "jdk.internal.foreign.SegmentFactories", onlyWith = {ForeignDisabled.class, JDKLatest.class})
final class Target_jdk_internal_foreign_SegmentFactories {
@Substitute
@AlwaysInline("Make remaining code in callers unreachable.")
Expand All @@ -143,7 +143,7 @@ final class Target_jdk_internal_foreign_LayoutPath {
final class Target_java_lang_foreign_MemoryLayout_PathElement {
}

@TargetClass(className = "jdk.internal.foreign.layout.AbstractLayout", onlyWith = {ForeignDisabled.class, JDK22OrLater.class})
@TargetClass(className = "jdk.internal.foreign.layout.AbstractLayout", onlyWith = {ForeignDisabled.class, JDKLatest.class})
final class Target_jdk_internal_foreign_layout_AbstractLayout {
@Substitute
@AlwaysInline("Make remaining code in callers unreachable.")
Expand All @@ -153,7 +153,7 @@ VarHandle varHandle(Target_java_lang_foreign_MemoryLayout_PathElement... element
}

@Substitute
@TargetElement(onlyWith = JDK23OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
@SuppressWarnings({"unused", "static-method"})
VarHandle varHandleInternal(Target_java_lang_foreign_MemoryLayout_PathElement... elements) {
throw ForeignDisabledSubstitutions.fail();
Expand Down
36 changes: 0 additions & 36 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK22OrLater.java
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK23OrLater.java
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions ...m/oracle/svm/core/jdk/JDK22OrEarlier.java → ...rc/com/oracle/svm/core/jdk/JDKLatest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@

import jdk.graal.compiler.serviceprovider.JavaVersionUtil;

public class JDK22OrEarlier implements BooleanSupplier {
/**
* Denotes the latest supported JDK version. It corresponds to the highest key in the
* {@code JVMCI_MIN_VERSIONS} map in {@link jdk.graal.compiler.hotspot.JVMCIVersionCheck}.
Comment on lines +32 to +33
Copy link
Collaborator

@zakkak zakkak Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to move this map in a package that is accessible here and actually reference the highest key instead of hardcoding the check to 21?

Copy link
Member

@zapster zapster Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The package is accessible, it is just the field that is private. The LTS version change so seldomly that IMHO it is fine to have a few references to it.

*/
public class JDKLatest implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
return JavaVersionUtil.JAVA_SPEC <= 22;
return JavaVersionUtil.JAVA_SPEC > 21;
Copy link
Collaborator

@zakkak zakkak Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: I understand that 21 is used here to avoid having to update the code with each STS JDK release, but this doesn't match the javadoc, nor represents the latest JDK.

Copy link
Member

@zapster zapster Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my perspective, that is just an implementation detail. 21 is the most stable version we have and it only changes once every few years.

}
}
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ final class Target_java_lang_StringUTF16 {
final class Target_java_lang_Throwable {

@Alias //
@TargetElement(onlyWith = JDK22OrLater.class) //
@TargetElement(onlyWith = JDKLatest.class) //
@RecomputeFieldValue(kind = Kind.FromAlias, isFinal = true) //
static boolean jfrTracing = false;

Expand Down
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ private static synchronized ForkJoinPool initializeCommonPool() {
}
}

@TargetClass(value = java.util.concurrent.ForkJoinPool.class, innerClass = "DefaultForkJoinWorkerThreadFactory", onlyWith = JDK23OrLater.class)
@TargetClass(value = java.util.concurrent.ForkJoinPool.class, innerClass = "DefaultForkJoinWorkerThreadFactory", onlyWith = JDKLatest.class)
@SuppressWarnings("removal")
final class Target_java_util_concurrent_ForkJoinPool_DefaultForkJoinWorkerThreadFactory {
@Alias @RecomputeFieldValue(kind = Reset) //
Expand Down
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public boolean isNativeAccessEnabled() {
public native void ensureNativeAccess(Class<?> owner, String methodName);

@Alias
@TargetElement(onlyWith = JDK22OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
public native void ensureNativeAccess(Class<?> owner, String methodName, Class<?> currentClass);

@Substitute
Expand Down
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ final class Target_java_lang_invoke_DirectMethodHandle_StaticAccessor {
long staticOffset;
}

@TargetClass(className = "java.lang.invoke.LazyInitializingVarHandle", onlyWith = JDK23OrLater.class)
@TargetClass(className = "java.lang.invoke.LazyInitializingVarHandle", onlyWith = JDKLatest.class)
final class Target_java_lang_invoke_LazyInitializingVarHandle {
@Alias @RecomputeFieldValue(isFinal = true, kind = RecomputeFieldValue.Kind.None) //
Class<?> refc;
Expand Down
6 changes: 3 additions & 3 deletions ...m.oracle.svm.core/src/com/oracle/svm/core/jdk/xml/Target_jdk_xml_internal_JdkCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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.jdk.JDK22OrLater;
import com.oracle.svm.core.jdk.JDKLatest;
import com.oracle.svm.util.ReflectionUtil;

/**
Expand All @@ -46,7 +46,7 @@
* Ideally, we would initialize all of {@code jdk.xml} at run time, but that is too intrusive at the
* current point in time (GR-50683).
*/
@TargetClass(className = "jdk.xml.internal.JdkCatalog", onlyWith = JDK22OrLater.class)
@TargetClass(className = "jdk.xml.internal.JdkCatalog", onlyWith = JDKLatest.class)
public final class Target_jdk_xml_internal_JdkCatalog {
@Alias //
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = JdkCatalogSupplier.class, isFinal = true) //
Expand All @@ -59,7 +59,7 @@ public static void init(String resolve) {
}
}

@TargetClass(className = "javax.xml.catalog.Catalog", onlyWith = JDK22OrLater.class)
@TargetClass(className = "javax.xml.catalog.Catalog", onlyWith = JDKLatest.class)
final class Target_javax_xml_catalog_Catalog {
}

Expand Down
12 changes: 5 additions & 7 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
import com.oracle.svm.core.annotate.TargetClass;
import com.oracle.svm.core.annotate.TargetElement;
import com.oracle.svm.core.jdk.JDK21OrEarlier;
import com.oracle.svm.core.jdk.JDK22OrEarlier;
import com.oracle.svm.core.jdk.JDK22OrLater;
import com.oracle.svm.core.jdk.JDK23OrLater;
import com.oracle.svm.core.jdk.JDKLatest;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.util.ReflectionUtil;

Expand Down Expand Up @@ -135,13 +133,13 @@ final class Target_jdk_jfr_internal_Utils {
public static native String formatTimespan(Duration dValue, String separation);
}

@TargetClass(className = "jdk.jfr.internal.JVMSupport", onlyWith = {JDK22OrLater.class, HasJfrSupport.class})
@TargetClass(className = "jdk.jfr.internal.JVMSupport", onlyWith = {JDKLatest.class, HasJfrSupport.class})
final class Target_jdk_jfr_internal_JVMSupport {
@Alias
public static native String makeFilename(Recording recording);
}

@TargetClass(className = "jdk.jfr.internal.util.ValueFormatter", onlyWith = {JDK22OrLater.class, HasJfrSupport.class})
@TargetClass(className = "jdk.jfr.internal.util.ValueFormatter", onlyWith = {JDKLatest.class, HasJfrSupport.class})
final class Target_jdk_jfr_internal_util_ValueFormatter {
@Alias
public static native String formatTimespan(Duration dValue, String separation);
Expand All @@ -150,10 +148,10 @@ final class Target_jdk_jfr_internal_util_ValueFormatter {
@TargetClass(className = "jdk.jfr.internal.PlatformRecording")
final class Target_jdk_jfr_internal_PlatformRecording {
@Alias
@TargetElement(onlyWith = JDK23OrLater.class)
@TargetElement(onlyWith = JDKLatest.class)
public native void setDumpDirectory(SecuritySupport.SafePath directory);

@Alias
@TargetElement(onlyWith = JDK22OrEarlier.class)
@TargetElement(onlyWith = JDK21OrEarlier.class)
public native void setDumpOnExitDirectory(SecuritySupport.SafePath directory);
}
4 changes: 2 additions & 2 deletions ...c/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_HiddenWait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
package com.oracle.svm.core.jfr;

import com.oracle.svm.core.annotate.TargetClass;
import com.oracle.svm.core.jdk.JDK23OrLater;
import com.oracle.svm.core.jdk.JDKLatest;

@TargetClass(className = "jdk.jfr.internal.HiddenWait", onlyWith = {HasJfrSupport.class, JDK23OrLater.class})
@TargetClass(className = "jdk.jfr.internal.HiddenWait", onlyWith = {HasJfrSupport.class, JDKLatest.class})
public final class Target_jdk_jfr_internal_HiddenWait {
}
Loading