Fix DWARF debug information emitted for empty enum (#433)

filipnavara · web-flow · commit 167a9c5cb443 · 2023-06-16T14:21:44.000-07:00
diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.cpp b/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.cpp
@@ -59,6 +59,13 @@ void Dump(MCObjectStreamer *Streamer, uint16_t DwarfVersion, unsigned TargetPoin
         dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
         0, 0,
 
+    EnumerationTypeNoChildren,
+        dwarf::DW_TAG_enumeration_type, dwarf::DW_CHILDREN_no,
+        dwarf::DW_AT_name, dwarf::DW_FORM_strp,
+        dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
+        dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
+        0, 0,
+
     Enumerator1,
         dwarf::DW_TAG_enumerator, dwarf::DW_CHILDREN_no,
         dwarf::DW_AT_name, dwarf::DW_FORM_strp,
diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.h b/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.h
@@ -21,6 +21,7 @@ enum DwarfAbbrev : uint16_t
   CompileUnit = 0x1,
   BaseType,
   EnumerationType,
+  EnumerationTypeNoChildren,
   Enumerator1,
   Enumerator2,
   Enumerator4,
diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfTypeBuilder.cpp b/llvm/tools/objwriter/debugInfo/dwarf/dwarfTypeBuilder.cpp
@@ -282,7 +282,7 @@ void DwarfEnumTypeInfo::DumpStrings(MCObjectStreamer *Streamer) {
 
 void DwarfEnumTypeInfo::DumpTypeInfo(MCObjectStreamer *Streamer, UserDefinedDwarfTypesBuilder *TypeBuilder) {
   // Abbrev Number
-  Streamer->emitULEB128IntValue(DwarfAbbrev::EnumerationType);
+  Streamer->emitULEB128IntValue(HasChildren() ? DwarfAbbrev::EnumerationType : DwarfAbbrev::EnumerationTypeNoChildren);
 
   // DW_AT_name
   EmitSectionOffset(Streamer, StrSymbol, 4);
