Don't zap pre-zeroed unaligned chunks.

zakkak · Oct 24, 2023 · 129fa26 · 129fa26
1 parent d5a3b1a
commit 129fa26
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...om.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java b/...om.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
@@ -251,7 +251,8 @@ UnalignedHeader produceUnalignedChunk(UnsignedWord objectSize) {
         UnalignedHeapChunk.initialize(result, chunkSize);
         assert objectSize.belowOrEqual(HeapChunk.availableObjectMemory(result)) : "UnalignedHeapChunk insufficient for requested object";
 
-        if (HeapParameters.getZapProducedHeapChunks()) {
+        /* Avoid zapping if unaligned chunks are pre-zeroed. */
+        if (!CommittedMemoryProvider.get().areUnalignedChunksZeroed() && HeapParameters.getZapProducedHeapChunks()) {
             zap(result, HeapParameters.getProducedHeapChunkZapWord());
         }
         return result;