Store image code info in isolate data section

Author: rudihorn

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java

@@ -31,13 +31,14 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
-import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.word.ComparableWord;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.BuildPhaseProvider.AfterCompilation;
 import com.oracle.svm.core.MemoryWalker;
 import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.c.CIsolateData;
+import com.oracle.svm.core.c.CIsolateDataFactory;
 import com.oracle.svm.core.c.NonmovableArray;
 import com.oracle.svm.core.c.NonmovableArrays;
 import com.oracle.svm.core.c.NonmovableObjectArray;
@@ -48,8 +49,7 @@
 public class ImageCodeInfo {
     public static final String CODE_INFO_NAME = "image code";
 
-    /** Memory in the image heap to contain our {@link CodeInfo} structure at runtime. */
-    private final byte[] runtimeCodeInfoData;
+    private final CIsolateData<CodeInfoImpl> runtimeCodeInfo = CIsolateDataFactory.createStruct("runtimeCodeInfo", CodeInfoImpl.class);
 
     @Platforms(Platform.HOSTED_ONLY.class) //
     private final HostedImageCodeInfo hostedImageCodeInfo = new HostedImageCodeInfo();
@@ -78,14 +78,11 @@ public class ImageCodeInfo {
         NonmovableArrays.setObject(objfields, CodeInfoImpl.TETHER_OBJFIELD, new CodeInfoTether(true));
         // no InstalledCode for image code
         objectFields = NonmovableArrays.getHostedArray(objfields);
-
-        int runtimeInfoSize = SizeOf.get(CodeInfoImpl.class);
-        runtimeCodeInfoData = new byte[runtimeInfoSize];
     }
 
     @Uninterruptible(reason = "Executes during isolate creation.")
     CodeInfo prepareCodeInfo() {
-        CodeInfoImpl info = NonmovableArrays.addressOf(NonmovableArrays.fromImageHeap(runtimeCodeInfoData), 0);
+        CodeInfoImpl info = runtimeCodeInfo.get();
         assert info.getCodeStart().isNull() : "already initialized";
 
         info.setObjectFields(NonmovableArrays.fromImageHeap(objectFields));