[GR-66104] Small cleanups regarding JDK latest.

PullRequest: graal/21136

Author: christianhaeubl

substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError.java

@@ -25,8 +25,7 @@
 package com.oracle.svm.core.foreign;
 
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDKLatest;
 
-@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = {JDKLatest.class, ForeignAPIPredicates.Enabled.class})
+@TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError", onlyWith = ForeignAPIPredicates.Enabled.class)
 final class Target_jdk_internal_misc_ScopedMemoryAccess_ScopedAccessError {
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmti/JvmtiFunctions.java

@@ -410,7 +410,7 @@ static int NotifyFramePop(JvmtiExternalEnv externalEnv, JThread thread, int dept
     }
 
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "JVMTI function.")
-    @CEntryPoint(include = JvmtiEnabledAndJDKLatest.class, publishAs = CEntryPoint.Publish.NotPublished)
+    @CEntryPoint(include = JvmtiEnabled.class, publishAs = CEntryPoint.Publish.NotPublished)
     @CEntryPointOptions(prologue = JvmtiEnvEnterPrologue.class)
     static int ClearAllFramePops(JvmtiExternalEnv externalEnv, JThread thread) {
         return JVMTI_ERROR_ACCESS_DENIED.getCValue();
@@ -1439,12 +1439,4 @@ public boolean getAsBoolean() {
             return SubstrateOptions.JVMTI.getValue();
         }
     }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    public static final class JvmtiEnabledAndJDKLatest implements BooleanSupplier {
-        @Override
-        public boolean getAsBoolean() {
-            return SubstrateOptions.JVMTI.getValue();
-        }
-    }
 }