Augment Range with info for nested inlining

Author: zakkak

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

@@ -151,6 +151,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                 String methodNameAtLine = debugLineInfo.methodName();
                 String paramNamesAtLine = debugLineInfo.paramNames();
                 String returnTypeNameAtLine = debugLineInfo.returnTypeName();
+                boolean isInlined = debugLineInfo.getCaller() != null;
                 int loAtLine = lo + debugLineInfo.addressLo();
                 int hiAtLine = lo + debugLineInfo.addressHi();
                 int line = debugLineInfo.line();
@@ -159,7 +160,9 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                  * Record all subranges even if they have no line or file so we at least get a
                  * symbol for them.
                  */
-                Range subRange = new Range(fileNameAtLine, filePathAtLine, cachePathAtLine, classNameAtLine, methodNameAtLine, paramNamesAtLine, returnTypeNameAtLine, stringTable, loAtLine, hiAtLine, line, primaryRange);
+                Range subRange = new Range(fileNameAtLine, filePathAtLine, cachePathAtLine, classNameAtLine,
+                        methodNameAtLine, paramNamesAtLine, returnTypeNameAtLine, stringTable, loAtLine, hiAtLine,
+                        line, isInlined, primaryRange, false, null);
                 addSubRange(primaryRange, subRange);
                 try (DebugContext.Scope s = debugContext.scope("Subranges")) {
                     debugContext.log(DebugContext.VERBOSE_LEVEL, "SubRange %s.%s %s %s:%d 0x%x, 0x%x]", classNameAtLine, methodNameAtLine, filePathAtLine, fileNameAtLine, line, loAtLine, hiAtLine);

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

@@ -37,6 +37,7 @@
 
 public class Range {
     private final String cachePath;
+    private final Range caller;
     private String fileName;
     private Path filePath;
     private String className;
@@ -48,6 +49,8 @@ public class Range {
     private int hi;
     private int line;
     private boolean isDeoptTarget;
+    private final boolean isInlined;
+    private final boolean withChildren;
     /*
      * This is null for a primary range.
      */
@@ -58,22 +61,22 @@ public class Range {
      */
     public Range(String fileName, Path filePath, Path cachePath, String className, String methodName, String paramNames, String returnTypeName, StringTable stringTable, int lo, int hi, int line,
                     boolean isDeoptTarget) {
-        this(fileName, filePath, cachePath, className, methodName, paramNames, returnTypeName, stringTable, lo, hi, line, isDeoptTarget, null);
+        this(fileName, filePath, cachePath, className, methodName, paramNames, returnTypeName, stringTable, lo, hi, line, isDeoptTarget, false, null, false, null);
     }
 
     /*
      * Create a secondary range.
      */
     public Range(String fileName, Path filePath, Path cachePath, String className, String methodName, String paramNames, String returnTypeName, StringTable stringTable, int lo, int hi, int line,
-                    Range primary) {
-        this(fileName, filePath, cachePath, className, methodName, paramNames, returnTypeName, stringTable, lo, hi, line, false, primary);
+                 boolean isInline, Range primary, boolean withChildren, Range caller) {
+        this(fileName, filePath, cachePath, className, methodName, paramNames, returnTypeName, stringTable, lo, hi, line, false, isInline, primary, withChildren, caller);
     }
 
     /*
      * Create a primary or secondary range.
      */
     private Range(String fileName, Path filePath, Path cachePath, String className, String methodName, String paramNames, String returnTypeName, StringTable stringTable, int lo, int hi, int line,
-                    boolean isDeoptTarget, Range primary) {
+                  boolean isDeoptTarget, boolean isInline, Range primary, boolean withChildren, Range caller) {
         /*
          * Currently file name and full method name need to go into the debug_str section other
          * strings just need to be deduplicated to save space.
@@ -90,7 +93,10 @@ private Range(String fileName, Path filePath, Path cachePath, String className,
         this.hi = hi;
         this.line = line;
         this.isDeoptTarget = isDeoptTarget;
+        this.isInlined = isInline;
         this.primary = primary;
+        this.withChildren = withChildren;
+        this.caller = caller;
     }
 
     public boolean contains(Range other) {
@@ -180,4 +186,16 @@ private String constructClassAndMethodNameWithParams() {
     public String getCachePath() {
         return cachePath;
     }
+
+    public boolean isInlined() {
+        return isInlined;
+    }
+
+    public boolean withChildren() {
+        return withChildren;
+    }
+
+    public Range getCaller() {
+        return caller;
+    }
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java

@@ -509,6 +509,10 @@ private int writeLineNumberTable(DebugContext context, ClassEntry classEntry, by
              * Now write a row for each subrange lo and hi.
              */
             for (Range subrange : primaryEntry.getSubranges()) {
+                if (subrange.withChildren()) {
+                    /* skip caller subranges */
+                    continue;
+                }
                 assert subrange.getLo() >= primaryRange.getLo();
                 assert subrange.getHi() <= primaryRange.getHi();
                 FileEntry subFileEntry = primaryEntry.getSubrangeFileEntry(subrange);