Changes based on feedback

dominikmascherbauer · dominikmascherbauer · commit dddcdb2f6b45 · 2025-07-08T16:03:49.000+02:00
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
@@ -1045,6 +1045,20 @@ def build_debug_test(variant_name, image_name, extra_args):
         mx.run([os.environ.get('GDB_BIN', 'gdb'), '--nx', '-q', '-iex', 'set pagination off', '-ex', 'python "ISOLATES=True"', '-x', testhello_py, hello_binary])
 
 
+def gdb_base_command(logfile, autoload_path):
+    return [
+        os.environ.get('GDB_BIN', 'gdb'),
+        '--nx',
+        '-q',  # do not print the introductory and copyright messages
+        '-iex', 'set pagination off',  # messages from enabling logging could already cause pagination, so this must be done first
+        '-iex', 'set logging redirect on',
+        '-iex', 'set logging overwrite off',
+        '-iex', f"set logging file {logfile}",
+        '-iex', 'set logging enabled on',
+        '-iex', f"set auto-load safe-path {autoload_path}",
+    ]
+
+
 def _gdbdebughelperstest(native_image, path, with_isolates_only, args):
 
     # ====== check gdb version ======
@@ -1094,15 +1108,6 @@ def _gdbdebughelperstest(native_image, path, with_isolates_only, args):
         'com.oracle.svm.test.debug.helper.ClassLoaderTest'
     ]
 
-    gdb_args = [
-        os.environ.get('GDB_BIN', 'gdb'),
-        '--nx',
-        '-q',  # do not print the introductory and copyright messages
-        '-iex', 'set pagination off',  # messages from enabling logging could already cause pagination, so this must be done first
-        '-iex', 'set logging redirect on',
-        '-iex', 'set logging overwrite off',
-    ]
-
     def run_debug_test(image_name: str, testfile: str, source_path: str, with_isolates: bool = True,
                        build_cinterfacetutorial: bool = False, extra_args: list = None,
                        skip_build: bool = False) -> int:
