[GR-62835] Assertion error when loading native image debug info in GDB 16.

PullRequest: graal/20252

Author: dominikmascherbauer

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

@@ -1116,6 +1116,7 @@ private int writeClassLayoutAbbrevs(@SuppressWarnings("unused") DebugContext con
         int pos = p;
         pos = writeClassLayoutAbbrev(context, AbbrevCode.CLASS_LAYOUT_1, buffer, pos);
         pos = writeClassLayoutAbbrev(context, AbbrevCode.CLASS_LAYOUT_3, buffer, pos);
+        pos = writeClassLayoutAbbrev(context, AbbrevCode.CLASS_LAYOUT_4, buffer, pos);
         if (!dwarfSections.useHeapBase()) {
             pos = writeClassLayoutAbbrev(context, AbbrevCode.CLASS_LAYOUT_2, buffer, pos);
         }
@@ -1130,21 +1131,23 @@ private int writeClassLayoutAbbrev(@SuppressWarnings("unused") DebugContext cont
         pos = writeHasChildren(DwarfHasChildren.DW_CHILDREN_yes, buffer, pos);
         pos = writeAttrType(DwarfAttribute.DW_AT_name, buffer, pos);
         pos = writeAttrForm(DwarfForm.DW_FORM_strp, buffer, pos);
-        if (abbrevCode == AbbrevCode.CLASS_LAYOUT_3) {
+        if (abbrevCode == AbbrevCode.CLASS_LAYOUT_3 || abbrevCode == AbbrevCode.CLASS_LAYOUT_4) {
             pos = writeAttrType(DwarfAttribute.DW_AT_declaration, buffer, pos);
             pos = writeAttrForm(DwarfForm.DW_FORM_flag, buffer, pos);
             pos = writeAttrType(DwarfAttribute.DW_AT_signature, buffer, pos);
             pos = writeAttrForm(DwarfForm.DW_FORM_ref_sig8, buffer, pos);
+            if (abbrevCode == AbbrevCode.CLASS_LAYOUT_4) {
+                pos = writeAttrType(DwarfAttribute.DW_AT_decl_file, buffer, pos);
+                pos = writeAttrForm(DwarfForm.DW_FORM_data2, buffer, pos);
+                /*-
+                 * At present we definitely don't have a line number for the class itself.
+                   pos = writeAttrType(DwarfDebugInfo.DW_AT_decl_line, buffer, pos);
+                   pos = writeAttrForm(DwarfDebugInfo.DW_FORM_data2, buffer, pos);
+                */
+            }
         } else {
             pos = writeAttrType(DwarfAttribute.DW_AT_byte_size, buffer, pos);
             pos = writeAttrForm(DwarfForm.DW_FORM_data2, buffer, pos);
-            pos = writeAttrType(DwarfAttribute.DW_AT_decl_file, buffer, pos);
-            pos = writeAttrForm(DwarfForm.DW_FORM_data2, buffer, pos);
-            /*-
-             * At present we definitely don't have a line number for the class itself.
-               pos = writeAttrType(DwarfDebugInfo.DW_AT_decl_line, buffer, pos);
-               pos = writeAttrForm(DwarfDebugInfo.DW_FORM_data2, buffer, pos);
-            */
             if (abbrevCode == AbbrevCode.CLASS_LAYOUT_2) {
                 pos = writeAttrType(DwarfAttribute.DW_AT_data_location, buffer, pos);
                 pos = writeAttrForm(DwarfForm.DW_FORM_expr_loc, buffer, pos);

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

@@ -70,6 +70,7 @@ enum AbbrevCode {
         CLASS_LAYOUT_1,
         CLASS_LAYOUT_2,
         CLASS_LAYOUT_3,
+        CLASS_LAYOUT_4,
         TYPE_POINTER_SIG,
         TYPE_POINTER,
         FOREIGN_TYPEDEF,

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

@@ -162,7 +162,7 @@ public int generateContent(DebugContext context, byte[] buffer) {
     private int writeSkeletonClassLayout(DebugContext context, ClassEntry classEntry, byte[] buffer, int p) {
         int pos = p;
         log(context, "  [0x%08x] class layout", pos);
-        AbbrevCode abbrevCode = AbbrevCode.CLASS_LAYOUT_3;
+        AbbrevCode abbrevCode = AbbrevCode.CLASS_LAYOUT_4;
         log(context, "  [0x%08x] <1> Abbrev Number %d", pos, abbrevCode.ordinal());
         pos = writeAbbrevCode(abbrevCode, buffer, pos);
         String name = classEntry.getTypeName();
@@ -173,6 +173,9 @@ private int writeSkeletonClassLayout(DebugContext context, ClassEntry classEntry
         long typeSignature = classEntry.getLayoutTypeSignature();
         log(context, "  [0x%08x]     type specification 0x%x", pos, typeSignature);
         pos = writeTypeSignature(typeSignature, buffer, pos);
+        int fileIdx = classEntry.getFileIdx();
+        log(context, "  [0x%08x]     file  0x%x (%s)", pos, fileIdx, classEntry.getFileName());
+        pos = writeAttrData2((short) fileIdx, buffer, pos);
 
         pos = writeStaticFieldDeclarations(context, classEntry, buffer, pos);
         pos = writeMethodDeclarations(context, classEntry, buffer, pos);
@@ -646,9 +649,6 @@ private int writeClassLayoutTypeUnit(DebugContext context, ClassEntry classEntry
         int size = classEntry.getSize();
         log(context, "  [0x%08x]     byte_size 0x%x", pos, size);
         pos = writeAttrData2((short) size, buffer, pos);
-        int fileIdx = classEntry.getFileIdx();
-        log(context, "  [0x%08x]     file  0x%x (%s)", pos, fileIdx, classEntry.getFileName());
-        pos = writeAttrData2((short) fileIdx, buffer, pos);
         if (abbrevCode == AbbrevCode.CLASS_LAYOUT_2) {
             /* Write a data location expression to mask and/or rebase oop pointers. */
             log(context, "  [0x%08x]     data_location", pos);