diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h @@ -235,15 +235,7 @@ /// Return a rangelist's offset based on an index. The index designates /// an entry in the rangelist table's offset array and is supplied by /// DW_FORM_rnglistx. - llvm::Optional GetRnglistOffset(uint32_t Index) const { - if (!m_rnglist_table) - return llvm::None; - if (llvm::Optional off = m_rnglist_table->getOffsetEntry( - m_dwarf.GetDWARFContext().getOrLoadRngListsData().GetAsLLVM(), - Index)) - return *off + m_ranges_base; - return llvm::None; - } + llvm::Optional GetRnglistOffset(uint32_t Index); llvm::Optional GetLoclistOffset(uint32_t Index) { if (!m_loclist_table_header) @@ -291,6 +283,8 @@ return &m_die_array[0]; } + llvm::Optional GetRnglist(); + SymbolFileDWARF &m_dwarf; std::shared_ptr m_dwo; DWARFUnitHeader m_header; @@ -331,6 +325,7 @@ dw_offset_t m_str_offsets_base = 0; // Value of DW_AT_str_offsets_base. llvm::Optional m_rnglist_table; + bool m_rnglist_table_done = false; llvm::Optional m_loclist_table_header; const DIERef::Section m_section; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -480,19 +480,42 @@ } void DWARFUnit::SetRangesBase(dw_addr_t ranges_base) { + lldbassert(!m_rnglist_table_done); + m_ranges_base = ranges_base; +} +llvm::Optional DWARFUnit::GetRnglist() { if (GetVersion() < 5) - return; + return {}; + if (!m_rnglist_table_done) { + m_rnglist_table_done = true; + if (auto table_or_error = + ParseListTableHeader( + m_dwarf.GetDWARFContext().getOrLoadRngListsData().GetAsLLVM(), + m_ranges_base, DWARF32)) + m_rnglist_table = std::move(table_or_error.get()); + else + GetSymbolFileDWARF().GetObjectFile()->GetModule()->ReportError( + "Failed to extract range list table at offset 0x%" PRIx64 ": %s", + m_ranges_base, toString(table_or_error.takeError()).c_str()); + } + return m_rnglist_table; +} - if (auto table_or_error = ParseListTableHeader( - m_dwarf.GetDWARFContext().getOrLoadRngListsData().GetAsLLVM(), - ranges_base, DWARF32)) - m_rnglist_table = std::move(table_or_error.get()); - else +llvm::Optional DWARFUnit::GetRnglistOffset(uint32_t Index) { + if (!GetRnglist()) + return llvm::None; + if (!m_ranges_base) { GetSymbolFileDWARF().GetObjectFile()->GetModule()->ReportError( - "Failed to extract range list table at offset 0x%" PRIx64 ": %s", - ranges_base, toString(table_or_error.takeError()).c_str()); + "%8.8x: DW_FORM_rnglistx cannot be used without DW_AT_rnglists_base", + GetOffset()); + return llvm::None; + } + if (llvm::Optional off = GetRnglist()->getOffsetEntry( + m_dwarf.GetDWARFContext().getOrLoadRngListsData().GetAsLLVM(), Index)) + return *off + m_ranges_base; + return llvm::None; } void DWARFUnit::SetStrOffsetsBase(dw_offset_t str_offsets_base) { @@ -936,11 +959,11 @@ return ranges; } - if (!m_rnglist_table) + if (!GetRnglist()) return llvm::createStringError(errc::invalid_argument, "missing or invalid range list table"); - auto range_list_or_error = m_rnglist_table->findList( + auto range_list_or_error = GetRnglist()->findList( m_dwarf.GetDWARFContext().getOrLoadRngListsData().GetAsLLVM(), offset); if (!range_list_or_error) return range_list_or_error.takeError(); @@ -971,7 +994,7 @@ DWARFUnit::FindRnglistFromIndex(uint32_t index) { if (llvm::Optional offset = GetRnglistOffset(index)) return FindRnglistFromOffset(*offset); - if (m_rnglist_table) + if (GetRnglist()) return llvm::createStringError(errc::invalid_argument, "invalid range list table index %d", index); diff --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_range-DW_FORM_sec_offset.s b/lldb/test/Shell/SymbolFile/DWARF/DW_AT_range-DW_FORM_sec_offset.s new file mode 100644 --- /dev/null +++ b/lldb/test/Shell/SymbolFile/DWARF/DW_AT_range-DW_FORM_sec_offset.s @@ -0,0 +1,138 @@ +# DW_AT_ranges can use DW_FORM_sec_offset (instead of DW_FORM_rnglistx). +# In such case DW_AT_rnglists_base does not need to be present. + +# REQUIRES: x86 + +# RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t +# RUN: %lldb %t -o "image lookup -v -s lookup_rnglists" \ +# RUN: -o exit | FileCheck %s + +# Failure was the block range 1..2 was not printed plus: +# error: DW_AT_range-DW_FORM_sec_offset.s.tmp {0x0000003f}: DIE has DW_AT_ranges(0xc) attribute, but range extraction failed (missing or invalid range list table), please file a bug and attach the file at the start of this error message + +# CHECK-LABEL: image lookup -v -s lookup_rnglists +# CHECK: Function: id = {0x00000029}, name = "rnglists", range = [0x0000000000000000-0x0000000000000003) +# CHECK: Blocks: id = {0x00000029}, range = [0x00000000-0x00000003) +# CHECK-NEXT: id = {0x0000003f}, range = [0x00000001-0x00000002) + +# RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj \ +# RUN: --defsym RNGLISTX=0 %s > %t-rnglistx +# RUN: %lldb %t-rnglistx -o "image lookup -v -s lookup_rnglists" \ +# RUN: -o exit 2>&1 | FileCheck --check-prefix=RNGLISTX %s + +# RNGLISTX-LABEL: image lookup -v -s lookup_rnglists +# RNGLISTX: error: DW_AT_range-DW_FORM_sec_offset.s.tmp-rnglistx 00000000: DW_FORM_rnglistx cannot be used without DW_AT_rnglists_base + +# RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj \ +# RUN: --defsym RNGLISTX=0 --defsym RNGLISTBASE=0 %s > %t-rnglistbase +# RUN: %lldb %t-rnglistbase -o "image lookup -v -s lookup_rnglists" \ +# RUN: -o exit 2>&1 | FileCheck --check-prefix=RNGLISTBASE %s + +# RNGLISTBASE-LABEL: image lookup -v -s lookup_rnglists +# RNGLISTBASE: error: DW_AT_range-DW_FORM_sec_offset.s.tmp-rnglistbase {0x00000043}: DIE has DW_AT_ranges(0x0) attribute, but range extraction failed (invalid range list table index 0), please file a bug and attach the file at the start of this error message + + .text +rnglists: + nop +.Lblock1_begin: +lookup_rnglists: + nop +.Lblock1_end: + nop +.Lrnglists_end: + + .section .debug_abbrev,"",@progbits + .byte 1 # Abbreviation Code + .byte 17 # DW_TAG_compile_unit + .byte 1 # DW_CHILDREN_yes + .byte 37 # DW_AT_producer + .byte 8 # DW_FORM_string + .byte 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 115 # DW_AT_addr_base + .byte 23 # DW_FORM_sec_offset +.ifdef RNGLISTBASE + .byte 0x74 # DW_AT_rnglists_base + .byte 23 # DW_FORM_sec_offset +.endif + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 2 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 1 # DW_CHILDREN_yes + .byte 17 # DW_AT_low_pc + .byte 1 # DW_FORM_addr + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 3 # DW_AT_name + .byte 8 # DW_FORM_string + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 5 # Abbreviation Code + .byte 11 # DW_TAG_lexical_block + .byte 0 # DW_CHILDREN_no + .byte 85 # DW_AT_ranges +.ifndef RNGLISTX + .byte 0x17 # DW_FORM_sec_offset +.else + .byte 0x23 # DW_FORM_rnglistx +.endif + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 0 # EOM(3) + + .section .debug_info,"",@progbits +.Lcu_begin0: + .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit +.Ldebug_info_start0: + .short 5 # DWARF version number + .byte 1 # DWARF Unit Type + .byte 8 # Address Size (in bytes) + .long .debug_abbrev # Offset Into Abbrev. Section + .byte 1 # Abbrev [1] 0xc:0x5f DW_TAG_compile_unit + .asciz "Hand-written DWARF" # DW_AT_producer + .byte 0 # DW_AT_low_pc + .long .Lrnglists_end-rnglists # DW_AT_high_pc + .long .Laddr_table_base0 # DW_AT_addr_base +.ifdef RNGLISTBASE + .long .Ldebug_ranges0 # DW_AT_rnglists_base +.endif + .byte 2 # Abbrev [2] 0x2b:0x37 DW_TAG_subprogram + .quad rnglists # DW_AT_low_pc + .long .Lrnglists_end-rnglists # DW_AT_high_pc + .asciz "rnglists" # DW_AT_name + .byte 5 # Abbrev [5] 0x52:0xf DW_TAG_lexical_block +.ifndef RNGLISTX + .long .Ldebug_ranges0 # DW_AT_ranges DW_FORM_sec_offset +.else + .uleb128 0 # DW_AT_ranges DW_FORM_rnglistx +.endif + .byte 0 # End Of Children Mark + .byte 0 # End Of Children Mark +.Ldebug_info_end0: + + .section .debug_addr,"",@progbits + .long .Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution +.Ldebug_addr_start0: + .short 5 # DWARF version number + .byte 8 # Address size + .byte 0 # Segment selector size +.Laddr_table_base0: + .quad rnglists +.Ldebug_addr_end0: + + .section .debug_rnglists,"",@progbits + .long .Ldebug_rnglist_table_end0-.Ldebug_rnglist_table_start0 # Length +.Ldebug_rnglist_table_start0: + .short 5 # Version + .byte 8 # Address size + .byte 0 # Segment selector size + .long 0 # Offset entry count +.Ldebug_ranges0: + .byte 4 # DW_RLE_offset_pair + .uleb128 .Lblock1_begin-rnglists # starting offset + .uleb128 .Lblock1_end-rnglists # ending offset + .byte 0 # DW_RLE_end_of_list +.Ldebug_rnglist_table_end0: diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h @@ -113,7 +113,7 @@ void dump(DataExtractor Data, raw_ostream &OS, DIDumpOptions DumpOpts = {}) const; Optional getOffsetEntry(DataExtractor Data, uint32_t Index) const { - if (Index > HeaderData.OffsetEntryCount) + if (Index >= HeaderData.OffsetEntryCount) return None; return getOffsetEntry(Data, getHeaderOffset() + getHeaderSize(Format), Format, Index);