Ensure fileEntry is in localFilesIndex of corresponding ClassEntry

Author: zakkak

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

@@ -351,7 +351,11 @@ public MethodEntry ensureMethodEntryForDebugRangeInfo(DebugRangeInfo debugRangeI
             MethodEntry methodEntry = methodIterator.next();
             int comparisonResult = methodEntry.compareTo(debugRangeInfo.symbolNameForMethod());
             if (comparisonResult == 0) {
-                methodEntry.setInRange(debugInfoBase, debugRangeInfo);
+                methodEntry.setInRangeAndUpdateFileEntry(debugInfoBase, debugRangeInfo);
+                if (methodEntry.fileEntry != null) {
+                    /* Ensure that the methodEntry's fileEntry is present in the localsFileIndex */
+                    indexLocalFileEntry(methodEntry.fileEntry);
+                }
                 return methodEntry;
             } else if (comparisonResult > 0) {
                 methodIterator.previous();

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

@@ -91,19 +91,29 @@ public boolean isInRange() {
         return isInRange;
     }
 
-    public void setInRange(DebugInfoBase debugInfoBase, DebugRangeInfo debugRangeInfo) {
+    /**
+     * Sets {@code isInRange} and ensures that the {@code fileEntry} is up to date. If the
+     * MethodEntry was added by traversing the DeclaredMethods of a Class its fileEntry will point
+     * to the original source file, thus it will be wrong for substituted methods. As a result when
+     * setting a MethodEntry as isInRange we also make sure that its fileEntry reflects the file
+     * info associated with the corresponding Range.
+     *
+     * @param debugInfoBase
+     * @param debugRangeInfo
+     */
+    public void setInRangeAndUpdateFileEntry(DebugInfoBase debugInfoBase, DebugRangeInfo debugRangeInfo) {
         if (isInRange) {
             assert fileEntry == debugInfoBase.ensureFileEntry(debugRangeInfo);
             return;
         }
+        isInRange = true;
         /*
          * If the MethodEntry was added by traversing the DeclaredMethods of a Class its fileEntry
          * will point to the original source file, thus it will be wrong for substituted methods. As
          * a result when setting a MethodEntry as isInRange we also make sure that its fileEntry
          * reflects the file info associated with the corresponding Range.
          */
         fileEntry = debugInfoBase.ensureFileEntry(debugRangeInfo);
-        isInRange = true;
     }
 
     public String getSymbolName() {