Fix after rebase

Author: olpaw

compiler/src/org.graalvm.compiler.hotspot.management.libgraal.processor/src/org/graalvm/compiler/hotspot/management/libgraal/processor/JMXFromLibGraalProcessor.java

@@ -53,11 +53,16 @@
  * use {@code "--features <fqn.of.FeatureClass>"} in the {@code Args} of a
  * {@code native-image.properties} file to ensure a user-provided feature gets processed.
  *
- * Feature classes can use this annotation are unconditionally added when they are reachable on the
+ * Feature classes that use this annotation are unconditionally added when they are reachable on the
  * class path.
  *
+ * This annotation is deprecated because a full scan of the class path is necessary to find
+ * annotated classes. This full classpath scanning will be removed in a future version of GraalVM,
+ * which means that this annotation needs to be removed then too.
+ *
  * @since 22.3
  */
+@Deprecated(forRemoval = true)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Platforms(Platform.HOSTED_ONLY.class)

sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AutomaticFeature.java

@@ -32,7 +32,7 @@
 import com.oracle.svm.core.SubstrateOptions;
 
 @Platforms(Platform.HOSTED_ONLY.class)
-class UseSerialOrEpsilonGC implements BooleanSupplier {
+public class UseSerialOrEpsilonGC implements BooleanSupplier {
  @Override
  public boolean getAsBoolean() {
  return SubstrateOptions.UseSerialGC.getValue() || SubstrateOptions.UseEpsilonGC.getValue();

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UseSerialOrEpsilonGC.java

@@ -33,7 +33,6 @@
 import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.nativeimage.impl.PinnedObjectSupport;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
@@ -45,7 +44,6 @@
 import com.oracle.svm.core.genscavenge.ImageHeapInfo;
 import com.oracle.svm.core.genscavenge.IncrementalGarbageCollectorMXBean;
 import com.oracle.svm.core.genscavenge.LinearImageHeapLayouter;
-import com.oracle.svm.core.genscavenge.PinnedObjectImpl.PinnedObjectSupportImpl;
 import com.oracle.svm.core.genscavenge.jvmstat.EpsilonGCPerfData;
 import com.oracle.svm.core.genscavenge.jvmstat.SerialGCPerfData;
 import com.oracle.svm.core.genscavenge.remset.CardTableBasedRememberedSet;
@@ -71,7 +69,7 @@
 class GenScavengeGCFeature implements InternalFeature {
  @Override
  public boolean isInConfiguration(IsInConfigurationAccess access) {
- return SubstrateOptions.UseSerialGC.getValue() || SubstrateOptions.UseEpsilonGC.getValue();
+ return new com.oracle.svm.core.genscavenge.UseSerialOrEpsilonGC().getAsBoolean();
  }
 
  @Override
@@ -96,7 +94,6 @@ public void duringSetup(DuringSetupAccess access) {
  managementSupport.addPlatformManagedObjectSingleton(java.lang.management.MemoryMXBean.class, new HeapImplMemoryMXBean());
  managementSupport.addPlatformManagedObjectList(com.sun.management.GarbageCollectorMXBean.class, Arrays.asList(new IncrementalGarbageCollectorMXBean(), new CompleteGarbageCollectorMXBean()));
 
- ImageSingletons.add(PinnedObjectSupport.class, new PinnedObjectSupportImpl());
  if (ImageSingletons.contains(PerfManager.class)) {
  ImageSingletons.lookup(PerfManager.class).register(createPerfData());
  }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java

@@ -26,6 +26,7 @@
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
+import com.oracle.svm.core.headers.LibCSupport;
 import com.oracle.svm.core.posix.PosixLibCSupport;
 import com.oracle.svm.core.posix.headers.darwin.DarwinErrno;