Report user errors for huge relocatable objects in heap

Author: vjovanov

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

@@ -27,6 +27,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
+import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.SubstrateOptions;
@@ -41,6 +42,8 @@
 import com.oracle.svm.core.image.ImageHeapLayoutInfo;
 import com.oracle.svm.core.image.ImageHeapLayouter;
 import com.oracle.svm.core.image.ImageHeapObject;
+import com.oracle.svm.core.option.SubstrateOptionsParser;
+import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.core.common.NumUtil;
@@ -120,14 +123,19 @@ private ChunkedImageHeapPartition choosePartition(ImageHeapObject info, boolean
         if (patched) {
             return getWritablePatched();
         } else if (immutable) {
-            if (hasRelocatables) {
-                VMError.guarantee(info.getSize() < hugeObjectThreshold, "Objects with relocatable pointers cannot be huge objects");
-                return getReadOnlyRelocatable();
-            }
             if (info.getSize() >= hugeObjectThreshold) {
-                VMError.guarantee(info.getObjectClass() != DynamicHub.class, "Class metadata (dynamic hubs) cannot be huge objects");
+                if (info.getObjectClass() == DynamicHub.class) {
+                    throw reportHugeObjectError(info, "Class metadata (dynamic hubs) cannot be huge objects. The dynamic hub %s", info.getObject().toString());
+                }
+                if (hasRelocatables) {
+                    throw reportHugeObjectError(info, "Objects in image heap with relocatable pointers cannot be huge objects. Detected an object of type %s",
+                                    info.getObject().getClass().getTypeName());
+                }
                 return getReadOnlyHuge();
             }
+            if (hasRelocatables) {
+                return getReadOnlyRelocatable();
+            }
             return getReadOnlyRegular();
         } else {
             assert info.getObjectClass() != DynamicHub.class : "Class metadata (dynamic hubs) cannot be writable";
@@ -138,6 +146,26 @@ private ChunkedImageHeapPartition choosePartition(ImageHeapObject info, boolean
         }
     }
 
+    private Error reportHugeObjectError(ImageHeapObject info, String objectTypeMsg, String objectText) {
+        String msg = String.format(
+                        objectTypeMsg + " with size %d B and the limit is %d B. Use '%s' to increase GC chunk size to be larger than the object.",
+                        objectText, info.getSize(), hugeObjectThreshold,
+                        SubstrateOptionsParser.commandArgument(SerialAndEpsilonGCOptions.AlignedHeapChunkSize, "<2^n>"));
+        if (ImageInfo.inImageBuildtimeCode()) {
+            throw UserError.abort(msg);
+        } else {
+            throw VMError.shouldNotReachHere(msg);
+        }
+    }
+
+    private static void reportError(String msg) {
+        if (ImageInfo.inImageBuildtimeCode()) {
+            UserError.abort(msg);
+        } else {
+            VMError.shouldNotReachHere(msg);
+        }
+    }
+
     @Override
     public ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize) {
         int objectAlignment = ConfigurationValues.getObjectLayout().getAlignment();

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

@@ -24,16 +24,12 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import org.graalvm.collections.EconomicMap;
-
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.NotifyGCRuntimeOptionKey;
 import com.oracle.svm.core.option.RuntimeOptionKey;
 import com.oracle.svm.core.util.UserError;
-
 import jdk.graal.compiler.options.Option;
-import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.options.OptionType;
 
 /** Common options that can be specified for both the serial and the epsilon GC. */
@@ -45,13 +41,7 @@ public final class SerialAndEpsilonGCOptions {
     public static final RuntimeOptionKey<Integer> MaximumYoungGenerationSizePercent = new NotifyGCRuntimeOptionKey<>(10, SerialAndEpsilonGCOptions::validateSerialOrEpsilonRuntimeOption);
 
     @Option(help = "The size of an aligned chunk. Serial and epsilon GC only.", type = OptionType.Expert) //
-    public static final HostedOptionKey<Long> AlignedHeapChunkSize = new HostedOptionKey<>(512 * 1024L, SerialAndEpsilonGCOptions::validateSerialOrEpsilonHostedOption) {
-        @Override
-        protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldValue, Long newValue) {
-            int multiple = 4096;
-            UserError.guarantee(newValue > 0 && newValue % multiple == 0, "%s value must be a multiple of %d.", getName(), multiple);
-        }
-    };
+    public static final HostedOptionKey<Long> AlignedHeapChunkSize = new HostedOptionKey<>(512 * 1024L, SerialAndEpsilonGCOptions::validateSerialOrEpsilonHostedOption);
 
     /*
      * This should be a fraction of the size of an aligned chunk, else large small arrays will not