Extract RuntimeImageHeapList.

Author: cstancu

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapList.java

@@ -35,7 +35,6 @@
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.BuildPhaseProvider;
-import com.oracle.svm.core.Uninterruptible;
 
 /**
  * A list that is filled at image build time while the static analysis is running, and then read at
@@ -80,7 +79,7 @@ private ImageHeapList() {
     public static final class HostedImageHeapList<E> extends AbstractList<E> {
         private final Comparator<E> comparator;
         private final List<E> hostedList;
-        public final RuntimeImageHeapList<E> runtimeList;
+        private final RuntimeImageHeapList<E> runtimeList;
         /**
          * Used to signal if this list has been modified. If true, the change should be propagated
          * from the hosted list to the runtime list by calling {@link #update()}. This variable
@@ -96,6 +95,10 @@ private HostedImageHeapList(Class<E> elementClass, Comparator<E> comparator) {
             this.runtimeList = new RuntimeImageHeapList<>((E[]) Array.newInstance(elementClass, 0));
         }
 
+        public RuntimeImageHeapList<E> getRuntimeList() {
+            return runtimeList;
+        }
+
         public synchronized boolean needsUpdate() {
             return modified;
         }
@@ -158,25 +161,3 @@ private static UnsupportedOperationException notSupported() {
         }
     }
 }
-
-final class RuntimeImageHeapList<E> extends AbstractList<E> {
-
-    E[] elementData;
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    RuntimeImageHeapList(E[] elementData) {
-        this.elementData = elementData;
-    }
-
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-    @Override
-    public E get(int index) {
-        return elementData[index];
-    }
-
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-    @Override
-    public int size() {
-        return elementData.length;
-    }
-}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/RuntimeImageHeapList.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.util;
+
+import java.util.AbstractList;
+
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
+import com.oracle.svm.core.Uninterruptible;
+
+/**
+ * The immutable runtime list view for an {@link ImageHeapList}.
+ */
+public final class RuntimeImageHeapList<E> extends AbstractList<E> {
+
+    E[] elementData;
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    RuntimeImageHeapList(E[] elementData) {
+        this.elementData = elementData;
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Override
+    public E get(int index) {
+        return elementData[index];
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Override
+    public int size() {
+        return elementData.length;
+    }
+}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/ImageHeapCollectionFeature.java

@@ -68,7 +68,7 @@ private Object replaceHostedWithRuntime(Object obj) {
             } else {
                 allLists.add(hostedImageHeapList);
             }
-            return hostedImageHeapList.runtimeList;
+            return hostedImageHeapList.getRuntimeList();
         }
         return obj;
     }
@@ -101,7 +101,7 @@ public void duringAnalysis(DuringAnalysisAccess a) {
         allLists.parallelStream().forEach(hostedImageHeapList -> {
             if (hostedImageHeapList.needsUpdate()) {
                 hostedImageHeapList.update();
-                objectsToRescan.add(hostedImageHeapList.runtimeList);
+                objectsToRescan.add(hostedImageHeapList.getRuntimeList());
             }
         });
         if (!objectsToRescan.isEmpty()) {
@@ -135,7 +135,7 @@ public void afterImageWrite(AfterImageWriteAccess access) {
         for (var hostedImageHeapList : allLists) {
             if (hostedImageHeapList.needsUpdate()) {
                 throw VMError.shouldNotReachHere("ImageHeapList modified after static analysis:%n%s%n%s",
-                                hostedImageHeapList, hostedImageHeapList.runtimeList);
+                                hostedImageHeapList, hostedImageHeapList.getRuntimeList());
 
             }
         }