[Lldb-commits] [lldb] ab67423 - [lldb][NFC] Prevent slicing when converting DataExtractors
Felipe de Azevedo Piovezan via lldb-commits
lldb-commits at lists.llvm.org
Tue Jun 27 15:09:55 PDT 2023
Author: Felipe de Azevedo Piovezan
Date: 2023-06-27T18:09:40-04:00
New Revision: ab674234c440ed27302f58eeccc612c83b32c43f
URL: https://github.com/llvm/llvm-project/commit/ab674234c440ed27302f58eeccc612c83b32c43f
DIFF: https://github.com/llvm/llvm-project/commit/ab674234c440ed27302f58eeccc612c83b32c43f.diff
LOG: [lldb][NFC] Prevent slicing when converting DataExtractors
LLDB's implementation of DWARFDataExtractor has a method that returns a
llvm::DWARFDataExtractor. In some cases, like DebugNamesDWARFIndex::Create, we
were passing an LLVM::DWARFDataExtractor to a function that expects a
LLVM:DataExtractor by value. This is causing slicing of the derived class.
While slicing is not inherently bad, it can be dangerous if the constructor of
the derived class mutates the base class in a way that leaves it in an invalid
state after slicing.
Differential Revision: https://reviews.llvm.org/D153913
Added:
Modified:
lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Removed:
################################################################################
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
index a0e8dcc3d4f37..c5876502b8f29 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
@@ -21,9 +21,14 @@ DWARFDataExtractor::GetDWARFOffset(lldb::offset_t *offset_ptr) const {
return GetMaxU64(offset_ptr, GetDWARFSizeOfOffset());
}
-llvm::DWARFDataExtractor DWARFDataExtractor::GetAsLLVM() const {
+llvm::DWARFDataExtractor DWARFDataExtractor::GetAsLLVMDWARF() const {
return llvm::DWARFDataExtractor(llvm::ArrayRef(GetDataStart(), GetByteSize()),
GetByteOrder() == lldb::eByteOrderLittle,
GetAddressByteSize());
}
+llvm::DataExtractor DWARFDataExtractor::GetAsLLVM() const {
+ return llvm::DataExtractor(llvm::ArrayRef(GetDataStart(), GetByteSize()),
+ GetByteOrder() == lldb::eByteOrderLittle,
+ GetAddressByteSize());
+}
} // namespace lldb_private
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
index df92bd45d5cc3..b9526b079c1e9 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
@@ -30,7 +30,8 @@ class DWARFDataExtractor : public DataExtractor {
size_t GetDWARFSizeofInitialLength() const { return 4; }
size_t GetDWARFSizeOfOffset() const { return 4; }
- llvm::DWARFDataExtractor GetAsLLVM() const;
+ llvm::DWARFDataExtractor GetAsLLVMDWARF() const;
+ llvm::DataExtractor GetAsLLVM() const;
};
}
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
index 7c6740d77aaf8..0b5bb23a4981f 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
@@ -16,7 +16,7 @@ DWARFDebugRanges::DWARFDebugRanges() : m_range_map() {}
void DWARFDebugRanges::Extract(DWARFContext &context) {
llvm::DWARFDataExtractor extractor =
- context.getOrLoadRangesData().GetAsLLVM();
+ context.getOrLoadRangesData().GetAsLLVMDWARF();
llvm::DWARFDebugRangeList extracted_list;
uint64_t current_offset = 0;
auto extract_next_list = [&] {
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
index 8a9f098b153c1..749ffcb094ecf 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
@@ -501,7 +501,7 @@ void DWARFUnit::SetLoclistsBase(dw_addr_t loclists_base) {
m_loclist_table_header.emplace(".debug_loclists", "locations");
offset += loclists_base - header_size;
if (llvm::Error E = m_loclist_table_header->extract(
- m_dwarf.GetDWARFContext().getOrLoadLocListsData().GetAsLLVM(),
+ m_dwarf.GetDWARFContext().getOrLoadLocListsData().GetAsLLVMDWARF(),
&offset)) {
GetSymbolFileDWARF().GetObjectFile()->GetModule()->ReportError(
"Failed to extract location list table at offset {0:x16} (location "
@@ -564,7 +564,7 @@ DWARFUnit::GetRnglistTable() {
m_rnglist_table_done = true;
if (auto table_or_error =
ParseListTableHeader<llvm::DWARFDebugRnglistTable>(
- GetRnglistData().GetAsLLVM(), m_ranges_base, DWARF32))
+ GetRnglistData().GetAsLLVMDWARF(), m_ranges_base, DWARF32))
m_rnglist_table = std::move(table_or_error.get());
else
GetSymbolFileDWARF().GetObjectFile()->GetModule()->ReportError(
@@ -1040,7 +1040,7 @@ DWARFUnit::FindRnglistFromOffset(dw_offset_t offset) {
return llvm::createStringError(std::errc::invalid_argument,
"missing or invalid range list table");
- llvm::DWARFDataExtractor data = GetRnglistData().GetAsLLVM();
+ llvm::DWARFDataExtractor data = GetRnglistData().GetAsLLVMDWARF();
// As DW_AT_rnglists_base may be missing we need to call setAddressSize.
data.setAddressSize(m_header.GetAddressByteSize());
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
index d09e233441de6..8d931e369098f 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
@@ -23,8 +23,8 @@ llvm::Expected<std::unique_ptr<DebugNamesDWARFIndex>>
DebugNamesDWARFIndex::Create(Module &module, DWARFDataExtractor debug_names,
DWARFDataExtractor debug_str,
SymbolFileDWARF &dwarf) {
- auto index_up = std::make_unique<DebugNames>(debug_names.GetAsLLVM(),
- debug_str.GetAsLLVM());
+ auto index_up = std::make_unique<DebugNames>(debug_names.GetAsLLVMDWARF(),
+ debug_str.GetAsLLVM());
if (llvm::Error E = index_up->extract())
return std::move(E);
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index f5edcd7a77a24..dc98e5cf4f578 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -142,7 +142,7 @@ ParseLLVMLineTable(lldb_private::DWARFContext &context,
dw_offset_t unit_offset) {
Log *log = GetLog(DWARFLog::DebugInfo);
- llvm::DWARFDataExtractor data = context.getOrLoadLineData().GetAsLLVM();
+ llvm::DWARFDataExtractor data = context.getOrLoadLineData().GetAsLLVMDWARF();
llvm::DWARFContext &ctx = context.GetAsLLVM();
llvm::Expected<const llvm::DWARFDebugLine::LineTable *> line_table =
line.getOrParseLineTable(
@@ -166,7 +166,7 @@ static bool ParseLLVMLineTablePrologue(lldb_private::DWARFContext &context,
dw_offset_t unit_offset) {
Log *log = GetLog(DWARFLog::DebugInfo);
bool success = true;
- llvm::DWARFDataExtractor data = context.getOrLoadLineData().GetAsLLVM();
+ llvm::DWARFDataExtractor data = context.getOrLoadLineData().GetAsLLVMDWARF();
llvm::DWARFContext &ctx = context.GetAsLLVM();
uint64_t offset = line_offset;
llvm::Error error = prologue.parse(
@@ -1058,7 +1058,8 @@ SymbolFileDWARF::GetTypeUnitSupportFiles(DWARFTypeUnit &tu) {
FileSpecList &list = iter_bool.first->second;
if (iter_bool.second) {
uint64_t line_table_offset = offset;
- llvm::DWARFDataExtractor data = m_context.getOrLoadLineData().GetAsLLVM();
+ llvm::DWARFDataExtractor data =
+ m_context.getOrLoadLineData().GetAsLLVMDWARF();
llvm::DWARFContext &ctx = m_context.GetAsLLVM();
llvm::DWARFDebugLine::Prologue prologue;
auto report = [](llvm::Error error) {
More information about the lldb-commits
mailing list