Skip to content

Commit 34f2556

Browse files
committed
Fix Epsilon GC when CompactingOldGen defaults to true.
1 parent 0d692b0 commit 34f2556

File tree

1 file changed

+11
-11
lines changed
  • substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge

1 file changed

+11
-11
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ public static boolean useRememberedSet() {
134134

135135
@Fold
136136
public static boolean useCompactingOldGen() {
137-
if (ConcealedOptions.CompactingOldGen.getValue()) {
138-
if (!useRememberedSet()) {
139-
throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
140-
SubstrateOptionsParser.commandArgument(ConcealedOptions.UseRememberedSet, "+"));
141-
}
142-
if (SerialAndEpsilonGCOptions.AlignedHeapChunkSize.getValue() > ObjectMoveInfo.MAX_CHUNK_SIZE) {
143-
throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
144-
SubstrateOptionsParser.commandArgument(SerialAndEpsilonGCOptions.AlignedHeapChunkSize, "<value below or equal to " + ObjectMoveInfo.MAX_CHUNK_SIZE + ">"));
145-
}
146-
return true;
137+
if (SubstrateOptions.UseEpsilonGC.getValue() || !ConcealedOptions.CompactingOldGen.getValue()) {
138+
return false;
147139
}
148-
return false;
140+
if (!useRememberedSet()) {
141+
throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
142+
SubstrateOptionsParser.commandArgument(ConcealedOptions.UseRememberedSet, "+"));
143+
}
144+
if (SerialAndEpsilonGCOptions.AlignedHeapChunkSize.getValue() > ObjectMoveInfo.MAX_CHUNK_SIZE) {
145+
throw UserError.abort("%s requires %s.", SubstrateOptionsParser.commandArgument(ConcealedOptions.CompactingOldGen, "+"),
146+
SubstrateOptionsParser.commandArgument(SerialAndEpsilonGCOptions.AlignedHeapChunkSize, "<value below or equal to " + ObjectMoveInfo.MAX_CHUNK_SIZE + ">"));
147+
}
148+
return true;
149149
}
150150
}

0 commit comments

Comments
 (0)