[GR-70010] Only call updateSizeParameters() if DynamicCollectionPolicy is used.

PullRequest: graal/22250

Author: christianhaeubl

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

@@ -31,6 +31,7 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.heap.GCCause;
+import com.oracle.svm.core.heap.OutOfMemoryUtil;
 import com.oracle.svm.core.heap.PhysicalMemory;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.util.ReflectionUtil;
@@ -217,4 +218,12 @@ static boolean shouldCollectYoungGenSeparately(boolean defaultValue) {
     default boolean isOutOfMemory(UnsignedWord usedBytes) {
         return usedBytes.aboveThan(getMaximumHeapSize());
     }
+
+    /**
+     * Invoked after a garbage collection when the maximum heap size has been exceeded. Can be
+     * overridden to recover from OOM.
+     */
+    default void onMaximumHeapSizeExceeded() {
+        throw OutOfMemoryUtil.heapSizeExceeded();
+    }
 }

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

@@ -58,4 +58,14 @@ public boolean isOutOfMemory(UnsignedWord usedBytes) {
 
         return super.isOutOfMemory(usedBytes);
     }
+
+    @Override
+    public void onMaximumHeapSizeExceeded() {
+        if (isOutOfMemory(HeapImpl.getAccounting().getUsedBytes())) {
+            super.onMaximumHeapSizeExceeded();
+        } else {
+            /* No longer out-of-memory - update the heap size parameters to reflect that. */
+            GCImpl.getPolicy().updateSizeParameters();
+        }
+    }
 }

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

@@ -190,11 +190,7 @@ private void collect(GCCause cause, boolean forceFullGC) {
         if (!hasNeverCollectPolicy()) {
             boolean outOfMemory = collectWithoutAllocating(cause, forceFullGC);
             if (outOfMemory) {
-                if (getPolicy().isOutOfMemory(HeapImpl.getAccounting().getUsedBytes())) {
-                    throw OutOfMemoryUtil.heapSizeExceeded();
-                } else {
-                    GCImpl.getPolicy().updateSizeParameters();
-                }
+                getPolicy().onMaximumHeapSizeExceeded();
             }
         }
     }