Only support a metaspace if there is a contiguous address space.

Remove unused code.

Author: christianhaeubl

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

@@ -31,6 +31,7 @@
 import static jdk.graal.compiler.word.Word.nullPointer;
 import static jdk.graal.compiler.word.Word.unsigned;
 
+import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -65,6 +66,7 @@
 import com.oracle.svm.core.nmt.NativeMemoryTracking;
 import com.oracle.svm.core.nmt.NmtCategory;
 import com.oracle.svm.core.os.ChunkBasedCommittedMemoryProvider;
+import com.oracle.svm.core.os.CommittedMemoryProvider;
 import com.oracle.svm.core.os.ImageHeapProvider;
 import com.oracle.svm.core.os.VirtualMemoryProvider;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
@@ -149,6 +151,11 @@ public AddressRangeCommittedMemoryProvider() {
         assert SubstrateOptions.SpawnIsolates.getValue();
     }
 
+    @Fold
+    public static AddressRangeCommittedMemoryProvider singleton() {
+        return (AddressRangeCommittedMemoryProvider) ImageSingletons.lookup(CommittedMemoryProvider.class);
+    }
+
     @Override
     @Uninterruptible(reason = "Still being initialized.")
     public int initialize(WordPointer heapBaseOut, IsolateArguments arguments) {

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/metaspace/ChunkedMetaspaceMemory.java

@@ -34,14 +34,14 @@
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.genscavenge.AddressRangeCommittedMemoryProvider;
 import com.oracle.svm.core.genscavenge.AlignedHeapChunk;
 import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader;
 import com.oracle.svm.core.genscavenge.HeapChunk.Header;
 import com.oracle.svm.core.genscavenge.HeapParameters;
 import com.oracle.svm.core.genscavenge.Space;
 import com.oracle.svm.core.genscavenge.remset.RememberedSet;
 import com.oracle.svm.core.metaspace.Metaspace;
-import com.oracle.svm.core.os.ChunkBasedCommittedMemoryProvider;
 import com.oracle.svm.core.thread.JavaSpinLockUtils;
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.util.VMError;
@@ -129,7 +129,7 @@ private AlignedHeader requestNewChunk() {
         assert JavaSpinLockUtils.isLocked(this, LOCK_OFFSET);
 
         UnsignedWord chunkSize = HeapParameters.getAlignedHeapChunkAlignment();
-        AlignedHeader newChunk = (AlignedHeader) ChunkBasedCommittedMemoryProvider.get().allocateMetaspaceChunk(HeapParameters.getAlignedHeapChunkSize(), chunkSize);
+        AlignedHeader newChunk = (AlignedHeader) AddressRangeCommittedMemoryProvider.singleton().allocateMetaspaceChunk(HeapParameters.getAlignedHeapChunkSize(), chunkSize);
         assert newChunk.isNonNull();
 
         AlignedHeapChunk.initialize(newChunk, chunkSize);

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/metaspace/MetaspaceImpl.java

@@ -44,7 +44,6 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.metaspace.Metaspace;
-import com.oracle.svm.core.os.CommittedMemoryProvider;
 import com.oracle.svm.core.thread.VMOperation;
 
 import jdk.graal.compiler.api.replacements.Fold;
@@ -98,13 +97,8 @@ public boolean isInAddressSpace(Object obj) {
     @Override
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public boolean isInAddressSpace(Pointer ptr) {
-        CommittedMemoryProvider memoryProvider = ImageSingletons.lookup(CommittedMemoryProvider.class);
-        if (memoryProvider instanceof AddressRangeCommittedMemoryProvider p) {
-            return p.isInMetaspace(ptr);
-        }
-
-        /* Metaspace does not have a contiguous address space. */
-        return isInAllocatedMemory(ptr);
+        AddressRangeCommittedMemoryProvider m = AddressRangeCommittedMemoryProvider.singleton();
+        return m.isInMetaspace(ptr);
     }
 
     @Override

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java

@@ -140,13 +140,6 @@ public void visitLoadedClasses(Consumer<Class<?>> visitor) {
     /** Reset the heap to the normal execution state. */
     public abstract void endSafepoint();
 
-    /* Only used by legacy code, see GR-68813. */
-    @Fold
-    @Deprecated
-    public int getPreferredAddressSpaceAlignment() {
-        return getHeapBaseAlignment();
-    }
-
     /**
      * Returns the alignment in bytes that the heap base must adhere to at runtime. Note that this
      * alignment is not enforced if {@link SubstrateOptions#SpawnIsolates} is disabled.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/RuntimeClassLoading.java

@@ -88,18 +88,26 @@ private static void validateRuntimeClassLoading(HostedOptionKey<Boolean> optionK
             if (!optionKey.getValue()) {
                 return;
             }
+            if (!SubstrateOptions.SpawnIsolates.getValue()) {
+                /*
+                 * A metaspace is only supported if there is a contiguous address space, which is
+                 * only the case with isolate support enabled.
+                 */
+                throw UserError.invalidOptionValue(RuntimeClassLoading, RuntimeClassLoading.getValue(),
+                                "Requires isolate support, please use " + SubstrateOptionsParser.commandArgument(SubstrateOptions.SpawnIsolates, "+"));
+            }
             if (SubstrateOptions.ClosedTypeWorld.getValue()) {
                 throw UserError.invalidOptionValue(RuntimeClassLoading, RuntimeClassLoading.getValue(),
-                                "Requires an open type world, Please use " + SubstrateOptionsParser.commandArgument(SubstrateOptions.ClosedTypeWorld, "-"));
+                                "Requires an open type world, please use " + SubstrateOptionsParser.commandArgument(SubstrateOptions.ClosedTypeWorld, "-"));
             }
             if (!ClassForNameSupport.Options.ClassForNameRespectsClassLoader.getValue()) {
                 throw UserError.invalidOptionValue(RuntimeClassLoading, RuntimeClassLoading.getValue(),
-                                "Requires Class.forName to respect the classloader argument, Please use " +
+                                "Requires Class.forName to respect the classloader argument, please use " +
                                                 SubstrateOptionsParser.commandArgument(ClassForNameSupport.Options.ClassForNameRespectsClassLoader, "+"));
             }
             if (PredefinedClassesSupport.Options.SupportPredefinedClasses.getValue()) {
                 throw UserError.invalidOptionValue(RuntimeClassLoading, RuntimeClassLoading.getValue(),
-                                "Requires predefined class support to be disabled, Please use " +
+                                "Requires predefined class support to be disabled, please use " +
                                                 SubstrateOptionsParser.commandArgument(PredefinedClassesSupport.Options.SupportPredefinedClasses, "-"));
             }
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/ChunkBasedCommittedMemoryProvider.java

@@ -37,6 +37,7 @@
 import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.nmt.NmtCategory;
 import com.oracle.svm.core.thread.VMOperation;
+import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.word.Word;
@@ -55,11 +56,7 @@ public static ChunkBasedCommittedMemoryProvider get() {
     /** Returns a non-null value or throws a pre-allocated exception. */
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public Pointer allocateMetaspaceChunk(UnsignedWord nbytes, UnsignedWord alignment) {
-        Pointer result = allocate(nbytes, alignment, false, NmtCategory.Metaspace);
-        if (result.isNull()) {
-            throw METASPACE_CHUNK_COMMIT_FAILED;
-        }
-        return result;
+        throw VMError.shouldNotReachHere("Metaspace is only supported if there is a contiguous address space.");
     }
 
     /** Returns a non-null value or throws a pre-allocated exception. */

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CopyingImageHeapProvider.java

@@ -24,18 +24,12 @@
  */
 package com.oracle.svm.core.os;
 
-import static com.oracle.svm.core.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
-
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.UnmanagedMemoryUtil;
 import com.oracle.svm.core.c.function.CEntryPointErrors;
-import com.oracle.svm.core.heap.Heap;
-import com.oracle.svm.core.util.UnsignedUtils;
-
-import jdk.graal.compiler.word.Word;
 
 /** Platform independent image heap provider that deep-copies the image heap memory. */
 public class CopyingImageHeapProvider extends AbstractCopyingImageHeapProvider {
@@ -45,19 +39,4 @@ protected int copyMemory(Pointer loadedImageHeap, UnsignedWord imageHeapSize, Po
         UnmanagedMemoryUtil.copy(loadedImageHeap, newImageHeap, imageHeapSize);
         return CEntryPointErrors.NO_ERROR;
     }
-
-    /**
-     * Only called from legacy code, see GR-68584. This method does something fundamentally
-     * different than the method with the same name in {@link AbstractImageHeapProvider}.
-     */
-    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
-    protected UnsignedWord getImageHeapAddressSpaceSize() {
-        UnsignedWord pageSize = VirtualMemoryProvider.get().getGranularity();
-        int imageHeapOffset = Heap.getHeap().getImageHeapOffsetInAddressSpace();
-        assert imageHeapOffset >= 0;
-        UnsignedWord size = Word.unsigned(imageHeapOffset);
-        size = size.add(getImageHeapSizeInFile());
-        size = UnsignedUtils.roundUp(size, pageSize);
-        return size;
-    }
 }