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

zakkak · stooke · zakkak · commit 12beae445a51 · 2021-06-10T09:12:06.000+03:00
Co-Authored-By: Simon Tooke &lt;stooke@redhat.com&gt;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/Range.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/Range.java
@@ -157,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(), methodEntry.fileEntry.getFullName(), line);
+        return String.format("Range(lo=0x%05x hi=0x%05x %s %s:%d)", lo, hi, constructClassAndMethodNameWithParams(), methodEntry.getFullFileName(), line);
     }
 
     public String getFileName() {
-        return methodEntry.fileEntry.getFileName();
+        return methodEntry.getFileName();
     }
 
     public MethodEntry getMethodEntry() {

Original file line number	Diff line number	Diff line change
`@@ -157,11 +157,11 @@ public int getModifiers() {`
`157`	`157`
`158`	`158`	`@Override`
`159`	`159`	`public String toString() {`
`160`		`- return String.format("Range(lo=0x%05x hi=0x%05x %s %s:%d)", lo, hi, constructClassAndMethodNameWithParams(), methodEntry.fileEntry.getFullName(), line);`
	`160`	`+ return String.format("Range(lo=0x%05x hi=0x%05x %s %s:%d)", lo, hi, constructClassAndMethodNameWithParams(), methodEntry.getFullFileName(), line);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`public String getFileName() {`
`164`		`- return methodEntry.fileEntry.getFileName();`
	`164`	`+ return methodEntry.getFileName();`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public MethodEntry getMethodEntry() {`