Remove laying-out cancellations for non-chunked layouters

Author: ivan-ristovic

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

@@ -157,6 +157,11 @@ private Error reportHugeObjectError(ImageHeapObject info, String objectTypeMsg,
         }
     }
 
+    @Override
+    public ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize) {
+        return layout(imageHeap, pageSize, () -> false);
+    }
+
     @Override
     public ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize, ImageHeapLayingOutController controller) {
         ImageHeapLayingOutControl control = new ImageHeapLayingOutControl(controller);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/image/ImageHeapLayouter.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.image;
 
+import com.oracle.svm.core.util.VMError;
+
 import java.nio.ByteBuffer;
 
 /**
@@ -45,16 +47,16 @@ public interface ImageHeapLayouter {
     /**
      * Places all heap partitions and assigns objects their final offsets.
      */
-    default ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize) {
-        return layout(imageHeap, pageSize, new NonCancellableImageHeapLayingOutController());
-    }
+    ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize);
 
     /**
      * Cancellable version of {@link ImageHeapLayouter#layout(ImageHeap, int)}. Cancellation is
      * performed via {@link ImageHeapLayingOutController}.. If the layout is cancelled, an instance
      * of {@link ImageHeapLayingOutCancelledException} is thrown.
      */
-    ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize, ImageHeapLayingOutController controller);
+    default ImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize, ImageHeapLayingOutController controller) {
+        throw VMError.unimplemented("This layouter does not support cancellation");
+    }
 
     /** Hook to run tasks after heap layout is finished. */
     @SuppressWarnings("unused")

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/image/NonCancellableImageHeapLayingOutController.java

@@ -30,8 +30,6 @@
 
 import com.oracle.graal.pointsto.heap.ImageHeapPrimitiveArray;
 import com.oracle.svm.core.image.ImageHeap;
-import com.oracle.svm.core.image.ImageHeapLayingOutControl;
-import com.oracle.svm.core.image.ImageHeapLayingOutController;
 import com.oracle.svm.core.image.ImageHeapLayouter;
 import com.oracle.svm.core.image.ImageHeapObject;
 import com.oracle.svm.core.image.ImageHeapPartition;
@@ -75,37 +73,33 @@ public void assignObjectToPartition(ImageHeapObject info, boolean immutable, boo
     }
 
     @Override
-    public WasmGCImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize, ImageHeapLayingOutController controller) {
-        ImageHeapLayingOutControl control = new ImageHeapLayingOutControl(controller);
-
-        layoutPseudoPartition(control);
-        doLayout(control);
+    public WasmGCImageHeapLayoutInfo layout(ImageHeap imageHeap, int pageSize) {
+        layoutPseudoPartition();
+        doLayout();
 
         long totalSize = StreamSupport.stream(imageHeap.getObjects().spliterator(), false).mapToLong(ImageHeapObject::getSize).sum();
         long serializedSize = singlePartition.getStartOffset() + singlePartition.getSize() - startOffset;
         return new WasmGCImageHeapLayoutInfo(startOffset, serializedSize, totalSize);
     }
 
-    private void doLayout(ImageHeapLayingOutControl control) {
+    private void doLayout() {
         int offset = 0;
         for (ImageHeapObject info : singlePartition.getObjects()) {
             // Only primitive arrays are supposed to be in this partition
             ImageHeapPrimitiveArray primitiveArray = (ImageHeapPrimitiveArray) info.getWrapped();
             info.setOffsetInPartition(offset);
             offset += primitiveArray.getType().getComponentType().getStorageKind().getByteCount() * primitiveArray.getLength();
-            control.heartbeat();
         }
 
         singlePartition.setSize(offset);
     }
 
-    private void layoutPseudoPartition(ImageHeapLayingOutControl control) {
+    private void layoutPseudoPartition() {
         // Approximate size of the partition (based on the SVM object layout size of the objects)
         long pseudoSize = 0;
         for (ImageHeapObject info : pseudoPartition.getObjects()) {
             info.setOffsetInPartition(0);
             pseudoSize = info.getSize();
-            control.heartbeat();
         }
 
         pseudoPartition.setSize(pseudoSize);