Remove redundant prefixes from constants and unbreak the LLDB bots.

llvm-svn: 285444

diff --git a/llvm/include/llvm/Support/Dwarf.def b/llvm/include/llvm/Support/Dwarf.def
index cde1934..e5c6506 100644 (file)
--- a/llvm/include/llvm/Support/Dwarf.def
+++ b/llvm/include/llvm/Support/Dwarf.def
@@ -604,9 +604,9 @@ HANDLE_DW_VIRTUALITY(0x01, virtual)
 HANDLE_DW_VIRTUALITY(0x02, pure_virtual)
 
 // DWARF v5 Defaulted Member Encodings.
-HANDLE_DW_DEFAULTED(0x00, DW_DEFAULTED_no)
-HANDLE_DW_DEFAULTED(0x01, DW_DEFAULTED_in_class)
-HANDLE_DW_DEFAULTED(0x02, DW_DEFAULTED_out_of_class)
+HANDLE_DW_DEFAULTED(0x00, no)
+HANDLE_DW_DEFAULTED(0x01, in_class)
+HANDLE_DW_DEFAULTED(0x02, out_of_class)
 
 // DWARF calling convention codes.
 HANDLE_DW_CC(0x01, normal)
@@ -625,34 +625,34 @@ HANDLE_DW_CC(0xb6, BORLAND_fastcall)
 HANDLE_DW_CC(0xc0, LLVM_vectorcall)
 
 // DWARF v5 Line number header entry format.
-HANDLE_DW_LNCT(0x01, DW_LNCT_path)
-HANDLE_DW_LNCT(0x02, DW_LNCT_directory_index)
-HANDLE_DW_LNCT(0x03, DW_LNCT_timestamp)
-HANDLE_DW_LNCT(0x04, DW_LNCT_size)
-HANDLE_DW_LNCT(0x05, DW_LNCT_MD5)
-
-HANDLE_DW_MACRO(0x01, DW_MACRO_define)
-HANDLE_DW_MACRO(0x02, DW_MACRO_undef)
-HANDLE_DW_MACRO(0x03, DW_MACRO_start_file)
-HANDLE_DW_MACRO(0x04, DW_MACRO_end_file)
-HANDLE_DW_MACRO(0x05, DW_MACRO_define_strp)
-HANDLE_DW_MACRO(0x06, DW_MACRO_undef_strp)
-HANDLE_DW_MACRO(0x07, DW_MACRO_import)
-HANDLE_DW_MACRO(0x08, DW_MACRO_define_sup)
-HANDLE_DW_MACRO(0x09, DW_MACRO_undef_sup)
-HANDLE_DW_MACRO(0x0a, DW_MACRO_import_sup)
-HANDLE_DW_MACRO(0x0b, DW_MACRO_define_strx)
-HANDLE_DW_MACRO(0x0c, DW_MACRO_undef_strx)
+HANDLE_DW_LNCT(0x01, path)
+HANDLE_DW_LNCT(0x02, directory_index)
+HANDLE_DW_LNCT(0x03, timestamp)
+HANDLE_DW_LNCT(0x04, size)
+HANDLE_DW_LNCT(0x05, MD5)
+
+HANDLE_DW_MACRO(0x01, define)
+HANDLE_DW_MACRO(0x02, undef)
+HANDLE_DW_MACRO(0x03, start_file)
+HANDLE_DW_MACRO(0x04, end_file)
+HANDLE_DW_MACRO(0x05, define_strp)
+HANDLE_DW_MACRO(0x06, undef_strp)
+HANDLE_DW_MACRO(0x07, import)
+HANDLE_DW_MACRO(0x08, define_sup)
+HANDLE_DW_MACRO(0x09, undef_sup)
+HANDLE_DW_MACRO(0x0a, import_sup)
+HANDLE_DW_MACRO(0x0b, define_strx)
+HANDLE_DW_MACRO(0x0c, undef_strx)
 
 // Range list entry encoding values.
-HANDLE_DW_RLE(0x00, DW_RLE_end_of_list)
-HANDLE_DW_RLE(0x01, DW_RLE_base_addressx)
-HANDLE_DW_RLE(0x02, DW_RLE_startx_endx)
-HANDLE_DW_RLE(0x03, DW_RLE_startx_length)
-HANDLE_DW_RLE(0x04, DW_RLE_offset_pair)
-HANDLE_DW_RLE(0x05, DW_RLE_base_address)
-HANDLE_DW_RLE(0x06, DW_RLE_start_end)
-HANDLE_DW_RLE(0x07, DW_RLE_start_length)
+HANDLE_DW_RLE(0x00, end_of_list)
+HANDLE_DW_RLE(0x01, base_addressx)
+HANDLE_DW_RLE(0x02, startx_endx)
+HANDLE_DW_RLE(0x03, startx_length)
+HANDLE_DW_RLE(0x04, offset_pair)
+HANDLE_DW_RLE(0x05, base_address)
+HANDLE_DW_RLE(0x06, start_end)
+HANDLE_DW_RLE(0x07, start_length)
 
 #undef HANDLE_DW_TAG
 #undef HANDLE_DW_AT