Fix Epsilon GC when CompactingOldGen defaults to true.

oracle · May 3, 2024 · e41b210 · e41b210
1 parent d5c351c
commit e41b210
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.../com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java b/.../com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java
@@ -134,17 +134,17 @@ public static boolean useRememberedSet() {
 
     @Fold
     public static boolean useCompactingOldGen() {
-        if (ConcealedOptions.CompactingOldGen.getValue()) {
-            if (!useRememberedSet()) {
-                throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
-                                SubstrateOptionsParser.commandArgument(ConcealedOptions.UseRememberedSet, "+"));
-            }
-            if (SerialAndEpsilonGCOptions.AlignedHeapChunkSize.getValue() > ObjectMoveInfo.MAX_CHUNK_SIZE) {
-                throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
-                                SubstrateOptionsParser.commandArgument(SerialAndEpsilonGCOptions.AlignedHeapChunkSize, "<value below or equal to " + ObjectMoveInfo.MAX_CHUNK_SIZE + ">"));
-            }
-            return true;
+        if (SubstrateOptions.UseEpsilonGC.getValue() || !ConcealedOptions.CompactingOldGen.getValue()) {
+            return false;
         }
-        return false;
+        if (!useRememberedSet()) {
+            throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
+                            SubstrateOptionsParser.commandArgument(ConcealedOptions.UseRememberedSet, "+"));
+        }
+        if (SerialAndEpsilonGCOptions.AlignedHeapChunkSize.getValue() > ObjectMoveInfo.MAX_CHUNK_SIZE) {
+            throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
+                            SubstrateOptionsParser.commandArgument(SerialAndEpsilonGCOptions.AlignedHeapChunkSize, "<value below or equal to " + ObjectMoveInfo.MAX_CHUNK_SIZE + ">"));
+        }
+        return true;
     }
 }