@@ -1155,10 +1160,7 @@ def run_debug_test(image_name: str, testfile: str, source_path: str, with_isolat
         if mx.get_os() == 'linux':
             logfile = join(path, pathlib.Path(testfile).stem + ('' if with_isolates else '_no_isolates') + '.log')
             os.environ.update({'gdb_logfile': logfile})
-            gdb_command = gdb_args + [
-                '-iex', f"set logging file {logfile}",
-                '-iex', 'set logging enabled on',
-                '-iex', f"set auto-load safe-path {join(build_dir, 'gdb-debughelpers.py')}",
+            gdb_command = gdb_base_command(logfile, join(build_dir, 'gdb-debughelpers.py')) + [
                 '-x', testfile, join(build_dir, image_name)
             ]
             # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
@@ -1200,15 +1202,6 @@ def _runtimedebuginfotest(native_image, output_path, with_isolates_only, args=No
     test_runtime_deopt_py = join(test_python_source_dir, 'test_runtime_deopt.py')
     testdeopt_js = join(suite.dir, 'mx.substratevm', 'testdeopt.js')
 
-    gdb_args = [
-        os.environ.get('GDB_BIN', 'gdb'),
-        '--nx',
-        '-q',  # do not print the introductory and copyright messages
-        '-iex', "set pagination off",  # messages from enabling logging could already cause pagination, so this must be done first
-        '-iex', "set logging redirect on",
-        '-iex', "set logging overwrite off",
-    ]
-
     # clean / create output directory
     if exists(output_path):
         mx.rmtree(output_path)
@@ -1237,10 +1230,7 @@ def _runtimedebuginfotest(native_image, output_path, with_isolates_only, args=No
 
     logfile = join(output_path, 'test_runtime_compilation.log')
     os.environ.update({'gdb_logfile': logfile})
-    gdb_command = gdb_args + [
-        '-iex', f"set logging file {logfile}",
-        '-iex', "set logging enabled on",
-        '-iex', f"set auto-load safe-path {join(output_path, 'gdb-debughelpers.py')}",
+    gdb_command = gdb_base_command(logfile, join(output_path, 'gdb-debughelpers.py')) + [
         '-x', test_runtime_compilation_py, runtime_compile_binary
     ]
     # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
@@ -1259,10 +1249,7 @@ def run_js_test(eager: bool = False):
         js_launcher = get_js_launcher(jslib)
         logfile = join(output_path, 'test_runtime_deopt_' + ('eager' if eager else 'lazy') + '.log')
         os.environ.update({'gdb_logfile': logfile})
-        gdb_command = gdb_args + [
-            '-iex', f"set logging file {logfile}",
-            '-iex', "set logging enabled on",
-            '-iex', f"set auto-load safe-path {join(output_path, 'gdb-debughelpers.py')}",
+        gdb_command = gdb_base_command(logfile, join(output_path, 'gdb-debughelpers.py')) + [
             '-x', test_runtime_deopt_py, '--args', js_launcher, testdeopt_js
         ]
         # unittest may result in different exit code, nonZeroIsFatal ensures that we can go on with other test
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java
@@ -26,7 +26,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public class ArrayTypeEntry extends StructureTypeEntry {
+public final class ArrayTypeEntry extends StructureTypeEntry {
     private final TypeEntry elementType;
     private final LoaderEntry loader;
 
@@ -43,6 +43,6 @@ public TypeEntry getElementType() {
     }
 
     public String getLoaderId() {
-        return (loader != null ? loader.loaderId() : "");
+        return loader.loaderId();
     }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java
@@ -37,7 +37,7 @@
 /**
  * Track debug info associated with a Java class.
  */
-public class ClassEntry extends StructureTypeEntry {
+public sealed class ClassEntry extends StructureTypeEntry permits EnumClassEntry, InterfaceClassEntry {
     /**
      * Details of this class's superclass.
      */
@@ -242,7 +242,7 @@ public int getDirIdx(DirEntry dir) {
     }
 
     public String getLoaderId() {
-        return (loader != null ? loader.loaderId() : "");
+        return loader.loaderId();
     }
 
     /**
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
@@ -252,9 +252,6 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
 
         stringTable = new StringTable();
         lineStringTable = new StringTable();
-        /* Ensure we have a null string at the start of the string table. */
-        uniqueDebugString("");
-        uniqueDebugLineString("");
         /* Create the cachePath string entry which serves as base directory for source files */
         cachePath = uniqueDebugString(debugInfoProvider.cachePath());
         uniqueDebugLineString(debugInfoProvider.cachePath());
@@ -282,8 +279,6 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                         case FOREIGN_METHOD_LIST_TYPE -> foreignMethodListClassEntry = classEntry;
                     }
                 }
-                default -> {
-                }
             }
         });
     }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java
@@ -26,7 +26,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public class EnumClassEntry extends ClassEntry {
+public final class EnumClassEntry extends ClassEntry {
 
     // The typedef name if this is a representation of a c enum type
     private final String typedefName;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignStructTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignStructTypeEntry.java
@@ -25,7 +25,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public class ForeignStructTypeEntry extends StructureTypeEntry {
+public final class ForeignStructTypeEntry extends StructureTypeEntry {
 
     private final String typedefName;
     private final ForeignStructTypeEntry parent;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java
@@ -26,7 +26,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public class HeaderTypeEntry extends StructureTypeEntry {
+public final class HeaderTypeEntry extends StructureTypeEntry {
 
     private FieldEntry hubField;
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentSkipListSet;
 
-public class InterfaceClassEntry extends ClassEntry {
+public final class InterfaceClassEntry extends ClassEntry {
     private final ConcurrentSkipListSet<ClassEntry> implementors;
 
     public InterfaceClassEntry(String typeName, int size, long classOffset, long typeSignature,
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PointerToTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PointerToTypeEntry.java
@@ -25,7 +25,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public class PointerToTypeEntry extends TypeEntry {
+public final class PointerToTypeEntry extends TypeEntry {
     private TypeEntry pointerTo;
 
     public PointerToTypeEntry(String typeName, int size, long classOffset, long typeSignature, TypeEntry pointerTo) {
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java
@@ -28,7 +28,7 @@
 
 import jdk.vm.ci.meta.JavaKind;
 
-public class PrimitiveTypeEntry extends TypeEntry {
+public final class PrimitiveTypeEntry extends TypeEntry {
 
     private final int bitCount;
     private final boolean isNumericInteger;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StringTable.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StringTable.java
@@ -40,6 +40,8 @@ public class StringTable implements Iterable<StringEntry> {
 
     public StringTable() {
         this.table = new ConcurrentHashMap<>();
+        /* Ensure we have a null string at the start of the string table. */
+        this.table.put("", new StringEntry(""));
     }
 
     /**
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java
@@ -34,7 +34,7 @@
  * An intermediate type that provides behaviour for managing fields. This unifies code for handling
  * header structures and Java instance and array classes that both support data members.
  */
-public abstract class StructureTypeEntry extends TypeEntry {
+public abstract sealed class StructureTypeEntry extends TypeEntry permits ArrayTypeEntry, ClassEntry, ForeignStructTypeEntry, HeaderTypeEntry {
     /**
      * Details of fields located in this instance.
      */
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java
@@ -26,7 +26,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-public abstract class TypeEntry {
+public abstract sealed class TypeEntry permits StructureTypeEntry, PrimitiveTypeEntry, PointerToTypeEntry {
     /**
      * The name of this type.
      */
@@ -98,7 +98,6 @@ public String toString() {
             case ForeignStructTypeEntry fs -> "ForeignStruct";
             case PointerToTypeEntry fs -> "PointerTo";
             case ClassEntry c -> "Instance";
-            default -> "";
         };
         return String.format("%sType(%s size=%d @%s)", kind, getTypeName(), getSize(), Long.toHexString(classOffset));
     }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/range/CallRange.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/range/CallRange.java
@@ -43,7 +43,7 @@ public class CallRange extends Range {
      * The direct callees whose ranges are wholly contained in this range. Empty if this is a leaf
      * range.
      */
-    private final Set<Range> callees = new TreeSet<>(Comparator.comparing(Range::getLoOffset));
+    private Set<Range> callees = Set.of();
 
     protected CallRange(PrimaryRange primary, MethodEntry methodEntry, Map<LocalEntry, LocalValueEntry> localInfoList, int lo, int hi, int line, CallRange caller, int depth) {
         super(primary, methodEntry, localInfoList, lo, hi, line, caller, depth);
@@ -62,6 +62,10 @@ public Stream<Range> rangeStream() {
     protected void addCallee(Range callee) {
         assert this.contains(callee);
         assert callee.getCaller() == this;
+
+        if (callees.isEmpty()) {
+            callees = new TreeSet<>(Comparator.comparing(Range::getLoOffset));
+        }
         callees.add(callee);
     }
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/range/Range.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/range/Range.java
@@ -158,7 +158,7 @@ protected Range(PrimaryRange primary, MethodEntry methodEntry, Map<LocalEntry, L
     }
 
     /**
-     * Splits an initial range at the given stack decrement point. The lower split will stay as it
+     * Splits an initial range at the given stack decrement point. The lower split will stay as is
      * with its high offset reduced to the stack decrement point. The higher split starts at the
      * stack decrement point and has updated local value entries for the parameters in the then
      * extended stack.
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
@@ -915,9 +915,9 @@ public void writeContent(DebugContext context) {
     public int writeAbbrevs(DebugContext context, byte[] buffer, int p) {
         int pos = p;
         /*
-         * Write all abbrevs for AOT and run-time debug info Abbrevs use the least space of all
+         * Write all abbrevs for AOT and run-time debug info. Abbrevs use the least space of all
          * debug info sections, so there is no real benefit in reducing the amount of abbrevs for
-         * run-time debug info
+         * run-time debug info.
          */
 
         // Top level DIEs
@@ -939,12 +939,12 @@ public int writeAbbrevs(DebugContext context, byte[] buffer, int p) {
         pos = writeArrayLayoutAbbrev(context, buffer, pos);
         pos = writeInterfaceLayoutAbbrev(context, buffer, pos);
         /*
-         * if we address rebasing is required then we need to use compressed layout types supplied
-         * with a suitable data_location attribute and compressed pointer types to ensure that gdb
+         * If address rebasing is required then we need to use compressed layout types supplied with
+         * a suitable data_location attribute and compressed pointer types to ensure that gdb
          * converts offsets embedded in static or instance fields to raw pointers. Transformed
          * addresses are typed using pointers to the underlying layout.
          *
-         * if address rebasing is not required then a data_location attribute on the layout type
+         * If address rebasing is not required then a data_location attribute on the layout type
          * will ensure that address tag bits are removed.
          *
          * The compressed layout is also used for representing the decode step for dynamic hubs.
@@ -1625,10 +1625,8 @@ private int writeParameterDeclarationAbbrevs(DebugContext context, byte[] buffer
         pos = writeParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_1, buffer, pos);
         pos = writeParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_2, buffer, pos);
         pos = writeParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_3, buffer, pos);
-        if (!dwarfSections.isRuntimeCompilation() || true) {
-            pos = writeSkeletonParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_4, buffer, pos);
-            pos = writeSkeletonParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_5, buffer, pos);
-        }
+        pos = writeSkeletonParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_4, buffer, pos);
+        pos = writeSkeletonParameterDeclarationAbbrev(context, AbbrevCode.METHOD_PARAMETER_DECLARATION_5, buffer, pos);
         return pos;
     }
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
@@ -141,8 +141,8 @@ public int generateContent(DebugContext context, byte[] buffer) {
         pos = writePointerToTypes(context, buffer, pos);
 
         /*
-         * Write TUs (only AOT debug info) and CUs for all instance classes, which includes
-         * interfaces and enums.
+         * Write CUs for all instance classes, which includes interfaces and enums. Additionally,
+         * for AOT debug info this also writes TUs.
          */
         pos = writeInstanceClasses(context, buffer, pos);
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java
@@ -133,8 +133,6 @@ CVTypeRecord buildType(TypeEntry typeEntry) {
                     // typeEntry is either ArrayTypeEntry, ClassEntry, or ForeignStructTypeEntry
                     // TODO continue treat foreign types as interfaces/classes but fix this later
                     typeRecord = buildStructureTypeEntry(structureTypeEntry);
-                default -> {
-                }
             }
         }
         assert typeRecord != null;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java
@@ -476,8 +476,9 @@ public Builder(DebugContext debug, int targetCodeSize, int maxDepth, boolean use
         @SuppressWarnings("try")
         public CallNode build(CompilationResult compilationResult) {
             try (DebugContext.Scope s = debug.scope("FrameTree.Builder", compilationResult)) {
-                debug.log(DebugContext.VERBOSE_LEVEL, "Building FrameTree for %s", compilationResult);
-
+                if (debug.isLogEnabled()) {
+                    debug.log(DebugContext.VERBOSE_LEVEL, "Building FrameTree for %s", compilationResult);
+                }
                 List<Infopoint> infopoints = compilationResult.getInfopoints();
                 List<SourceMapping> sourceMappings = compilationResult.getSourceMappings();
                 List<SourcePositionSupplier> sourcePosData = new ArrayList<>(infopoints.size() + sourceMappings.size());
@@ -488,20 +489,26 @@ public CallNode build(CompilationResult compilationResult) {
                         sourcePosData.add(wrapper);
                         infopointForRoot = wrapper;
                     } else {
-                        debug.log(DebugContext.DETAILED_LEVEL, " Discard Infopoint %s", infopoint);
+                        if (debug.isLogEnabled(DebugContext.DETAILED_LEVEL)) {
+                            debug.log(" Discard Infopoint %s", infopoint);
+                        }
                     }
                 }
                 if (useSourceMappings) {
                     for (SourceMapping sourceMapping : sourceMappings) {
                         SourceMappingWrapper wrapper = SourceMappingWrapper.create(sourceMapping, maxDepth);
                         if (wrapper != null) {
                             if (wrapper.getStartOffset() > targetCodeSize - 1) {
-                                debug.log(DebugContext.DETAILED_LEVEL, " Discard SourceMapping outside code-range %s", SourceMappingWrapper.getSourceMappingString(sourceMapping));
+                                if (debug.isLogEnabled(DebugContext.DETAILED_LEVEL)) {
+                                    debug.log(" Discard SourceMapping outside code-range %s", SourceMappingWrapper.getSourceMappingString(sourceMapping));
+                                }
                                 continue;
                             }
                             sourcePosData.add(wrapper);
                         } else {
-                            debug.log(DebugContext.DETAILED_LEVEL, " Discard SourceMapping %s", SourceMappingWrapper.getSourceMappingString(sourceMapping));
+                            if (debug.isLogEnabled(DebugContext.DETAILED_LEVEL)) {
+                                debug.log(" Discard SourceMapping %s", SourceMappingWrapper.getSourceMappingString(sourceMapping));
+                            }
                         }
                     }
                 }
@@ -607,7 +614,9 @@ void nullifyOverlappingSourcePositions(List<SourcePositionSupplier> sourcePosDat
                 SourcePositionSupplier rightPos = sourcePosData.get(indexRight);
 
                 if (overlappingSourcePosition(leftPos, rightPos)) {
-                    debug.log(DebugContext.DETAILED_LEVEL, "Handle Overlapping SourcePositions: %s | %s", leftPos, rightPos);
+                    if (debug.isLogEnabled(DebugContext.DETAILED_LEVEL)) {
+                        debug.log("Handle Overlapping SourcePositions: %s | %s", leftPos, rightPos);
+                    }
 
                     /* Handle infopoint overlapping */
                     if (leftPos instanceof InfopointSourceWrapper && rightPos instanceof InfopointSourceWrapper) {
@@ -693,7 +702,7 @@ private CallNode visitFrame(SourcePositionSupplier sourcePos, BytecodePosition f
                 }
 
                 boolean hasEqualCaller = FrameNode.hasEqualCaller(root.frame, frame);
-                if (!hasEqualCaller) {
+                if (debug.isLogEnabled() && !hasEqualCaller) {
                     debug.log("Bottom frame mismatch for %s", sourcePos);
                 }
                 if (callee == null && hasEqualCaller) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SubstrateDebugInfoInstaller.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SubstrateDebugInfoInstaller.java
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SubstrateDebugInfoProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SubstrateDebugInfoProvider.java
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/GraalGraphObjectReplacer.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/GraalGraphObjectReplacer.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/helper/test_runtime_deopt.py b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/helper/test_runtime_deopt.py

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`package com.oracle.objectfile.debugentry;`
`28`	`28`
`29`		`-public class ArrayTypeEntry extends StructureTypeEntry {`
	`29`	`+public final class ArrayTypeEntry extends StructureTypeEntry {`
`30`	`30`	`private final TypeEntry elementType;`
`31`	`31`	`private final LoaderEntry loader;`
`32`	`32`
`@@ -43,6 +43,6 @@ public TypeEntry getElementType() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public String getLoaderId() {`
`46`		`- return (loader != null ? loader.loaderId() : "");`
	`46`	`+ return loader.loaderId();`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,6 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {`
`252`	`252`
`253`	`253`	`stringTable = new StringTable();`
`254`	`254`	`lineStringTable = new StringTable();`
`255`		`- /* Ensure we have a null string at the start of the string table. */`
`256`		`- uniqueDebugString("");`
`257`		`- uniqueDebugLineString("");`
`258`	`255`	`/* Create the cachePath string entry which serves as base directory for source files */`
`259`	`256`	`cachePath = uniqueDebugString(debugInfoProvider.cachePath());`
`260`	`257`	`uniqueDebugLineString(debugInfoProvider.cachePath());`
`@@ -282,8 +279,6 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {`
`282`	`279`	`case FOREIGN_METHOD_LIST_TYPE -> foreignMethodListClassEntry = classEntry;`
`283`	`280`	`}`
`284`	`281`	`}`
`285`		`- default -> {`
`286`		`- }`
`287`	`282`	`}`
`288`	`283`	`});`
`289`	`284`	`}`