Rework Debug Info Generation to create a Shared base for AOT and Runt…

…ime Debug Info

Rework debug entries

Remove separate Runtime Debuginfo sections

substratevm/mx.substratevm/suite.py

@@ -1948,8 +1948,9 @@
                 "com.oracle.objectfile",
                 "com.oracle.objectfile.io",
                 "com.oracle.objectfile.debuginfo",
+                "com.oracle.objectfile.debugentry",
+                "com.oracle.objectfile.debugentry.range",
                 "com.oracle.objectfile.macho",
-                "com.oracle.objectfile.runtime",
               ],
 
               "requiresConcealed" : {

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java

@@ -46,7 +46,6 @@
 import java.util.function.Consumer;
 import java.util.stream.StreamSupport;
 
-import com.oracle.objectfile.runtime.RuntimeDebugInfoProvider;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
 import com.oracle.objectfile.elf.ELFObjectFile;
 import com.oracle.objectfile.macho.MachOObjectFile;
@@ -220,16 +219,12 @@ public static Format getNativeFormat() {
     }
 
     private static ObjectFile getNativeObjectFile(int pageSize, boolean runtimeDebugInfoGeneration) {
-        switch (ObjectFile.getNativeFormat()) {
-            case ELF:
-                return new ELFObjectFile(pageSize, runtimeDebugInfoGeneration);
-            case MACH_O:
-                return new MachOObjectFile(pageSize);
-            case PECOFF:
-                return new PECoffObjectFile(pageSize);
-            default:
-                throw new AssertionError("Unreachable");
-        }
+        return switch (ObjectFile.getNativeFormat()) {
+            case ELF -> new ELFObjectFile(pageSize, runtimeDebugInfoGeneration);
+            case MACH_O -> new MachOObjectFile(pageSize);
+            case PECOFF -> new PECoffObjectFile(pageSize);
+            default -> throw new AssertionError("Unreachable");
+        };
     }
 
     public static ObjectFile getNativeObjectFile(int pageSize) {
@@ -1181,11 +1176,6 @@ public void installDebugInfo(@SuppressWarnings("unused") DebugInfoProvider debug
         // do nothing by default
     }
 
-
-    public void installRuntimeDebugInfo(@SuppressWarnings("unused") RuntimeDebugInfoProvider runtimeDebugInfoProvider) {
-        // do nothing by default
-    }
-
     protected static Iterable<LayoutDecision> allDecisions(final Map<Element, LayoutDecisionMap> decisions) {
         return () -> StreamSupport.stream(decisions.values().spliterator(), false)
                         .flatMap(layoutDecisionMap -> StreamSupport.stream(layoutDecisionMap.spliterator(), false)).iterator();
@@ -1834,7 +1824,7 @@ public final SymbolTable getOrCreateSymbolTable() {
      * Temporary storage for a debug context installed in a nested scope under a call. to
      * {@link #withDebugContext}
      */
-    private DebugContext debugContext = DebugContext.disabled(null);
+    protected DebugContext debugContext = DebugContext.disabled(null);
 
     /**
      * Allows a task to be executed with a debug context in a named subscope bound to the object

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java

@@ -26,54 +26,28 @@
 
 package com.oracle.objectfile.debugentry;
 
-import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugArrayTypeInfo;
-import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
-import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-
-import jdk.graal.compiler.debug.DebugContext;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
 public class ArrayTypeEntry extends StructureTypeEntry {
-    private TypeEntry elementType;
-    private int baseSize;
-    private int lengthOffset;
-
-    public ArrayTypeEntry(String typeName, int size) {
-        super(typeName, size);
-    }
-
-    @Override
-    public DebugTypeKind typeKind() {
-        return DebugTypeKind.ARRAY;
+    private final TypeEntry elementType;
+    private final LoaderEntry loader;
+
+    public ArrayTypeEntry(String typeName, int size, long classOffset, long typeSignature,
+                          long compressedTypeSignature, long layoutTypeSignature, long compressedLayoutTypeSignature,
+                          TypeEntry elementType, LoaderEntry loader) {
+        super(typeName, size, classOffset, typeSignature, compressedTypeSignature, layoutTypeSignature, compressedLayoutTypeSignature);
+        this.elementType = elementType;
+        this.loader = loader;
     }
 
     @Override
-    public void addDebugInfo(DebugInfoBase debugInfoBase, DebugTypeInfo debugTypeInfo, DebugContext debugContext) {
-        super.addDebugInfo(debugInfoBase, debugTypeInfo, debugContext);
-        DebugArrayTypeInfo debugArrayTypeInfo = (DebugArrayTypeInfo) debugTypeInfo;
-        ResolvedJavaType eltType = debugArrayTypeInfo.elementType();
-        this.elementType = debugInfoBase.lookupTypeEntry(eltType);
-        this.baseSize = debugArrayTypeInfo.baseSize();
-        this.lengthOffset = debugArrayTypeInfo.lengthOffset();
-        /* Add details of fields and field types */
-        debugArrayTypeInfo.fieldInfoProvider().forEach(debugFieldInfo -> this.processField(debugFieldInfo, debugInfoBase, debugContext));
-        if (debugContext.isLogEnabled()) {
-            debugContext.log("typename %s element type %s base size %d length offset %d%n", typeName, this.elementType.getTypeName(), baseSize, lengthOffset);
-        }
+    public boolean isArray() {
+        return true;
     }
 
     public TypeEntry getElementType() {
         return elementType;
     }
 
     public String getLoaderId() {
-        TypeEntry type = elementType;
-        while (type.isArray()) {
-            type = ((ArrayTypeEntry) type).elementType;
-        }
-        if (type.isClass()) {
-            return ((ClassEntry) type).getLoaderId();
-        }
-        return "";
+        return (loader != null ? loader.loaderId() : "");
     }
 }