Add dwarf info for nested inlined subroutines

Author: zakkak

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

@@ -28,10 +28,12 @@
 
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.debugentry.ClassEntry;
+import com.oracle.objectfile.debugentry.FileEntry;
 import com.oracle.objectfile.debugentry.PrimaryEntry;
 import com.oracle.objectfile.debugentry.Range;
 import org.graalvm.compiler.debug.DebugContext;
 
+import java.util.HashMap;
 import java.util.LinkedList;
 
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_ABBREV_CODE_compile_unit_stmt_list;
@@ -124,6 +126,11 @@ public void createContent() {
 
         /* CUs for normal methods */
         for (ClassEntry classEntry : getPrimaryClasses()) {
+            /*
+             * Save the offset of this file's CU so it can be used when writing the aranges section
+             * and inlined_subroutines.
+             */
+            classEntry.setCUIndex(pos);
             int lengthPos = pos;
             pos = writeCUHeader(buffer, pos);
             assert pos == lengthPos + DW_DIE_HEADER_SIZE;
@@ -135,6 +142,11 @@ public void createContent() {
         /* CUs for deopt targets */
         for (ClassEntry classEntry : getPrimaryClasses()) {
             if (classEntry.includesDeoptTarget()) {
+                /*
+                 * Save the offset of this file's CU so it can be used when writing the aranges
+                 * section and inlined_subroutines.
+                 */
+                classEntry.setDeoptCUIndex(pos);
                 int lengthPos = pos;
                 pos = writeCUHeader(buffer, pos);
                 assert pos == lengthPos + DW_DIE_HEADER_SIZE;
@@ -160,10 +172,6 @@ public void writeContent(DebugContext context) {
         log(context, "  [0x%08x] size = 0x%08x", pos, size);
         /* write CUs for normal methods */
         for (ClassEntry classEntry : getPrimaryClasses()) {
-            /*
-             * Save the offset of this file's CU so it can be used when writing the aranges section.
-             */
-            classEntry.setCUIndex(pos);
             int lengthPos = pos;
             pos = writeCUHeader(buffer, pos);
             log(context, "  [0x%08x] Compilation Unit", pos, size);
@@ -177,11 +185,6 @@ public void writeContent(DebugContext context) {
         /* write CUs for deopt targets */
         for (ClassEntry classEntry : getPrimaryClasses()) {
             if (classEntry.includesDeoptTarget()) {
-                /*
-                 * Save the offset of this file's CU so it can be used when writing the aranges
-                 * section.
-                 */
-                classEntry.setDeoptCUIndex(pos);
                 int lengthPos = pos;
                 pos = writeCUHeader(buffer, pos);
                 log(context, "  [0x%08x] Compilation Unit (deopt targets)", pos, size);
@@ -261,6 +264,7 @@ private static int findHi(LinkedList<PrimaryEntry> classPrimaryEntries, boolean
     private int writeCU(DebugContext context, ClassEntry classEntry, boolean isDeoptTargetCU, byte[] buffer, int p) {
         int pos = p;
         LinkedList<PrimaryEntry> classPrimaryEntries = classEntry.getPrimaryEntries();
+        assert !classPrimaryEntries.isEmpty();
         int lineIndex = classEntry.getLineIndex();
         int abbrevCode = (lineIndex >= 0 ? DW_ABBREV_CODE_compile_unit_stmt_list : DW_ABBREV_CODE_compile_unit_no_stmt_list);
         log(context, "  [0x%08x] <0> Abbrev Number %d", pos, abbrevCode);
@@ -282,10 +286,75 @@ private int writeCU(DebugContext context, ClassEntry classEntry, boolean isDeopt
             log(context, "  [0x%08x]     stmt_list  0x%08x", pos, lineIndex);
             pos = writeAttrData4(lineIndex, buffer, pos);
         }
+
+        /* Keep a map of method names to the corresponding position of their subprogram entry. */
+        HashMap<String, Integer> primaryMap = new HashMap<>();
+        /* The primary file entry should always be first in the local files list. */
+        assert classEntry.localFilesIdx(classEntry.getFileEntry()) == 1;
+
         for (PrimaryEntry primaryEntry : classPrimaryEntries) {
             Range range = primaryEntry.getPrimary();
-            if (isDeoptTargetCU == range.isDeoptTarget()) {
-                pos = writePrimary(context, range, false, false, 1, buffer, pos);
+            if (isDeoptTargetCU != range.isDeoptTarget()) {
+                continue;
+            }
+            primaryMap.put(range.getFullMethodName(), pos);
+            boolean withChildren = false;
+            /* Go through the subranges and generate abstract debug entries for inlined methods. */
+            for (Range subrange : primaryEntry.getSubranges()) {
+                if (!subrange.isInlined()) {
+                    continue;
+                }
+                withChildren = true;
+                Integer subprogramPos = primaryMap.get(subrange.getFullMethodName());
+                if (subprogramPos == null) {
+                    subprogramPos = pos;
+                    primaryMap.put(subrange.getFullMethodName(), subprogramPos);
+                    FileEntry subFileEntry = primaryEntry.getSubrangeFileEntry(subrange);
+                    assert subFileEntry != null;
+                    if (subFileEntry == null) {
+                        continue;
+                    }
+                    Integer fileIndex = classEntry.localFilesIdx(subFileEntry);
+                    assert fileIndex != null;
+                    pos = writePrimary(context, subrange, true, false, fileIndex, buffer, pos);
+                }
+            }
+            pos = writePrimary(context, range, false, withChildren, 1, buffer, pos);
+            if (withChildren) {
+                int depth = 0;
+                /* Go through the subranges and generate concrete debug entries for inlined methods. */
+                for (Range subrange : primaryEntry.getSubranges()) {
+                    if (!subrange.isInlined()) {
+                        continue;
+                    }
+                    Integer subprogramPos = primaryMap.get(subrange.getFullMethodName());
+                    assert subprogramPos != null;
+                    final Range callerSubrange = subrange.getCaller();
+                    assert callerSubrange != null;
+                    Integer fileIndex;
+                    if (callerSubrange == range) {
+                        fileIndex = 1;
+                    } else {
+                        FileEntry subFileEntry = primaryEntry.getSubrangeFileEntry(callerSubrange);
+                        assert subFileEntry != null;
+                        fileIndex = classEntry.localFilesIdx(subFileEntry);
+                        assert fileIndex != null;
+                    }
+                    int previousPos = pos;
+                    pos = writeInlineSubroutine(context, subrange, buffer, pos, subprogramPos - classEntry.getCUIndex(), depth, fileIndex);
+                    if (subrange.withChildren()) {
+                        if (previousPos != pos) {
+                            depth++;
+                        }
+                    } else {
+                        while (depth > 0) {
+                            pos = writeAttrNull(buffer, pos);
+                            depth--;
+                        }
+                    }
+                }
+                pos = writeAttrNull(buffer, pos);
+                assert depth == 0 : depth;
             }
         }
         /*