don't name the encoding & don't assert in range lo_user - hi_user)

Author: OCHyams

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -1119,7 +1119,7 @@ llvm::DIType *CGDebugInfo::CreateType(const ComplexType *Ty) {
   // Bit size and offset of the type.
   llvm::dwarf::TypeKind Encoding = llvm::dwarf::DW_ATE_complex_float;
   if (Ty->isComplexIntegerType())
-    Encoding = llvm::dwarf::DW_ATE_GNU_complex_signed;
+    Encoding = llvm::dwarf::DW_ATE_lo_user;
 
   uint64_t Size = CGM.getContext().getTypeSize(Ty);
   return DBuilder.createBasicType("complex", Size, Encoding);

llvm/include/llvm/BinaryFormat/Dwarf.def

@@ -1111,8 +1111,6 @@ HANDLE_DW_ATE(0x12, ASCII, 5, DWARF)
 // HANDLE_DW_ATE(0x80, ALTIUM_fract, 2, ALTIUM) = DW_ATE_low_user
 // HANDLE_DW_ATE(0x81, ALTIUM_accum, 2, ALTIUM)
 
-HANDLE_DW_ATE(0x80, GNU_complex_signed, 4, GNU)
-
 HANDLE_DW_ATE(0x81, HP_complex_float, 2, HP)
 HANDLE_DW_ATE(0x82, HP_float128, 2, HP)
 HANDLE_DW_ATE(0x83, HP_complex_float128, 2, HP)

llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp

@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/DebugHandlerBase.h"
+#include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
@@ -236,9 +237,10 @@ bool DebugHandlerBase::isUnsignedDIType(const DIType *Ty) {
           Encoding == dwarf::DW_ATE_float || Encoding == dwarf::DW_ATE_UTF ||
           Encoding == dwarf::DW_ATE_boolean ||
           Encoding == dwarf::DW_ATE_complex_float ||
-          Encoding == dwarf::DW_ATE_GNU_complex_signed ||
           Encoding == dwarf::DW_ATE_signed_fixed ||
           Encoding == dwarf::DW_ATE_unsigned_fixed ||
+          (Encoding >= dwarf::DW_ATE_lo_user &&
+           Encoding <= dwarf::DW_ATE_hi_user) ||
           (Ty->getTag() == dwarf::DW_TAG_unspecified_type &&
            Ty->getName() == "decltype(nullptr)")) &&
          "Unsupported encoding");

llvm/test/DebugInfo/dwarf-complex-int.ll

@@ -15,7 +15,7 @@
 
 ; CHECK: [[complex]]: DW_TAG_base_type
 ; CHECK-NEXT: DW_AT_name        ("complex")
-; CHECK-NEXT: DW_AT_encoding    (DW_ATE_GNU_complex_signed)
+; CHECK-NEXT: DW_AT_encoding    (0x80)
 ; CHECK-NEXT: DW_AT_byte_size   (0x04)
 
 @g = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0