Create subranges for nested inlined callers

Author: zakkak

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

@@ -156,13 +156,14 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                 int hiAtLine = lo + debugLineInfo.addressHi();
                 int line = debugLineInfo.line();
                 Path cachePathAtLine = debugLineInfo.cachePath();
+                Range caller = addCallersSubRanges(debugLineInfo.getCaller(), primaryRange, debugContext);
                 /*
                  * 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, isInlined, primaryRange, false, null);
+                        line, isInlined, primaryRange, false, caller);
                 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);
@@ -178,6 +179,41 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
          */
     }
 
+    /**
+     * Recursively creates the inlined caller subranges for nested inline subranges.
+     *
+     * @param lineInfo
+     * @param primaryRange
+     * @param debugContext
+     * @return the subrange for {@code lineInfo} linked with all its caller subranges up to the primaryRange
+     */
+    @SuppressWarnings("try")
+    private Range addCallersSubRanges(DebugInfoProvider.DebugLineInfo lineInfo, Range primaryRange, DebugContext debugContext) {
+        /* Don't process the root method, it is already added as the primary range */
+        if (lineInfo == null || lineInfo.getCaller() == null) {
+            return primaryRange;
+        }
+        Range caller = addCallersSubRanges(lineInfo.getCaller(), primaryRange, debugContext);
+        final String fileName = lineInfo.fileName();
+        final Path filePath = lineInfo.filePath();
+        final Path cachePath = lineInfo.cachePath();
+        final String className = lineInfo.className();
+        final String methodName = lineInfo.methodName();
+        final String paramNames = lineInfo.paramNames();
+        final String returnTypeName = lineInfo.returnTypeName();
+        final int lo = primaryRange.getLo() + lineInfo.addressLo();
+        final int hi = primaryRange.getLo() + lineInfo.addressHi();
+        final int line = lineInfo.line();
+        Range subRange = new Range(fileName, filePath, cachePath, className, methodName, paramNames, returnTypeName,
+                stringTable, lo, hi, line, true, primaryRange, true, caller);
+        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]",
+                    className, methodName, filePath, fileName, line, lo, hi);
+        }
+        return subRange;
+    }
+
     private ClassEntry ensureClassEntry(Range range) {
         String className = range.getClassName();
         /*