Remove FileEntry from Range, use the one from the corresponding MethodEntry

Author: zakkak

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

@@ -157,8 +157,9 @@ public void indexPrimary(Range primary, List<DebugFrameSizeChange> frameSizeInfo
                 assert includesDeoptTarget == false;
             }
             FileEntry primaryFileEntry = primary.getFileEntry();
-            assert primaryFileEntry != null;
-            indexLocalFileEntry(primaryFileEntry);
+            if (primaryFileEntry != null) {
+                indexLocalFileEntry(primaryFileEntry);
+            }
         }
     }
 
@@ -344,15 +345,6 @@ public ClassEntry getSuperClass() {
         return superClass;
     }
 
-    public Range makePrimaryRange(StringTable stringTable, MethodEntry method, int lo, int hi, int primaryLine) {
-        FileEntry fileEntryToUse = method.fileEntry;
-        if (fileEntryToUse == null) {
-            /* Last chance is the class's file entry. */
-            fileEntryToUse = this.fileEntry;
-        }
-        return new Range(stringTable, method, fileEntryToUse, lo, hi, primaryLine);
-    }
-
     public MethodEntry getMethodEntry(DebugMethodInfo debugMethodInfo, DebugInfoBase debugInfoBase, DebugContext debugContext) {
         assert listIsSorted(methods);
         String methodName = debugInfoBase.uniqueDebugString(debugMethodInfo.name());

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

@@ -247,7 +247,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
             /* Search for a method defining this primary range. */
             ClassEntry classEntry = ensureClassEntry(className);
             MethodEntry methodEntry = classEntry.getMethodEntry(debugCodeInfo, this, debugContext);
-            Range primaryRange = classEntry.makePrimaryRange(stringTable, methodEntry, lo, hi, primaryLine);
+            Range primaryRange = new Range(stringTable, methodEntry, lo, hi, primaryLine);
             debugContext.log(DebugContext.INFO_LEVEL, "PrimaryRange %s.%s %s %s:%d [0x%x, 0x%x]", className, methodName, filePath, fileName, primaryLine, lo, hi);
             classEntry.indexPrimary(primaryRange, debugCodeInfo.getFrameSizeChanges(), debugCodeInfo.getFrameSize());
             debugCodeInfo.lineInfoProvider().forEach(debugLineInfo -> {

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

@@ -34,7 +34,6 @@
 
 public class Range {
     private static final String CLASS_DELIMITER = ".";
-    private final FileEntry fileEntry;
     private final MethodEntry methodEntry;
     private final String fullMethodNameWithParams;
     private final int lo;
@@ -48,28 +47,19 @@ public class Range {
     /*
      * Create a primary range.
      */
-    public Range(StringTable stringTable, MethodEntry methodEntry, FileEntry fileEntry, int lo, int hi, int line) {
-        this(stringTable, methodEntry, fileEntry, lo, hi, line, null);
-    }
-
-    /*
-     * Create a secondary range.
-     */
-    public Range(StringTable stringTable, MethodEntry methodEntry, int lo, int hi, int line, Range primary) {
-        this(stringTable, methodEntry, methodEntry.fileEntry, lo, hi, line, primary);
+    public Range(StringTable stringTable, MethodEntry methodEntry, int lo, int hi, int line) {
+        this(stringTable, methodEntry, lo, hi, line, null);
     }
 
     /*
      * Create a primary or secondary range.
      */
-    private Range(StringTable stringTable, MethodEntry methodEntry, FileEntry fileEntry, int lo, int hi, int line,
-                    Range primary) {
-        this.fileEntry = fileEntry;
-        if (fileEntry != null) {
-            stringTable.uniqueDebugString(fileEntry.getFileName());
-            stringTable.uniqueDebugString(fileEntry.getPathName());
-        }
+    public Range(StringTable stringTable, MethodEntry methodEntry, int lo, int hi, int line, Range primary) {
         assert methodEntry != null;
+        if (methodEntry.fileEntry != null) {
+            stringTable.uniqueDebugString(methodEntry.fileEntry.getFileName());
+            stringTable.uniqueDebugString(methodEntry.fileEntry.getPathName());
+        }
         this.methodEntry = methodEntry;
         this.fullMethodNameWithParams = stringTable.uniqueString(constructClassAndMethodNameWithParams());
         this.lo = lo;
@@ -158,7 +148,7 @@ private String constructClassAndMethodNameWithParams() {
     }
 
     public FileEntry getFileEntry() {
-        return fileEntry;
+        return methodEntry.fileEntry;
     }
 
     public int getModifiers() {
@@ -167,11 +157,11 @@ public int getModifiers() {
 
     @Override
     public String toString() {
-        return String.format("Range(lo=0x%05x hi=0x%05x %s %s:%d)", lo, hi, constructClassAndMethodNameWithParams(), fileEntry.getFullName(), line);
+        return String.format("Range(lo=0x%05x hi=0x%05x %s %s:%d)", lo, hi, constructClassAndMethodNameWithParams(), methodEntry.fileEntry.getFullName(), line);
     }
 
     public String getFileName() {
-        return fileEntry.getFileName();
+        return methodEntry.fileEntry.getFileName();
     }
 
     public MethodEntry getMethodEntry() {