Refactor: Introduce DebugRangeInfo interface

Author: zakkak

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

@@ -40,6 +40,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugFrameSizeChange;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugInstanceTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugMethodInfo;
+import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugRangeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
 
@@ -99,7 +100,8 @@ public ClassEntry(String className, FileEntry fileEntry, int size) {
         this.fileEntry = fileEntry;
         // methods is a sorted list and we want to be able to add more elements to it while keeping
         // it sorted,
-        // so a LinkedList seems more appropriate than an ArrayList. (see getMethodEntry)
+        // so a LinkedList seems more appropriate than an ArrayList.
+        // (see ensureMethodEntryForDebugRangeInfo)
         this.methods = new LinkedList<>();
         this.primaryEntries = new ArrayList<>();
         this.primaryIndex = new HashMap<>();
@@ -345,11 +347,11 @@ public ClassEntry getSuperClass() {
         return superClass;
     }
 
-    public MethodEntry getMethodEntry(DebugMethodInfo debugMethodInfo, DebugInfoBase debugInfoBase, DebugContext debugContext) {
+    public MethodEntry ensureMethodEntryForDebugRangeInfo(DebugRangeInfo debugRangeInfo, DebugInfoBase debugInfoBase, DebugContext debugContext) {
         assert listIsSorted(methods);
-        String methodName = debugInfoBase.uniqueDebugString(debugMethodInfo.name());
-        String paramSignature = debugMethodInfo.paramSignature();
-        String returnTypeName = debugMethodInfo.valueType();
+        String methodName = debugInfoBase.uniqueDebugString(debugRangeInfo.name());
+        String paramSignature = debugRangeInfo.paramSignature();
+        String returnTypeName = debugRangeInfo.valueType();
         ListIterator<MethodEntry> methodIterator = methods.listIterator();
         while (methodIterator.hasNext()) {
             MethodEntry methodEntry = methodIterator.next();
@@ -362,7 +364,7 @@ public MethodEntry getMethodEntry(DebugMethodInfo debugMethodInfo, DebugInfoBase
                 break;
             }
         }
-        MethodEntry newMethodEntry = processMethod(debugMethodInfo, debugInfoBase, debugContext, true);
+        MethodEntry newMethodEntry = processMethod(debugRangeInfo, debugInfoBase, debugContext, true);
         methodIterator.add(newMethodEntry);
         return newMethodEntry;
     }

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

@@ -245,7 +245,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);
+            MethodEntry methodEntry = classEntry.ensureMethodEntryForDebugRangeInfo(debugCodeInfo, this, debugContext);
             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());
@@ -262,7 +262,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                  * symbol for them and don't see a break in the address range.
                  */
                 ClassEntry subClassEntry = ensureClassEntry(classNameAtLine);
-                MethodEntry subMethodEntry = subClassEntry.getMethodEntry(debugLineInfo, this, debugContext);
+                MethodEntry subMethodEntry = subClassEntry.ensureMethodEntryForDebugRangeInfo(debugLineInfo, this, debugContext);
                 Range subRange = new Range(stringTable, subMethodEntry, loAtLine, hiAtLine, line, primaryRange);
                 classEntry.indexSubRange(subRange);
                 try (DebugContext.Scope s = debugContext.scope("Subranges")) {

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java

@@ -227,10 +227,17 @@ interface DebugMethodInfo extends DebugMemberInfo {
         boolean isDeoptTarget();
     }
 
+    /**
+     * Access details of a compiled method producing the code in a specific
+     * {@link com.oracle.objectfile.debugentry.Range}.
+     */
+    interface DebugRangeInfo extends DebugMethodInfo {
+    }
+
     /**
      * Access details of a specific compiled method.
      */
-    interface DebugCodeInfo extends DebugMethodInfo {
+    interface DebugCodeInfo extends DebugRangeInfo {
         void debugContext(Consumer<DebugContext> action);
 
         /**
@@ -291,7 +298,7 @@ interface DebugDataInfo {
      * Access details of code generated for a specific outer or inlined method at a given line
      * number.
      */
-    interface DebugLineInfo extends DebugMethodInfo {
+    interface DebugLineInfo extends DebugRangeInfo {
         /**
          * @return the lowest address containing code generated for an outer or inlined code segment
          *         reported at this line represented as an offset into the code segment.