[GR-64819] Keep aligned chunks only for current survivor space objects.

christianhaeubl · peter-hofer · commit e6238d1846da · 2025-05-08T11:41:21.000+02:00
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -300,7 +300,7 @@ public UnsignedWord getMaximumFreeAlignedChunksSize() {
          * unaligned chunks are also allocated). We could alternatively return
          * getCurrentHeapCapacity() to have chunks ready during full GCs as well.
          */
-        UnsignedWord total = edenSize.add(survivorSize);
+        UnsignedWord total = edenSize.add(HeapImpl.getAccounting().getSurvivorUsedBytes());
         double alignedFraction = Math.min(1, Math.max(0, avgYoungGenAlignedChunkFraction.getAverage()));
         return UnsignedUtils.fromDouble(UnsignedUtils.toDouble(total) * alignedFraction);
     }

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public UnsignedWord getMaximumFreeAlignedChunksSize() {`
`300`	`300`	`* unaligned chunks are also allocated). We could alternatively return`
`301`	`301`	`* getCurrentHeapCapacity() to have chunks ready during full GCs as well.`
`302`	`302`	`*/`
`303`		`- UnsignedWord total = edenSize.add(survivorSize);`
	`303`	`+ UnsignedWord total = edenSize.add(HeapImpl.getAccounting().getSurvivorUsedBytes());`
`304`	`304`	`double alignedFraction = Math.min(1, Math.max(0, avgYoungGenAlignedChunkFraction.getAverage()));`
`305`	`305`	`return UnsignedUtils.fromDouble(UnsignedUtils.toDouble(total) * alignedFraction);`
`306`	`306`	`}`