Index: include/llvm/Support/Dwarf.h =================================================================== --- include/llvm/Support/Dwarf.h +++ include/llvm/Support/Dwarf.h @@ -191,14 +191,31 @@ DW_AT_rank = 0x71, DW_AT_str_offsets_base = 0x72, DW_AT_addr_base = 0x73, - DW_AT_ranges_base = 0x74, - DW_AT_dwo_id = 0x75, + DW_AT_rnglists_base = 0x74, + DW_AT_dwo_id = 0x75, ///< Retracted from DWARF 5. DW_AT_dwo_name = 0x76, DW_AT_reference = 0x77, DW_AT_rvalue_reference = 0x78, DW_AT_macros = 0x79, + DW_AT_call_all_calls = 0x7a, + DW_AT_call_all_source_calls = 0x7b, + DW_AT_call_all_tail_calls = 0x7c, + DW_AT_call_return_pc = 0x7d, + DW_AT_call_value = 0x7e, + DW_AT_call_origin = 0x7f, + DW_AT_call_parameter = 0x80, + DW_AT_call_pc = 0x81, + DW_AT_call_tail_call = 0x82, + DW_AT_call_target = 0x83, + DW_AT_call_target_clobbered = 0x84, + DW_AT_call_data_location = 0x85, + DW_AT_call_data_value = 0x86, DW_AT_noreturn = 0x87, DW_AT_alignment = 0x88, + DW_AT_export_symbols = 0x89, + DW_AT_deleted = 0x8a, + DW_AT_defaulted = 0x8b, + DW_AT_loclists_base = 0x8c, DW_AT_lo_user = 0x2000, DW_AT_hi_user = 0x3fff, @@ -311,7 +328,18 @@ DW_FORM_sec_offset = 0x17, DW_FORM_exprloc = 0x18, DW_FORM_flag_present = 0x19, + + // New in DWARF v5. + DW_FORM_strx = 0x1a, + DW_FORM_addrx = 0x1b, + DW_FORM_ref_sup = 0x1c, + DW_FORM_strp_sup = 0x1d, + DW_FORM_data16 = 0x1e, + DW_FORM_line_strp = 0x1f, DW_FORM_ref_sig8 = 0x20, + DW_FORM_implicit_const = 0x21, + DW_FORM_loclistx = 0x22, + DW_FORM_rnglistx = 0x23, DW_FORM_lo_user = 0x1f00, // Extensions for Fission proposal Index: include/llvm/Support/Dwarf.def =================================================================== --- include/llvm/Support/Dwarf.def +++ include/llvm/Support/Dwarf.def @@ -108,6 +108,11 @@ HANDLE_DW_TAG(0x0044, coarray_type) HANDLE_DW_TAG(0x0045, generic_subrange) HANDLE_DW_TAG(0x0046, dynamic_type) +HANDLE_DW_TAG(0x0047, atomic_type) +HANDLE_DW_TAG(0x0048, call_site) +HANDLE_DW_TAG(0x0049, call_site_parameter) +HANDLE_DW_TAG(0x004a, skeleton_unit) +HANDLE_DW_TAG(0x004b, immutable_type) // User-defined tags. HANDLE_DW_TAG(0x4081, MIPS_loop) @@ -278,7 +283,18 @@ HANDLE_DW_OP(0x9d, bit_piece) HANDLE_DW_OP(0x9e, implicit_value) HANDLE_DW_OP(0x9f, stack_value) +HANDLE_DW_OP(0xa0, implicit_pointer) +HANDLE_DW_OP(0xa1, addrx) +HANDLE_DW_OP(0xa2, constx) +HANDLE_DW_OP(0xa3, entry_value) +HANDLE_DW_OP(0xa4, const_type) +HANDLE_DW_OP(0xa5, regval_type) +HANDLE_DW_OP(0xa6, deref_type) +HANDLE_DW_OP(0xa7, xderef_type) +HANDLE_DW_OP(0xa8, convert) +HANDLE_DW_OP(0xa9, reinterpret) +// Vendor extensions. // Extensions for GNU-style thread-local storage. HANDLE_DW_OP(0xe0, GNU_push_tls_address) @@ -324,6 +340,9 @@ HANDLE_DW_LANG(0x0021, C_plus_plus_14) HANDLE_DW_LANG(0x0022, Fortran03) HANDLE_DW_LANG(0x0023, Fortran08) +HANDLE_DW_LANG(0x0024, RenderScript) + +// Vendor extensions. HANDLE_DW_LANG(0x8001, Mips_Assembler) HANDLE_DW_LANG(0x8e57, GOOGLE_RenderScript) HANDLE_DW_LANG(0xb000, BORLAND_Delphi) @@ -345,6 +364,8 @@ HANDLE_DW_ATE(0x0e, unsigned_fixed) HANDLE_DW_ATE(0x0f, decimal_float) HANDLE_DW_ATE(0x10, UTF) +HANDLE_DW_ATE(0x11, UCS) +HANDLE_DW_ATE(0x12, ASCII) // DWARF virtuality codes. HANDLE_DW_VIRTUALITY(0x00, none) @@ -355,6 +376,8 @@ HANDLE_DW_CC(0x01, normal) HANDLE_DW_CC(0x02, program) HANDLE_DW_CC(0x03, nocall) +HANDLE_DW_CC(0x04, pass_by_reference) +HANDLE_DW_CC(0x05, pass_by_value) HANDLE_DW_CC(0x41, GNU_borland_fastcall_i386) HANDLE_DW_CC(0xb0, BORLAND_safecall) HANDLE_DW_CC(0xb1, BORLAND_stdcall) Index: lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp =================================================================== --- lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp +++ lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp @@ -312,7 +312,7 @@ DWARFDebugInfoEntryMinimal::getRangesBaseAttribute(const DWARFUnit *U, uint64_t FailValue) const { uint64_t Result = - getAttributeValueAsSectionOffset(U, DW_AT_ranges_base, -1ULL); + getAttributeValueAsSectionOffset(U, DW_AT_rnglists_base, -1ULL); if (Result != -1ULL) return Result; return getAttributeValueAsSectionOffset(U, DW_AT_GNU_ranges_base, FailValue); Index: lib/DebugInfo/DWARF/DWARFUnit.cpp =================================================================== --- lib/DebugInfo/DWARF/DWARFUnit.cpp +++ lib/DebugInfo/DWARF/DWARFUnit.cpp @@ -257,7 +257,7 @@ AddrOffsetSectionBase = DieArray[0].getAttributeValueAsSectionOffset( this, DW_AT_GNU_addr_base, 0); RangeSectionBase = DieArray[0].getAttributeValueAsSectionOffset( - this, DW_AT_ranges_base, 0); + this, DW_AT_rnglists_base, 0); // Don't fall back to DW_AT_GNU_ranges_base: it should be ignored for // skeleton CU DIE, so that DWARF users not aware of it are not broken. } Index: lib/Support/Dwarf.cpp =================================================================== --- lib/Support/Dwarf.cpp +++ lib/Support/Dwarf.cpp @@ -143,14 +143,31 @@ case DW_AT_rank: return "DW_AT_rank"; case DW_AT_str_offsets_base: return "DW_AT_str_offsets_base"; case DW_AT_addr_base: return "DW_AT_addr_base"; - case DW_AT_ranges_base: return "DW_AT_ranges_base"; + case DW_AT_rnglists_base: return "DW_AT_rnglists_base"; case DW_AT_dwo_id: return "DW_AT_dwo_id"; case DW_AT_dwo_name: return "DW_AT_dwo_name"; case DW_AT_reference: return "DW_AT_reference"; case DW_AT_rvalue_reference: return "DW_AT_rvalue_reference"; + case DW_AT_macros: return "DW_AT_macros"; + case DW_AT_call_all_calls: return "DW_AT_call_all_calls"; + case DW_AT_call_all_source_calls: return "DW_AT_call_all_source_calls"; + case DW_AT_call_all_tail_calls: return "DW_AT_call_all_tail_calls"; + case DW_AT_call_return_pc: return "DW_AT_call_return_pc"; + case DW_AT_call_value: return "DW_AT_call_value"; + case DW_AT_call_origin: return "DW_AT_call_origin"; + case DW_AT_call_parameter: return "DW_AT_call_parameter"; + case DW_AT_call_pc: return "DW_AT_call_pc"; + case DW_AT_call_tail_call: return "DW_AT_call_tail_call"; + case DW_AT_call_target: return "DW_AT_call_target"; + case DW_AT_call_target_clobbered: return "DW_AT_call_target_clobbered"; + case DW_AT_call_data_location: return "DW_AT_call_data_location"; + case DW_AT_call_data_value: return "DW_AT_call_data_value"; case DW_AT_noreturn: return "DW_AT_noreturn"; - case DW_AT_alignment: - return "DW_AT_alignment"; + case DW_AT_alignment: return "DW_AT_alignment"; + case DW_AT_export_symbols: return "DW_AT_export_symbols"; + case DW_AT_deleted: return "DW_AT_deleted"; + case DW_AT_defaulted: return "DW_AT_defaulted"; + case DW_AT_loclists_base: return "DW_AT_loclists_base"; case DW_AT_MIPS_loop_begin: return "DW_AT_MIPS_loop_begin"; case DW_AT_MIPS_tail_loop_begin: return "DW_AT_MIPS_tail_loop_begin"; case DW_AT_MIPS_epilog_begin: return "DW_AT_MIPS_epilog_begin";