RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[DWARF] reposting r342048, which was reverted in r342056 due to buildbot errors. Adjusted 2 test cases for ARM and darwin and fixed a bug with the original change in dsymutil."

Browse Source 
This reverts commit r342218. Due to a number of failures under TSAN. An isolated
test case is being worked on.

llvm-svn: 342399
This commit is contained in:
Alexander Kornienko 2018-09-17 15:40:01 +00:00
parent 6a7ed94ea8
commit 18af7cf9e1
21 changed files with 420 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/DebugInfo/DWARF/DWARFContext.h
View File

@ -231,9 +231,7 @@ public:
/// Get a DIE given an exact offset. /// Get a DIE given an exact offset.
DWARFDie getDIEForOffset(uint32_t Offset); DWARFDie getDIEForOffset(uint32_t Offset);
unsigned getMaxVersion(uint16_t DefaultVersion = 0) const { unsigned getMaxVersion() const { return MaxVersion; }
return MaxVersion ? MaxVersion : DefaultVersion;
}
void setMaxVersionIfGreater(unsigned Version) { void setMaxVersionIfGreater(unsigned Version) {
if (Version > MaxVersion) if (Version > MaxVersion)

86
include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h Normal file
View File

@ -0,0 +1,86 @@
//===- DWARFDebugRangeList.h ------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H
#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H
#include "llvm/DebugInfo/DWARF/DWARFAddressRange.h"
#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
#include <cassert>
#include <cstdint>
#include <vector>
namespace llvm {
struct BaseAddress;
class raw_ostream;
class DWARFDebugRangeList {
public:
struct RangeListEntry {
/// A beginning address offset. This address offset has the size of an
/// address and is relative to the applicable base address of the
/// compilation unit referencing this range list. It marks the beginning
/// of an address range.
uint64_t StartAddress;
/// An ending address offset. This address offset again has the size of
/// an address and is relative to the applicable base address of the
/// compilation unit referencing this range list. It marks the first
/// address past the end of the address range. The ending address must
/// be greater than or equal to the beginning address.
uint64_t EndAddress;
/// A section index this range belongs to.
uint64_t SectionIndex;
/// The end of any given range list is marked by an end of list entry,
/// which consists of a 0 for the beginning address offset
/// and a 0 for the ending address offset.
bool isEndOfListEntry() const {
return (StartAddress == 0) && (EndAddress == 0);
}
/// A base address selection entry consists of:
/// 1. The value of the largest representable address offset
/// (for example, 0xffffffff when the size of an address is 32 bits).
/// 2. An address, which defines the appropriate base address for
/// use in interpreting the beginning and ending address offsets of
/// subsequent entries of the location list.
bool isBaseAddressSelectionEntry(uint8_t AddressSize) const {
assert(AddressSize == 4 || AddressSize == 8);
if (AddressSize == 4)
return StartAddress == -1U;
else
return StartAddress == -1ULL;
}
};
private:
/// Offset in .debug_ranges section.
uint32_t Offset;
uint8_t AddressSize;
std::vector<RangeListEntry> Entries;
public:
DWARFDebugRangeList() { clear(); }
void clear();
void dump(raw_ostream &OS) const;
Error extract(const DWARFDataExtractor &data, uint32_t *offset_ptr);
const std::vector<RangeListEntry> &getEntries() { return Entries; }
/// getAbsoluteRanges - Returns absolute address ranges defined by this range
/// list. Has to be passed base address of the compile unit referencing this
/// range list.
DWARFAddressRangesVector
getAbsoluteRanges(llvm::Optional<BaseAddress> BaseAddr) const;
};
} // end namespace llvm
#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H

39
include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
View File

@ -12,8 +12,8 @@
#include "llvm/BinaryFormat/Dwarf.h" #include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DIContext.h" #include "llvm/DebugInfo/DIContext.h"
#include "llvm/DebugInfo/DWARF/DWARFAddressRange.h"
#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h" #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFListTable.h" #include "llvm/DebugInfo/DWARF/DWARFListTable.h"
#include <cstdint> #include <cstdint>
#include <map> #include <map>
@ -21,8 +21,6 @@
namespace llvm { namespace llvm {
struct BaseAddress;
class DWARFContext;
class Error; class Error;
class raw_ostream; class raw_ostream;
@ -35,29 +33,10 @@ struct RangeListEntry : public DWARFListEntryBase {
uint64_t Value0; uint64_t Value0;
uint64_t Value1; uint64_t Value1;
Error extract(DWARFDataExtractor Data, uint32_t End, uint16_t Version, Error extract(DWARFDataExtractor Data, uint32_t End, uint32_t *OffsetPtr);
StringRef SectionName, uint32_t *OffsetPtr, bool isDWO = false); void dump(raw_ostream &OS, uint8_t AddrSize, uint8_t MaxEncodingStringLength,
bool isEndOfList() const { return EntryKind == dwarf::DW_RLE_end_of_list; } uint64_t &CurrentBase, DIDumpOptions DumpOpts) const;
bool isBaseAddressSelectionEntry() const { bool isSentinel() const { return EntryKind == dwarf::DW_RLE_end_of_list; }
return EntryKind == dwarf::DW_RLE_base_address;
}
uint64_t getStartAddress() const {
assert((EntryKind == dwarf::DW_RLE_start_end ||
EntryKind == dwarf::DW_RLE_offset_pair ||
EntryKind == dwarf::DW_RLE_startx_length) &&
"Unexpected range list entry kind");
return Value0;
}
uint64_t getEndAddress() const {
assert((EntryKind == dwarf::DW_RLE_start_end ||
EntryKind == dwarf::DW_RLE_offset_pair) &&
"Unexpected range list entry kind");
return Value1;
}
void dump(raw_ostream &OS, DWARFContext *C, uint8_t AddrSize,
uint64_t &CurrentBase, unsigned Indent, uint16_t Version,
uint8_t MaxEncodingStringLength = 0,
DIDumpOptions DumpOpts = {}) const;
}; };
/// A class representing a single rangelist. /// A class representing a single rangelist.
@ -70,12 +49,10 @@ public:
class DWARFDebugRnglistTable : public DWARFListTableBase<DWARFDebugRnglist> { class DWARFDebugRnglistTable : public DWARFListTableBase<DWARFDebugRnglist> {
public: public:
DWARFDebugRnglistTable(DWARFContext *C, StringRef SectionName, DWARFDebugRnglistTable()
bool isDWO = false) : DWARFListTableBase(/* SectionName = */ ".debug_rnglists",
: DWARFListTableBase(C, SectionName, isDWO,
/* HeaderString = */ "ranges:", /* HeaderString = */ "ranges:",
/* ListTypeString = */ "range", /* ListTypeString = */ "range") {}
dwarf::RangeListEncodingString) {}
}; };
} // end namespace llvm } // end namespace llvm

166
include/llvm/DebugInfo/DWARF/DWARFListTable.h
View File

@ -23,8 +23,6 @@
namespace llvm { namespace llvm {
class DWARFContext;
/// A base class for DWARF list entries, such as range or location list /// A base class for DWARF list entries, such as range or location list
/// entries. /// entries.
struct DWARFListEntryBase { struct DWARFListEntryBase {
@ -39,7 +37,6 @@ struct DWARFListEntryBase {
/// A base class for lists of entries that are extracted from a particular /// A base class for lists of entries that are extracted from a particular
/// section, such as range lists or location lists. /// section, such as range lists or location lists.
template <typename ListEntryType> class DWARFListType { template <typename ListEntryType> class DWARFListType {
public:
using EntryType = ListEntryType; using EntryType = ListEntryType;
using ListEntries = std::vector<EntryType>; using ListEntries = std::vector<EntryType>;
@ -48,26 +45,11 @@ protected:
public: public:
const ListEntries &getEntries() const { return Entries; } const ListEntries &getEntries() const { return Entries; }
bool empty() const { bool empty() const { return Entries.empty(); }
return Entries.empty() || Entries.begin()->isEndOfList();
}
void clear() { Entries.clear(); } void clear() { Entries.clear(); }
uint32_t getOffset() const {
if (Entries.empty())
return 0;
return Entries.begin()->Offset;
}
/// Extract a list. The caller must pass the correct DWARF version.
/// The end-of-list entry is retained as the last element of the vector of
/// entries.
Error extract(DWARFDataExtractor Data, uint32_t HeaderOffset, uint32_t End, Error extract(DWARFDataExtractor Data, uint32_t HeaderOffset, uint32_t End,
uint16_t Version, uint32_t *OffsetPtr, StringRef SectionName, uint32_t *OffsetPtr, StringRef SectionName,
StringRef ListStringName, bool isDWO = false); StringRef ListStringName);
void dump(raw_ostream &OS, DWARFContext *C, uint8_t AddressSize,
uint64_t BaseAddress, unsigned Indent, uint16_t Version,
size_t MaxEncodingStringLength = 0,
DIDumpOptions DumpOpts = {}) const;
}; };
/// A class representing the header of a list table such as the range list /// A class representing the header of a list table such as the range list
@ -85,9 +67,9 @@ class DWARFListTableHeader {
uint8_t AddrSize; uint8_t AddrSize;
/// The size in bytes of a segment selector on the target architecture. /// The size in bytes of a segment selector on the target architecture.
/// If the target system uses a flat address space, this value is 0. /// If the target system uses a flat address space, this value is 0.
uint8_t SegSize = 0; uint8_t SegSize;
/// The number of offsets that follow the header before the range lists. /// The number of offsets that follow the header before the range lists.
uint32_t OffsetEntryCount = 0; uint32_t OffsetEntryCount;
}; };
Header HeaderData; Header HeaderData;
@ -96,10 +78,10 @@ class DWARFListTableHeader {
/// FIXME: Generate the table and use the appropriate forms. /// FIXME: Generate the table and use the appropriate forms.
std::vector<uint32_t> Offsets; std::vector<uint32_t> Offsets;
/// The table's format, either DWARF32 or DWARF64. /// The table's format, either DWARF32 or DWARF64.
dwarf::DwarfFormat Format = dwarf::DwarfFormat::DWARF32; dwarf::DwarfFormat Format;
/// The offset at which the header (and hence the table) is located within /// The offset at which the header (and hence the table) is located within
/// its section. /// its section.
uint32_t HeaderOffset = 0; uint32_t HeaderOffset;
/// The name of the section the list is located in. /// The name of the section the list is located in.
StringRef SectionName; StringRef SectionName;
/// A characterization of the list for dumping purposes, e.g. "range" or /// A characterization of the list for dumping purposes, e.g. "range" or
@ -115,19 +97,8 @@ public:
Offsets.clear(); Offsets.clear();
} }
uint32_t getHeaderOffset() const { return HeaderOffset; } uint32_t getHeaderOffset() const { return HeaderOffset; }
uint8_t getAddrSize() const { return HeaderData.AddrSize; } uint8_t getAddrSize() const { return HeaderData.AddrSize; }
void setAddrSize(uint8_t AddrSize) { HeaderData.AddrSize = AddrSize; }
uint32_t getLength() const { return HeaderData.Length; } uint32_t getLength() const { return HeaderData.Length; }
void setLength(uint32_t Length) { HeaderData.Length = Length; }
uint16_t getVersion() const { return HeaderData.Version; }
void setVersion(uint16_t Version) { HeaderData.Version = Version; }
uint8_t getSegSize() const { return HeaderData.SegSize; }
uint32_t getOffsetEntryCount() const { return HeaderData.OffsetEntryCount; }
StringRef getSectionName() const { return SectionName; } StringRef getSectionName() const { return SectionName; }
StringRef getListTypeString() const { return ListTypeString; } StringRef getListTypeString() const { return ListTypeString; }
dwarf::DwarfFormat getFormat() const { return Format; } dwarf::DwarfFormat getFormat() const { return Format; }
@ -144,10 +115,8 @@ public:
/// Returns the length of the table, including the length field, or 0 if the /// Returns the length of the table, including the length field, or 0 if the
/// length has not been determined (e.g. because the table has not yet been /// length has not been determined (e.g. because the table has not yet been
/// parsed, or there was a problem in parsing). In fake tables, such as for /// parsed, or there was a problem in parsing).
/// DWARF v4 and earlier, there is no header, so the length simply reflects uint32_t length() const;
/// the size of the section.
uint32_t getTableLength() const;
}; };
/// A class representing a table of lists as specified in the DWARF v5 /// A class representing a table of lists as specified in the DWARF v5
@ -160,22 +129,14 @@ template <typename DWARFListType> class DWARFListTableBase {
/// A mapping between file offsets and lists. It is used to find a particular /// A mapping between file offsets and lists. It is used to find a particular
/// list based on an offset (obtained from DW_AT_ranges, for example). /// list based on an offset (obtained from DW_AT_ranges, for example).
std::map<uint32_t, DWARFListType> ListMap; std::map<uint32_t, DWARFListType> ListMap;
DWARFContext *C;
/// True if this list is located in a split-DWARF (dwo or dwp) file.
bool isDWO;
/// This string is displayed as a heading before the list is dumped /// This string is displayed as a heading before the list is dumped
/// (e.g. "ranges:"). /// (e.g. "ranges:").
StringRef HeaderString; StringRef HeaderString;
/// A function returning the encoding string for a given list entry encoding,
/// e.g. "DW_RLE_start_end".
std::function<StringRef(unsigned)> EncodingString;
protected: protected:
DWARFListTableBase(DWARFContext *C, StringRef SectionName, bool isDWO, DWARFListTableBase(StringRef SectionName, StringRef HeaderString,
StringRef HeaderString, StringRef ListTypeString, StringRef ListTypeString)
std::function<StringRef(unsigned)> EncodingString) : Header(SectionName, ListTypeString), HeaderString(HeaderString) {}
: Header(SectionName, ListTypeString), C(C), isDWO(isDWO),
HeaderString(HeaderString), EncodingString(EncodingString) {}
public: public:
void clear() { void clear() {
@ -186,28 +147,14 @@ public:
Error extractHeaderAndOffsets(DWARFDataExtractor Data, uint32_t *OffsetPtr) { Error extractHeaderAndOffsets(DWARFDataExtractor Data, uint32_t *OffsetPtr) {
return Header.extract(Data, OffsetPtr); return Header.extract(Data, OffsetPtr);
} }
/// Initialize the table header to explicit values. This is used for DWARF v4
/// and earlier since there is no header that can be extracted from a section.
void setHeaderData(uint32_t Length, uint16_t Version, uint8_t AddrSize) {
assert(Header.getSegSize() == 0 &&
"Unexpected segsize in list table header.");
assert(Header.getOffsetEntryCount() == 0 &&
"Unexpected offset entry count in list table header.");
Header.setLength(Length);
Header.setVersion(Version);
Header.setAddrSize(AddrSize);
}
/// Extract an entire table, including all list entries. /// Extract an entire table, including all list entries.
Error extract(DWARFDataExtractor Data, uint16_t Version, uint32_t *OffsetPtr); Error extract(DWARFDataExtractor Data, uint32_t *OffsetPtr);
/// Look up a list based on a given offset. Extract it and enter it into the /// Look up a list based on a given offset. Extract it and enter it into the
/// list map if necessary. /// list map if necessary.
Expected<DWARFListType> findList(DWARFDataExtractor Data, uint32_t Offset); Expected<DWARFListType> findList(DWARFDataExtractor Data, uint32_t Offset);
uint32_t getHeaderOffset() const { return Header.getHeaderOffset(); } uint32_t getHeaderOffset() const { return Header.getHeaderOffset(); }
uint8_t getAddrSize() const { return Header.getAddrSize(); } uint8_t getAddrSize() const { return Header.getAddrSize(); }
StringRef getListTypeString() const { return Header.getListTypeString(); }
void dump(raw_ostream &OS, DIDumpOptions DumpOpts = {}) const; void dump(raw_ostream &OS, DIDumpOptions DumpOpts = {}) const;
@ -228,35 +175,25 @@ public:
llvm_unreachable("Invalid DWARF format (expected DWARF32 or DWARF64"); llvm_unreachable("Invalid DWARF format (expected DWARF32 or DWARF64");
} }
uint16_t getVersion() const { return Header.getVersion(); } uint32_t length() { return Header.length(); }
uint32_t getLength() const { return Header.getTableLength(); }
}; };
template <typename DWARFListType> template <typename DWARFListType>
Error DWARFListTableBase<DWARFListType>::extract(DWARFDataExtractor Data, Error DWARFListTableBase<DWARFListType>::extract(DWARFDataExtractor Data,
uint16_t Version,
uint32_t *OffsetPtr) { uint32_t *OffsetPtr) {
assert(Version > 0 && "DWARF version required and not given.");
clear(); clear();
// For DWARF v4 and earlier, we cannot extract a table header, so we if (Error E = extractHeaderAndOffsets(Data, OffsetPtr))
// initialize it explicitly.
if (Version < 5)
setHeaderData(Data.size(), Version, Data.getAddressSize());
else if (Error E = extractHeaderAndOffsets(Data, OffsetPtr))
return E; return E;
Data.setAddressSize(Header.getAddrSize()); Data.setAddressSize(Header.getAddrSize());
uint32_t End = getHeaderOffset() + getLength(); uint32_t End = getHeaderOffset() + Header.length();
// Extract all lists.
while (*OffsetPtr < End) { while (*OffsetPtr < End) {
DWARFListType CurrentList; DWARFListType CurrentList;
uint32_t Off = *OffsetPtr; uint32_t Off = *OffsetPtr;
if (Error E = CurrentList.extract( if (Error E = CurrentList.extract(Data, getHeaderOffset(), End, OffsetPtr,
Data, getHeaderOffset(), End, Header.getVersion(), OffsetPtr, Header.getSectionName(),
Header.getSectionName(), Header.getListTypeString(), isDWO)) { Header.getListTypeString()))
*OffsetPtr = End;
return E; return E;
}
ListMap[Off] = CurrentList; ListMap[Off] = CurrentList;
} }
@ -267,10 +204,11 @@ Error DWARFListTableBase<DWARFListType>::extract(DWARFDataExtractor Data,
} }
template <typename ListEntryType> template <typename ListEntryType>
Error DWARFListType<ListEntryType>::extract( Error DWARFListType<ListEntryType>::extract(DWARFDataExtractor Data,
DWARFDataExtractor Data, uint32_t HeaderOffset, uint32_t End, uint32_t HeaderOffset, uint32_t End,
uint16_t Version, uint32_t *OffsetPtr, StringRef SectionName, uint32_t *OffsetPtr,
StringRef ListTypeString, bool isDWO) { StringRef SectionName,
StringRef ListTypeString) {
if (*OffsetPtr < HeaderOffset || *OffsetPtr >= End) if (*OffsetPtr < HeaderOffset || *OffsetPtr >= End)
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"invalid %s list offset 0x%" PRIx32, "invalid %s list offset 0x%" PRIx32,
@ -278,11 +216,10 @@ Error DWARFListType<ListEntryType>::extract(
Entries.clear(); Entries.clear();
while (*OffsetPtr < End) { while (*OffsetPtr < End) {
ListEntryType Entry; ListEntryType Entry;
if (Error E = if (Error E = Entry.extract(Data, End, OffsetPtr))
Entry.extract(Data, End, Version, SectionName, OffsetPtr, isDWO))
return E; return E;
Entries.push_back(Entry); Entries.push_back(Entry);
if (Entry.isEndOfList()) if (Entry.isSentinel())
return Error::success(); return Error::success();
} }
return createStringError(errc::illegal_byte_sequence, return createStringError(errc::illegal_byte_sequence,
@ -291,41 +228,28 @@ Error DWARFListType<ListEntryType>::extract(
SectionName.data(), HeaderOffset); SectionName.data(), HeaderOffset);
} }
template <typename ListEntryType>
void DWARFListType<ListEntryType>::dump(raw_ostream &OS, DWARFContext *C,
uint8_t AddressSize,
uint64_t BaseAddress, unsigned Indent,
uint16_t Version,
size_t MaxEncodingStringLength,
DIDumpOptions DumpOpts) const {
uint64_t CurrentBase = BaseAddress;
for (const auto &Entry : Entries)
Entry.dump(OS, C, AddressSize, CurrentBase, Indent, Version,
MaxEncodingStringLength, DumpOpts);
}
template <typename DWARFListType> template <typename DWARFListType>
void DWARFListTableBase<DWARFListType>::dump(raw_ostream &OS, void DWARFListTableBase<DWARFListType>::dump(raw_ostream &OS,
DIDumpOptions DumpOpts) const { DIDumpOptions DumpOpts) const {
Header.dump(OS, DumpOpts);
OS << HeaderString << "\n";
// Determine the length of the longest encoding string we have in the table,
// so we can align the output properly. We only need this in verbose mode.
size_t MaxEncodingStringLength = 0; size_t MaxEncodingStringLength = 0;
// Don't dump the fake table header we create for DWARF v4 and earlier. if (DumpOpts.Verbose) {
if (Header.getVersion() > 4) { for (const auto &List : ListMap)
Header.dump(OS, DumpOpts); for (const auto &Entry : List.second.getEntries())
OS << HeaderString << '\n'; MaxEncodingStringLength =
// Determine the length of the longest encoding string we have in the table, std::max(MaxEncodingStringLength,
// so we can align the output properly. We only need this in verbose mode. dwarf::RangeListEncodingString(Entry.EntryKind).size());
if (DumpOpts.Verbose)
for (const auto &List : ListMap)
for (const auto &Entry : List.second.getEntries())
MaxEncodingStringLength = std::max(
MaxEncodingStringLength, EncodingString(Entry.EntryKind).size());
} }
uint64_t CurrentBase = 0; uint64_t CurrentBase = 0;
for (const auto &List : ListMap) { for (const auto &List : ListMap)
List.second.dump(OS, C, getAddrSize(), CurrentBase, 0, Header.getVersion(), for (const auto &Entry : List.second.getEntries())
MaxEncodingStringLength, DumpOpts); Entry.dump(OS, getAddrSize(), MaxEncodingStringLength, CurrentBase,
} DumpOpts);
} }
template <typename DWARFListType> template <typename DWARFListType>
@ -338,11 +262,11 @@ DWARFListTableBase<DWARFListType>::findList(DWARFDataExtractor Data,
// Extract the list from the section and enter it into the list map. // Extract the list from the section and enter it into the list map.
DWARFListType List; DWARFListType List;
uint32_t End = getHeaderOffset() + getLength(); uint32_t End = getHeaderOffset() + Header.length();
uint32_t StartingOffset = Offset; uint32_t StartingOffset = Offset;
if (Error E = List.extract(Data, getHeaderOffset(), End, Header.getVersion(), if (Error E =
&Offset, Header.getSectionName(), List.extract(Data, getHeaderOffset(), End, &Offset,
Header.getListTypeString(), isDWO)) Header.getSectionName(), Header.getListTypeString()))
return std::move(E); return std::move(E);
ListMap[StartingOffset] = List; ListMap[StartingOffset] = List;
return List; return List;

7
include/llvm/DebugInfo/DWARF/DWARFUnit.h
View File

@ -17,6 +17,7 @@
#include "llvm/ADT/iterator_range.h" #include "llvm/ADT/iterator_range.h"
#include "llvm/BinaryFormat/Dwarf.h" #include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h" #include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRnglists.h" #include "llvm/DebugInfo/DWARF/DWARFDebugRnglists.h"
#include "llvm/DebugInfo/DWARF/DWARFDie.h" #include "llvm/DebugInfo/DWARF/DWARFDie.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h" #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
@ -305,6 +306,12 @@ public:
return DataExtractor(StringSection, false, 0); return DataExtractor(StringSection, false, 0);
} }
/// Extract the range list referenced by this compile unit from the
/// .debug_ranges section. If the extraction is unsuccessful, an error
/// is returned. Successful extraction requires that the compile unit
/// has already been extracted.
Error extractRangeList(uint32_t RangeListOffset,
DWARFDebugRangeList &RangeList) const;
void clear(); void clear();
const Optional<StrOffsetsContributionDescriptor> & const Optional<StrOffsetsContributionDescriptor> &

1
lib/DebugInfo/DWARF/CMakeLists.txt
View File

@ -15,6 +15,7 @@ add_llvm_library(LLVMDebugInfoDWARF
DWARFDebugLoc.cpp DWARFDebugLoc.cpp
DWARFDebugMacro.cpp DWARFDebugMacro.cpp
DWARFDebugPubTable.cpp DWARFDebugPubTable.cpp
DWARFDebugRangeList.cpp
DWARFDebugRnglists.cpp DWARFDebugRnglists.cpp
DWARFDie.cpp DWARFDie.cpp
DWARFExpression.cpp DWARFExpression.cpp

56
lib/DebugInfo/DWARF/DWARFContext.cpp
View File

@ -25,6 +25,7 @@
#include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h" #include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h" #include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugPubTable.h" #include "llvm/DebugInfo/DWARF/DWARFDebugPubTable.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRnglists.h" #include "llvm/DebugInfo/DWARF/DWARFDebugRnglists.h"
#include "llvm/DebugInfo/DWARF/DWARFDie.h" #include "llvm/DebugInfo/DWARF/DWARFDie.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h" #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
@ -266,29 +267,24 @@ static void dumpAddrSection(raw_ostream &OS, DWARFDataExtractor &AddrData,
} }
} }
// Dump a section that contains a sequence of tables of lists, such as range // Dump the .debug_rnglists or .debug_rnglists.dwo section (DWARF v5).
// or location list tables. In DWARF v5 we expect to find properly formatted static void dumpRnglistsSection(raw_ostream &OS,
// tables with headers. In DWARF v4 and earlier we simply expect a sequence of DWARFDataExtractor &rnglistData,
// lists, which we treat, mutatis mutandis, like DWARF v5 tables. DIDumpOptions DumpOpts) {
template <typename ListTable>
static void dumpListSection(raw_ostream &OS, DWARFContext *C,
StringRef SectionName, uint16_t MaxVersion,
DWARFDataExtractor &ListData,
DIDumpOptions DumpOpts, bool isDWO = false) {
uint32_t Offset = 0; uint32_t Offset = 0;
while (ListData.isValidOffset(Offset)) { while (rnglistData.isValidOffset(Offset)) {
ListTable Table(C, SectionName, isDWO); llvm::DWARFDebugRnglistTable Rnglists;
if (Error Err = Table.extract(ListData, MaxVersion, &Offset)) { uint32_t TableOffset = Offset;
if (Error Err = Rnglists.extract(rnglistData, &Offset)) {
WithColor::error() << toString(std::move(Err)) << '\n'; WithColor::error() << toString(std::move(Err)) << '\n';
// If table extraction set Offset to 0, it indicates that we cannot uint64_t Length = Rnglists.length();
// continue to read the section. // Keep going after an error, if we can, assuming that the length field
if (Offset == 0) // could be read. If it couldn't, stop reading the section.
if (Length == 0)
break; break;
// In DWARF v4 and earlier, dump as much of the lists as we can. Offset = TableOffset + Length;
if (MaxVersion < 5)
Table.dump(OS, DumpOpts);
} else { } else {
Table.dump(OS, DumpOpts); Rnglists.dump(OS, DumpOpts);
} }
} }
} }
@ -488,25 +484,29 @@ void DWARFContext::dump(
uint8_t savedAddressByteSize = getCUAddrSize(); uint8_t savedAddressByteSize = getCUAddrSize();
DWARFDataExtractor rangesData(*DObj, DObj->getRangeSection(), DWARFDataExtractor rangesData(*DObj, DObj->getRangeSection(),
isLittleEndian(), savedAddressByteSize); isLittleEndian(), savedAddressByteSize);
dumpListSection<DWARFDebugRnglistTable>( uint32_t offset = 0;
OS, this, ".debug_ranges", /* MaxVersion = */ 4, rangesData, DumpOpts); DWARFDebugRangeList rangeList;
while (rangesData.isValidOffset(offset)) {
if (Error E = rangeList.extract(rangesData, &offset)) {
WithColor::error() << toString(std::move(E)) << '\n';
break;
}
rangeList.dump(OS);
}
} }
if (shouldDump(Explicit, ".debug_rnglists", DIDT_ID_DebugRnglists, if (shouldDump(Explicit, ".debug_rnglists", DIDT_ID_DebugRnglists,
DObj->getRnglistsSection().Data)) { DObj->getRnglistsSection().Data)) {
DWARFDataExtractor RnglistData(*DObj, DObj->getRnglistsSection(), DWARFDataExtractor RnglistData(*DObj, DObj->getRnglistsSection(),
isLittleEndian(), getCUAddrSize()); isLittleEndian(), 0);
dumpListSection<DWARFDebugRnglistTable>( dumpRnglistsSection(OS, RnglistData, DumpOpts);
OS, this, ".debug_rnglists", getMaxVersion(5), RnglistData, DumpOpts);
} }
if (shouldDump(ExplicitDWO, ".debug_rnglists.dwo", DIDT_ID_DebugRnglists, if (shouldDump(ExplicitDWO, ".debug_rnglists.dwo", DIDT_ID_DebugRnglists,
DObj->getRnglistsDWOSection().Data)) { DObj->getRnglistsDWOSection().Data)) {
DWARFDataExtractor RnglistData(*DObj, DObj->getRnglistsDWOSection(), DWARFDataExtractor RnglistData(*DObj, DObj->getRnglistsDWOSection(),
isLittleEndian(), getCUAddrSize()); isLittleEndian(), 0);
dumpListSection<DWARFDebugRnglistTable>(OS, this, ".debug_rnglists.dwo", dumpRnglistsSection(OS, RnglistData, DumpOpts);
getMaxVersion(5), RnglistData,
DumpOpts);
} }
if (shouldDump(Explicit, ".debug_pubnames", DIDT_ID_DebugPubnames, if (shouldDump(Explicit, ".debug_pubnames", DIDT_ID_DebugPubnames,

96
lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp Normal file
View File

@ -0,0 +1,96 @@
//===- DWARFDebugRangesList.cpp -------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/Support/Errc.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
#include <cinttypes>
#include <cstdint>
using namespace llvm;
void DWARFDebugRangeList::clear() {
Offset = -1U;
AddressSize = 0;
Entries.clear();
}
Error DWARFDebugRangeList::extract(const DWARFDataExtractor &data,
uint32_t *offset_ptr) {
clear();
if (!data.isValidOffset(*offset_ptr))
return createStringError(errc::invalid_argument,
"invalid range list offset 0x%" PRIx32, *offset_ptr);
AddressSize = data.getAddressSize();
if (AddressSize != 4 && AddressSize != 8)
return createStringError(errc::invalid_argument,
"invalid address size: %" PRIu8, AddressSize);
Offset = *offset_ptr;
while (true) {
RangeListEntry Entry;
Entry.SectionIndex = -1ULL;
uint32_t prev_offset = *offset_ptr;
Entry.StartAddress = data.getRelocatedAddress(offset_ptr);
Entry.EndAddress =
data.getRelocatedAddress(offset_ptr, &Entry.SectionIndex);
// Check that both values were extracted correctly.
if (*offset_ptr != prev_offset + 2 * AddressSize) {
clear();
return createStringError(errc::invalid_argument,
"invalid range list entry at offset 0x%" PRIx32,
prev_offset);
}
if (Entry.isEndOfListEntry())
break;
Entries.push_back(Entry);
}
return Error::success();
}
void DWARFDebugRangeList::dump(raw_ostream &OS) const {
for (const RangeListEntry &RLE : Entries) {
const char *format_str = (AddressSize == 4
? "%08x %08" PRIx64 " %08" PRIx64 "\n"
: "%08x %016" PRIx64 " %016" PRIx64 "\n");
OS << format(format_str, Offset, RLE.StartAddress, RLE.EndAddress);
}
OS << format("%08x <End of list>\n", Offset);
}
DWARFAddressRangesVector DWARFDebugRangeList::getAbsoluteRanges(
llvm::Optional<BaseAddress> BaseAddr) const {
DWARFAddressRangesVector Res;
for (const RangeListEntry &RLE : Entries) {
if (RLE.isBaseAddressSelectionEntry(AddressSize)) {
BaseAddr = {RLE.EndAddress, RLE.SectionIndex};
continue;
}
DWARFAddressRange E;
E.LowPC = RLE.StartAddress;
E.HighPC = RLE.EndAddress;
E.SectionIndex = RLE.SectionIndex;
// Base address of a range list entry is determined by the closest preceding
// base address selection entry in the same range list. It defaults to the
// base address of the compilation unit if there is no such entry.
if (BaseAddr) {
E.LowPC += BaseAddr->Address;
E.HighPC += BaseAddr->Address;
if (E.SectionIndex == -1ULL)
E.SectionIndex = BaseAddr->SectionIndex;
}
Res.push_back(E);
}
return Res;
}

97
lib/DebugInfo/DWARF/DWARFDebugRnglists.cpp
View File

@ -13,30 +13,19 @@
#include "llvm/Support/Errc.h" #include "llvm/Support/Errc.h"
#include "llvm/Support/Error.h" #include "llvm/Support/Error.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
Error RangeListEntry::extract(DWARFDataExtractor Data, uint32_t End, Error RangeListEntry::extract(DWARFDataExtractor Data, uint32_t End,
uint16_t Version, StringRef /* SectionName */, uint32_t *OffsetPtr) {
uint32_t *OffsetPtr, bool /* isDWO */) {
Offset = *OffsetPtr; Offset = *OffsetPtr;
SectionIndex = -1ULL; SectionIndex = -1ULL;
// The caller should guarantee that we have at least 1 byte available, so
assert((Data.getAddressSize() == 4 || Data.getAddressSize() == 8) && // we just assert instead of revalidate.
"Unsupported address size"); assert(*OffsetPtr < End &&
"not enough space to extract a rangelist encoding");
// We model a DWARF v4 range list entry like DWARF v5 DW_RLE_offset_pair, uint8_t Encoding = Data.getU8(OffsetPtr);
// since it is subject to base adjustment.
uint8_t Encoding = dwarf::DW_RLE_offset_pair;
if (Version > 4) {
// The caller should guarantee that we have at least 1 byte available, so
// we just assert instead of revalidate.
assert(*OffsetPtr < End &&
"not enough space to extract a rangelist encoding");
Encoding = Data.getU8(OffsetPtr);
}
switch (Encoding) { switch (Encoding) {
case dwarf::DW_RLE_end_of_list: case dwarf::DW_RLE_end_of_list:
@ -59,23 +48,6 @@ Error RangeListEntry::extract(DWARFDataExtractor Data, uint32_t End,
"at offset 0x%" PRIx32, "at offset 0x%" PRIx32,
*OffsetPtr - 1); *OffsetPtr - 1);
case dwarf::DW_RLE_offset_pair: { case dwarf::DW_RLE_offset_pair: {
if (Version < 5) {
if ((End - *OffsetPtr) < unsigned(Data.getAddressSize() * 2))
return createStringError(
errc::illegal_byte_sequence,
"invalid range list entry at offset 0x%" PRIx32, *OffsetPtr);
Value0 = Data.getRelocatedAddress(OffsetPtr);
Value1 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex);
// Adjust the EntryKind for end-of-list and base_address based on the
// contents.
if (Value0 == maxUIntN(Data.getAddressSize() * 8)) {
Encoding = dwarf::DW_RLE_base_address;
Value0 = Value1;
Value1 = 0;
} else if (Value0 == 0 && Value1 == 0)
Encoding = dwarf::DW_RLE_end_of_list;
break;
}
uint32_t PreviousOffset = *OffsetPtr - 1; uint32_t PreviousOffset = *OffsetPtr - 1;
Value0 = Data.getULEB128(OffsetPtr); Value0 = Data.getULEB128(OffsetPtr);
Value1 = Data.getULEB128(OffsetPtr); Value1 = Data.getULEB128(OffsetPtr);
@ -86,7 +58,7 @@ Error RangeListEntry::extract(DWARFDataExtractor Data, uint32_t End,
PreviousOffset); PreviousOffset);
break; break;
} }
case dwarf::DW_RLE_base_address: case dwarf::DW_RLE_base_address: {
if ((End - *OffsetPtr) < Data.getAddressSize()) if ((End - *OffsetPtr) < Data.getAddressSize())
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"insufficient space remaining in table for " "insufficient space remaining in table for "
@ -94,16 +66,18 @@ Error RangeListEntry::extract(DWARFDataExtractor Data, uint32_t End,
*OffsetPtr - 1); *OffsetPtr - 1);
Value0 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex); Value0 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex);
break; break;
case dwarf::DW_RLE_start_end: }
case dwarf::DW_RLE_start_end: {
if ((End - *OffsetPtr) < unsigned(Data.getAddressSize() * 2)) if ((End - *OffsetPtr) < unsigned(Data.getAddressSize() * 2))
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"insufficient space remaining in table for " "insufficient space remaining in table for "
"DW_RLE_start_end encoding " "DW_RLE_start_end encoding "
"at offset 0x%" PRIx32, "at offset 0x%" PRIx32,
*OffsetPtr - 1); *OffsetPtr - 1);
Value0 = Data.getRelocatedAddress(OffsetPtr); Value0 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex);
Value1 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex); Value1 = Data.getRelocatedAddress(OffsetPtr);
break; break;
}
case dwarf::DW_RLE_start_length: { case dwarf::DW_RLE_start_length: {
uint32_t PreviousOffset = *OffsetPtr - 1; uint32_t PreviousOffset = *OffsetPtr - 1;
Value0 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex); Value0 = Data.getRelocatedAddress(OffsetPtr, &SectionIndex);
@ -169,10 +143,9 @@ DWARFAddressRangesVector DWARFDebugRnglist::getAbsoluteRanges(
return Res; return Res;
} }
void RangeListEntry::dump(raw_ostream &OS, DWARFContext *, uint8_t AddrSize, void RangeListEntry::dump(raw_ostream &OS, uint8_t AddrSize,
uint64_t &CurrentBase, unsigned Indent, uint8_t MaxEncodingStringLength,
uint16_t Version, uint8_t MaxEncodingStringLength, uint64_t &CurrentBase, DIDumpOptions DumpOpts) const {
DIDumpOptions DumpOpts) const {
auto PrintRawEntry = [](raw_ostream &OS, const RangeListEntry &Entry, auto PrintRawEntry = [](raw_ostream &OS, const RangeListEntry &Entry,
uint8_t AddrSize, DIDumpOptions DumpOpts) { uint8_t AddrSize, DIDumpOptions DumpOpts) {
if (DumpOpts.Verbose) { if (DumpOpts.Verbose) {
@ -183,49 +156,27 @@ void RangeListEntry::dump(raw_ostream &OS, DWARFContext *, uint8_t AddrSize,
} }
}; };
// Output indentations before we print the actual entry. We only print
// anything for DW_RLE_base_address when we are in verbose mode.
if (DumpOpts.Verbose || !isBaseAddressSelectionEntry())
OS.indent(Indent);
if (DumpOpts.Verbose) { if (DumpOpts.Verbose) {
// Print the section offset in verbose mode. // Print the section offset in verbose mode.
OS << format("0x%8.8" PRIx32 ":", Offset); OS << format("0x%8.8" PRIx32 ":", Offset);
if (Version > 4) { auto EncodingString = dwarf::RangeListEncodingString(EntryKind);
auto EncodingString = dwarf::RangeListEncodingString(EntryKind); // Unsupported encodings should have been reported during parsing.
// Unsupported encodings should have been reported during parsing. assert(!EncodingString.empty() && "Unknown range entry encoding");
assert(!EncodingString.empty() && "Unknown range entry encoding"); OS << format(" [%s%*c", EncodingString.data(),
OS << format(" [%s%*c", EncodingString.data(), MaxEncodingStringLength - EncodingString.size() + 1, ']');
MaxEncodingStringLength - EncodingString.size() + 1, ']'); if (EntryKind != dwarf::DW_RLE_end_of_list)
if (!isEndOfList()) OS << ": ";
OS << ": ";
}
} }
switch (EntryKind) { switch (EntryKind) {
case dwarf::DW_RLE_end_of_list: case dwarf::DW_RLE_end_of_list:
if (DumpOpts.Verbose) { OS << (DumpOpts.Verbose ? "" : "<End of list>");
// For DWARF v4 and earlier, we print the raw entry, i.e. 2 zeros.
if (Version < 5) {
OS << format(" 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, Value0);
OS << format(", 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, Value1);
}
break;
}
OS << "<End of list>";
break; break;
case dwarf::DW_RLE_base_address: case dwarf::DW_RLE_base_address:
// In non-verbose mode, we do not print anything for this entry. // In non-verbose mode we do not print anything for this entry.
CurrentBase = Value0; CurrentBase = Value0;
if (!DumpOpts.Verbose) if (!DumpOpts.Verbose)
return; return;
if (Version < 5) {
// Dump the entry in pre-DWARF v5 format, i.e. with a -1 as Value0.
uint64_t allOnes = maxUIntN(AddrSize * 8);
OS << format(" 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, allOnes);
OS << format(", 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, Value0);
break;
}
OS << format(" 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, Value0); OS << format(" 0x%*.*" PRIx64, AddrSize * 2, AddrSize * 2, Value0);
break; break;
case dwarf::DW_RLE_start_length: case dwarf::DW_RLE_start_length:

1
lib/DebugInfo/DWARF/DWARFDie.cpp
View File

@ -15,6 +15,7 @@
#include "llvm/BinaryFormat/Dwarf.h" #include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h" #include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFExpression.h" #include "llvm/DebugInfo/DWARF/DWARFExpression.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h" #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/DebugInfo/DWARF/DWARFUnit.h" #include "llvm/DebugInfo/DWARF/DWARFUnit.h"

72
lib/DebugInfo/DWARF/DWARFListTable.cpp
View File

@ -20,43 +20,30 @@ Error DWARFListTableHeader::extract(DWARFDataExtractor Data,
uint32_t *OffsetPtr) { uint32_t *OffsetPtr) {
HeaderOffset = *OffsetPtr; HeaderOffset = *OffsetPtr;
// Read and verify the length field. // Read and verify the length field.
if (!Data.isValidOffsetForDataOfSize(*OffsetPtr, sizeof(uint32_t))) { if (!Data.isValidOffsetForDataOfSize(*OffsetPtr, sizeof(uint32_t)))
// By setting *OffsetPtr to 0, we indicate to the caller that
// we could not detemine the length of the table.
*OffsetPtr = 0;
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"section is not large enough to contain a " "section is not large enough to contain a "
"%s table length at offset 0x%" PRIx32, "%s table length at offset 0x%" PRIx32,
SectionName.data(), HeaderOffset); SectionName.data(), *OffsetPtr);
}
// TODO: Add support for DWARF64. // TODO: Add support for DWARF64.
HeaderData.Length = Data.getU32(OffsetPtr); HeaderData.Length = Data.getU32(OffsetPtr);
if (HeaderData.Length == 0xffffffffu) { if (HeaderData.Length == 0xffffffffu)
*OffsetPtr = 0;
return createStringError(errc::not_supported, return createStringError(errc::not_supported,
"DWARF64 is not supported in %s at offset 0x%" PRIx32, "DWARF64 is not supported in %s at offset 0x%" PRIx32,
SectionName.data(), HeaderOffset); SectionName.data(), HeaderOffset);
}
uint32_t TableLength = HeaderData.Length + sizeof(uint32_t);
uint32_t End = HeaderOffset + TableLength;
Format = dwarf::DwarfFormat::DWARF32; Format = dwarf::DwarfFormat::DWARF32;
if (TableLength < sizeof(Header)) { if (HeaderData.Length + sizeof(uint32_t) < sizeof(Header))
*OffsetPtr = End; return createStringError(errc::invalid_argument,
return createStringError( "%s table at offset 0x%" PRIx32
errc::invalid_argument, " has too small length (0x%" PRIx32
"%s table at offset 0x%" PRIx32 " has too small length (0x%" PRIx32 ") to contain a complete header",
") to contain a complete header", SectionName.data(), HeaderOffset, length());
SectionName.data(), HeaderOffset, TableLength); uint32_t End = HeaderOffset + length();
} if (!Data.isValidOffsetForDataOfSize(HeaderOffset, End - HeaderOffset))
if (!Data.isValidOffsetForDataOfSize(HeaderOffset, TableLength)) { return createStringError(errc::invalid_argument,
*OffsetPtr = 0; // No recovery if the length exceeds the section size. "section is not large enough to contain a %s table "
return createStringError( "of length 0x%" PRIx32 " at offset 0x%" PRIx32,
errc::invalid_argument, SectionName.data(), length(), HeaderOffset);
"section is not large enough to contain a %s table "
"of length 0x%" PRIx32 " at offset 0x%" PRIx32,
SectionName.data(), TableLength, HeaderOffset);
}
HeaderData.Version = Data.getU16(OffsetPtr); HeaderData.Version = Data.getU16(OffsetPtr);
HeaderData.AddrSize = Data.getU8(OffsetPtr); HeaderData.AddrSize = Data.getU8(OffsetPtr);
@ -64,36 +51,27 @@ Error DWARFListTableHeader::extract(DWARFDataExtractor Data,
HeaderData.OffsetEntryCount = Data.getU32(OffsetPtr); HeaderData.OffsetEntryCount = Data.getU32(OffsetPtr);
// Perform basic validation of the remaining header fields. // Perform basic validation of the remaining header fields.
if (HeaderData.Version != 5) { if (HeaderData.Version != 5)
*OffsetPtr = End;
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"unrecognised %s table version %" PRIu16 "unrecognised %s table version %" PRIu16
" in table at offset 0x%" PRIx32, " in table at offset 0x%" PRIx32,
SectionName.data(), HeaderData.Version, SectionName.data(), HeaderData.Version, HeaderOffset);
HeaderOffset); if (HeaderData.AddrSize != 4 && HeaderData.AddrSize != 8)
}
if (HeaderData.AddrSize != 4 && HeaderData.AddrSize != 8) {
*OffsetPtr = End;
return createStringError(errc::not_supported, return createStringError(errc::not_supported,
"%s table at offset 0x%" PRIx32 "%s table at offset 0x%" PRIx32
" has unsupported address size %" PRIu8, " has unsupported address size %" PRIu8,
SectionName.data(), HeaderOffset, HeaderData.AddrSize); SectionName.data(), HeaderOffset, HeaderData.AddrSize);
} if (HeaderData.SegSize != 0)
if (HeaderData.SegSize != 0) {
*OffsetPtr = End;
return createStringError(errc::not_supported, return createStringError(errc::not_supported,
"%s table at offset 0x%" PRIx32 "%s table at offset 0x%" PRIx32
" has unsupported segment selector size %" PRIu8, " has unsupported segment selector size %" PRIu8,
SectionName.data(), HeaderOffset, HeaderData.SegSize); SectionName.data(), HeaderOffset, HeaderData.SegSize);
}
if (End < HeaderOffset + sizeof(HeaderData) + if (End < HeaderOffset + sizeof(HeaderData) +
HeaderData.OffsetEntryCount * sizeof(uint32_t)) { HeaderData.OffsetEntryCount * sizeof(uint32_t))
*OffsetPtr = End;
return createStringError(errc::invalid_argument, return createStringError(errc::invalid_argument,
"%s table at offset 0x%" PRIx32 " has more offset entries (%" PRIu32 "%s table at offset 0x%" PRIx32 " has more offset entries (%" PRIu32
") than there is space for", ") than there is space for",
SectionName.data(), HeaderOffset, HeaderData.OffsetEntryCount); SectionName.data(), HeaderOffset, HeaderData.OffsetEntryCount);
}
Data.setAddressSize(HeaderData.AddrSize); Data.setAddressSize(HeaderData.AddrSize);
for (uint32_t I = 0; I < HeaderData.OffsetEntryCount; ++I) for (uint32_t I = 0; I < HeaderData.OffsetEntryCount; ++I)
Offsets.push_back(Data.getU32(OffsetPtr)); Offsets.push_back(Data.getU32(OffsetPtr));
@ -123,11 +101,9 @@ void DWARFListTableHeader::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const {
} }
} }
uint32_t DWARFListTableHeader::getTableLength() const { uint32_t DWARFListTableHeader::length() const {
if (HeaderData.Length == 0) if (HeaderData.Length == 0)
return 0; return 0;
assert(HeaderData.Version > 0 &&
"No DWARF version in header when using getTableLength()");
// TODO: DWARF64 support. // TODO: DWARF64 support.
return HeaderData.Length + (HeaderData.Version > 4) * sizeof(uint32_t); return HeaderData.Length + sizeof(uint32_t);
} }

99
lib/DebugInfo/DWARF/DWARFUnit.cpp
View File

@ -264,16 +264,13 @@ bool DWARFUnitHeader::extract(DWARFContext &Context,
return true; return true;
} }
// Parse a list table header, including the optional array of offsets // Parse the rangelist table header, including the optional array of offsets
// following it (DWARF v5 and later). // following it (DWARF v5 and later).
template <typename DWARFListTable> static Expected<DWARFDebugRnglistTable>
static Expected<DWARFListTable> parseRngListTableHeader(DWARFDataExtractor &DA, uint32_t Offset) {
parseListTableHeader(DWARFDataExtractor DA, DWARFContext *C,
StringRef SectionName, uint32_t Offset, bool isDWO) {
// TODO: Support DWARF64 // TODO: Support DWARF64
// We are expected to be called with Offset 0 or pointing just past the table // We are expected to be called with Offset 0 or pointing just past the table
// header, which is 12 bytes long for DWARF32. // header, which is 12 bytes long for DWARF32.
DWARFListTable Table(C, SectionName, isDWO);
if (Offset > 0) { if (Offset > 0) {
if (Offset < 12U) if (Offset < 12U)
return createStringError(errc::invalid_argument, "Did not detect a valid" return createStringError(errc::invalid_argument, "Did not detect a valid"
@ -281,46 +278,20 @@ parseListTableHeader(DWARFDataExtractor DA, DWARFContext *C,
Offset); Offset);
Offset -= 12U; Offset -= 12U;
} }
llvm::DWARFDebugRnglistTable Table;
if (Error E = Table.extractHeaderAndOffsets(DA, &Offset)) if (Error E = Table.extractHeaderAndOffsets(DA, &Offset))
return std::move(E); return std::move(E);
return Table; return Table;
} }
// Parse a DWARF v5 list table (e.g. either a rangelist table or a location Error DWARFUnit::extractRangeList(uint32_t RangeListOffset,
// list table). For DWARF units with version 4 or earlier, we instead create DWARFDebugRangeList &RangeList) const {
// the table artifically by giving it a size that equals the section size. // Require that compile unit is extracted.
template <typename DWARFListTable> assert(!DieArray.empty());
static Optional<DWARFListTable> DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection,
setupListTable(DWARFUnit *U, const DWARFSection *Section, StringRef SectionName, isLittleEndian, getAddressByteSize());
uint32_t &Base, bool isDWO, bool isLittleEndian) { uint32_t ActualRangeListOffset = RangeSectionBase + RangeListOffset;
if (!Section->Data.size()) return RangeList.extract(RangesData, &ActualRangeListOffset);
return None;
DWARFContext &Ctx = U->getContext();
DWARFListTable Table(&Ctx, SectionName, isDWO);
// Parse the list table header. Individual lists are extracted lazily.
DWARFDataExtractor DA(Ctx.getDWARFObj(), *Section, isLittleEndian,
U->getAddressByteSize());
if (U->getVersion() < 5) {
Base = 0;
Table.setHeaderData(Section->Data.size(), U->getVersion(),
DA.getAddressSize());
return Table;
}
if (auto TableOrError = parseListTableHeader<DWARFListTable>(
DA, &Ctx, SectionName, Base, isDWO))
Table = TableOrError.get();
else {
WithColor::error() << "parsing a " << Table.getListTypeString().data()
<< " list table: " << toString(TableOrError.takeError())
<< '\n';
return None;
}
// In a split dwarf unit, there are no attributes like DW_AT_rnglists_base or
// DW_AT_loclists_base that describe the table base. Adjust Base to point past
// the table header which is expected to start at offset 0.
if (isDWO)
Base = Table.getHeaderSize();
return Table;
} }
void DWARFUnit::clear() { void DWARFUnit::clear() {
@ -440,20 +411,31 @@ size_t DWARFUnit::extractDIEsIfNeeded(bool CUDieOnly) {
// DWARF v5 uses the .debug_rnglists and .debug_rnglists.dwo sections to // DWARF v5 uses the .debug_rnglists and .debug_rnglists.dwo sections to
// describe address ranges. // describe address ranges.
StringRef RangeSectionName = ".debug_ranges";
if (getVersion() >= 5) { if (getVersion() >= 5) {
if (isDWO) { if (isDWO)
RangeSectionName = ".debug_rnglists.dwo";
setRangesSection(&Context.getDWARFObj().getRnglistsDWOSection(), 0); setRangesSection(&Context.getDWARFObj().getRnglistsDWOSection(), 0);
} else { else
RangeSectionName = ".debug_rnglists";
setRangesSection(&Context.getDWARFObj().getRnglistsSection(), setRangesSection(&Context.getDWARFObj().getRnglistsSection(),
toSectionOffset(UnitDie.find(DW_AT_rnglists_base), 0)); toSectionOffset(UnitDie.find(DW_AT_rnglists_base), 0));
if (RangeSection->Data.size()) {
// Parse the range list table header. Individual range lists are
// extracted lazily.
DWARFDataExtractor RangesDA(Context.getDWARFObj(), *RangeSection,
isLittleEndian, 0);
if (auto TableOrError =
parseRngListTableHeader(RangesDA, RangeSectionBase))
RngListTable = TableOrError.get();
else
WithColor::error() << "parsing a range list table: "
<< toString(TableOrError.takeError())
<< '\n';
// In a split dwarf unit, there is no DW_AT_rnglists_base attribute.
// Adjust RangeSectionBase to point past the table header.
if (isDWO && RngListTable)
RangeSectionBase = RngListTable->getHeaderSize();
} }
} }
RngListTable = setupListTable<DWARFDebugRnglistTable>(
this, RangeSection, RangeSectionName, RangeSectionBase, isDWO,
isLittleEndian);
// Don't fall back to DW_AT_GNU_ranges_base: it should be ignored for // 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. // skeleton CU DIE, so that DWARF users not aware of it are not broken.
@ -495,9 +477,16 @@ bool DWARFUnit::parseDWO() {
DWO->setAddrOffsetSection(AddrOffsetSection, AddrOffsetSectionBase); DWO->setAddrOffsetSection(AddrOffsetSection, AddrOffsetSectionBase);
if (getVersion() >= 5) { if (getVersion() >= 5) {
DWO->setRangesSection(&Context.getDWARFObj().getRnglistsDWOSection(), 0); DWO->setRangesSection(&Context.getDWARFObj().getRnglistsDWOSection(), 0);
DWO->RngListTable = setupListTable<DWARFDebugRnglistTable>( DWARFDataExtractor RangesDA(Context.getDWARFObj(), *RangeSection,
DWOCU, DWO->RangeSection, ".debug_rnglists.dwo", DWO->RangeSectionBase, isLittleEndian, 0);
/* isDWO =*/true, isLittleEndian); if (auto TableOrError = parseRngListTableHeader(RangesDA, RangeSectionBase))
DWO->RngListTable = TableOrError.get();
else
WithColor::error() << "parsing a range list table: "
<< toString(TableOrError.takeError())
<< '\n';
if (DWO->RngListTable)
DWO->RangeSectionBase = DWO->RngListTable->getHeaderSize();
} else { } else {
auto DWORangesBase = UnitDie.getRangesBaseAttribute(); auto DWORangesBase = UnitDie.getRangesBaseAttribute();
DWO->setRangesSection(RangeSection, DWORangesBase ? *DWORangesBase : 0); DWO->setRangesSection(RangeSection, DWORangesBase ? *DWORangesBase : 0);
@ -515,6 +504,12 @@ void DWARFUnit::clearDIEs(bool KeepCUDie) {
Expected<DWARFAddressRangesVector> Expected<DWARFAddressRangesVector>
DWARFUnit::findRnglistFromOffset(uint32_t Offset) { DWARFUnit::findRnglistFromOffset(uint32_t Offset) {
if (getVersion() <= 4) {
DWARFDebugRangeList RangeList;
if (Error E = extractRangeList(Offset, RangeList))
return std::move(E);
return RangeList.getAbsoluteRanges(getBaseAddress());
}
if (RngListTable) { if (RngListTable) {
DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection, DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection,
isLittleEndian, RngListTable->getAddrSize()); isLittleEndian, RngListTable->getAddrSize());

24
test/DebugInfo/Generic/cu-ranges.ll
View File

@ -4,18 +4,18 @@
; Check that we emit ranges for this which has a non-traditional section and a normal section. ; Check that we emit ranges for this which has a non-traditional section and a normal section.
; CHECK: .debug_info contents: ; CHECK: DW_TAG_compile_unit
; CHECK: DW_TAG_compile_unit ; CHECK: DW_AT_ranges
; CHECK-NOT: DW_TAG ; CHECK: DW_TAG_subprogram
; CHECK: DW_AT_ranges [DW_FORM_sec_offset] (0x ; CHECK: DW_AT_low_pc
; CHECK-NEXT: [0x{{[0-9A-Fa-f]+}}, 0x{{[0-9A-Fa-f]+}}) ; CHECK: DW_AT_high_pc
; CHECK-NEXT: [0x{{[0-9A-Fa-f]+}}, 0x{{[0-9A-Fa-f]+}}){{.*}}) ; CHECK: DW_TAG_subprogram
; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_low_pc
; CHECK: DW_AT_low_pc ; CHECK: DW_AT_high_pc
; CHECK: DW_AT_high_pc
; CHECK: DW_TAG_subprogram ; CHECK: .debug_ranges contents:
; CHECK: DW_AT_low_pc ; FIXME: When we get better dumping facilities we'll want to elaborate here.
; CHECK: DW_AT_high_pc ; CHECK: 00000000 <End of list>
; Function Attrs: nounwind uwtable ; Function Attrs: nounwind uwtable
define i32 @foo(i32 %a) #0 section "__TEXT,__foo" !dbg !4 { define i32 @foo(i32 %a) #0 section "__TEXT,__foo" !dbg !4 {

2
test/DebugInfo/Inputs/gmlt.ll
View File

@ -83,7 +83,7 @@
; written in relocation places (dumper needs to be fixed to read the ; written in relocation places (dumper needs to be fixed to read the
; relocations rather than interpret that as the end of a range list)) ; relocations rather than interpret that as the end of a range list))
; CHECK: 0x{{[0-9A-Fa-f]+}}: 0x{{0+}}, 0x{{0+}} ; CHECK: 00000000 <End of list>
; Check that we don't emit any pubnames or pubtypes under -gmlt ; Check that we don't emit any pubnames or pubtypes under -gmlt

19
test/DebugInfo/X86/dwarfdump-ranges-baseaddr.s
View File

@ -1,6 +1,5 @@
# RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o %t # RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o %t
# RUN: llvm-dwarfdump -v %t 2>%t.err | FileCheck %s # RUN: llvm-dwarfdump -v %t 2>%t.err | FileCheck %s
# RUN: llvm-dwarfdump --debug-ranges %t | FileCheck --check-prefix=TERSE %s
# RUN: FileCheck %s <%t.err -check-prefix=ERR # RUN: FileCheck %s <%t.err -check-prefix=ERR
# CHECK: .debug_info contents: # CHECK: .debug_info contents:
@ -11,24 +10,6 @@
# CHECK-NEXT: [0x0000000000000003, 0x0000000000000006) ".text" # CHECK-NEXT: [0x0000000000000003, 0x0000000000000006) ".text"
# CHECK-NEXT: [0x0000000000000001, 0x0000000000000002) ".text.foo1") # CHECK-NEXT: [0x0000000000000001, 0x0000000000000002) ".text.foo1")
# CHECK: .debug_ranges contents:
# CHECK-NEXT: 0x00000000: 0x0000000000000000, 0x0000000000000001 =>
# CHECK-SAME: [0x0000000000000000, 0x0000000000000001)
# CHECK-NEXT: 0x00000010: 0x0000000000000003, 0x0000000000000006 =>
# CHECK-SAME: [0x0000000000000003, 0x0000000000000006)
# CHECK-NEXT: 0x00000020: 0xffffffffffffffff, 0x0000000000000000
# CHECK-NEXT: 0x00000030: 0x0000000000000001, 0x0000000000000002 =>
# CHECK-SAME: [0x0000000000000001, 0x0000000000000002)
# CHECK-NEXT: 0x00000040: 0x0000000000000000, 0x0000000000000000
# TERSE: .debug_ranges contents:
# TERSE-NEXT: [0x0000000000000000, 0x0000000000000001)
# TERSE-NEXT: [0x0000000000000003, 0x0000000000000006)
# TERSE-NEXT: [0x0000000000000001, 0x0000000000000002)
# TERSE-NEXT: <End of list>
.text .text
.globl foo .globl foo
.type foo,@function .type foo,@function

11
test/DebugInfo/X86/dwarfdump-ranges-unrelocated.s
View File

@ -9,13 +9,10 @@
# CHECK-NEXT: [0x0000000000000000, 0x0000000000000003) ".text.foo2" [5]) # CHECK-NEXT: [0x0000000000000000, 0x0000000000000003) ".text.foo2" [5])
# CHECK: .debug_ranges contents: # CHECK: .debug_ranges contents:
# CHECK-NEXT: 0x00000000: 0x0000000000000000, 0x0000000000000001 => # CHECK: 00000000 0000000000000000 0000000000000001
# CHECK-SAME: [0x0000000000000000, 0x0000000000000001) # CHECK: 00000000 0000000000000000 0000000000000002
# CHECK-NEXT: 0x00000010: 0x0000000000000000, 0x0000000000000002 => # CHECK: 00000000 0000000000000000 0000000000000003
# CHECK-SAME: [0x0000000000000000, 0x0000000000000002) # CHECK: 00000000 <End of list>
# CHECK-NEXT: 0x00000020: 0x0000000000000000, 0x0000000000000003 =>
# CHECK-SAME: [0x0000000000000000, 0x0000000000000003)
# CHCKK-NEXT: 0x00000030: 0x0000000000000000, 0x0000000000000000
# RUN: llvm-dwarfdump %t | FileCheck %s --check-prefix=BRIEF # RUN: llvm-dwarfdump %t | FileCheck %s --check-prefix=BRIEF
# BRIEF: DW_TAG_compile_unit # BRIEF: DW_TAG_compile_unit

24
test/DebugInfo/dwarfdump-ranges.test
View File

@ -1,5 +1,4 @@
RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-test4.elf-x86-64 | FileCheck %s RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-test4.elf-x86-64 | FileCheck %s
RUN: llvm-dwarfdump --debug-ranges %p/Inputs/dwarfdump-test4.elf-x86-64 | FileCheck -check-prefix=TERSE %s
CHECK: .debug_info contents: CHECK: .debug_info contents:
CHECK: DW_TAG_compile_unit CHECK: DW_TAG_compile_unit
@ -16,21 +15,10 @@ CHECK-NEXT: [0x0000000000000637, 0x000000000000063d))
CHECK: .debug_ranges contents: CHECK: .debug_ranges contents:
CHECK-NEXT: 0x00000000: 0x000000000000062c, 0x0000000000000637 => CHECK-NEXT: 00000000 000000000000062c 0000000000000637
CHECK-SAME: [0x000000000000062c, 0x0000000000000637) CHECK-NEXT: 00000000 0000000000000637 000000000000063d
CHECK-NEXT: 0x00000010: 0x0000000000000637, 0x000000000000063d => CHECK-NEXT: 00000000 <End of list>
CHECK-SAME: [0x0000000000000637, 0x000000000000063d) CHECK-NEXT: 00000030 0000000000000640 000000000000064b
CHECK-NEXT: 0x00000020: 0x0000000000000000, 0x0000000000000000 CHECK-NEXT: 00000030 0000000000000637 000000000000063d
CHECK-NEXT: 0x00000030: 0x0000000000000640, 0x000000000000064b => CHECK-NEXT: 00000030 <End of list>
CHECK-SAME: [0x0000000000000640, 0x000000000000064b)
CHECK-NEXT: 0x00000040: 0x0000000000000637, 0x000000000000063d =>
CHECK-SAME: [0x0000000000000637, 0x000000000000063d)
CHECK-NEXT: 0x00000050: 0x0000000000000000, 0x0000000000000000
TERSE: .debug_ranges contents:
TERSE-NEXT: [0x000000000000062c, 0x0000000000000637)
TERSE-NEXT: [0x0000000000000637, 0x000000000000063d)
TERSE-NEXT: <End of list>
TERSE-NEXT: [0x0000000000000640, 0x000000000000064b)
TERSE-NEXT: [0x0000000000000637, 0x000000000000063d)
TERSE-NEXT: <End of list>

11
test/MC/ARM/dwarf-asm-multiple-sections.s
View File

@ -64,11 +64,12 @@ b:
// DWARF: .debug_ranges contents: // DWARF: .debug_ranges contents:
// DWARF-NEXT: 0x00000000: 0xffffffff, 0x00000000 // DWARF: 00000000 ffffffff 00000000
// DWARF-NEXT: 0x00000008: 0x00000000, 0x00000004 => [0x00000000, 0x00000004) // DWARF: 00000000 00000000 00000004
// DWARF-NEXT: 0x00000010: 0xffffffff, 0x00000000 // DWARF: 00000000 ffffffff 00000000
// DWARF-NEXT: 0x00000018: 0x00000000, 0x00000004 => [0x00000000, 0x00000004) // DWARF: 00000000 00000000 00000004
// DWARF-NEXT: 0x00000020: 0x00000000, 0x00000000 // DWARF: 00000000 <End of list>
// Offsets are different in DWARF v5 due to different header layout. // Offsets are different in DWARF v5 due to different header layout.

23
tools/dsymutil/DwarfLinker.cpp
View File

@ -43,6 +43,7 @@
#include "llvm/DebugInfo/DWARF/DWARFContext.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h" #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h" #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/DebugInfo/DWARF/DWARFDie.h" #include "llvm/DebugInfo/DWARF/DWARFDie.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h" #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/DebugInfo/DWARF/DWARFSection.h" #include "llvm/DebugInfo/DWARF/DWARFSection.h"
@ -1575,7 +1576,7 @@ DIE *DwarfLinker::DIECloner::cloneDIE(const DWARFDie &InputDIE,
void DwarfLinker::patchRangesForUnit(const CompileUnit &Unit, void DwarfLinker::patchRangesForUnit(const CompileUnit &Unit,
DWARFContext &OrigDwarf, DWARFContext &OrigDwarf,
const DebugMapObject &DMO) const { const DebugMapObject &DMO) const {
DWARFDebugRnglist RangeList; DWARFDebugRangeList RangeList;
const auto &FunctionRanges = Unit.getFunctionRanges(); const auto &FunctionRanges = Unit.getFunctionRanges();
unsigned AddressSize = Unit.getOrigUnit().getAddressByteSize(); unsigned AddressSize = Unit.getOrigUnit().getAddressByteSize();
DWARFDataExtractor RangeExtractor(OrigDwarf.getDWARFObj(), DWARFDataExtractor RangeExtractor(OrigDwarf.getDWARFObj(),
@ -1595,30 +1596,28 @@ void DwarfLinker::patchRangesForUnit(const CompileUnit &Unit,
for (const auto &RangeAttribute : Unit.getRangesAttributes()) { for (const auto &RangeAttribute : Unit.getRangesAttributes()) {
uint32_t Offset = RangeAttribute.get(); uint32_t Offset = RangeAttribute.get();
RangeAttribute.set(Streamer->getRangesSectionSize()); RangeAttribute.set(Streamer->getRangesSectionSize());
if (Error E = RangeList.extract(RangeExtractor, /* HeaderOffset = */0, if (Error E = RangeList.extract(RangeExtractor, &Offset)) {
RangeExtractor.size(),
Unit.getOrigUnit().getVersion(), &Offset,
".debug_ranges", "range")) {
llvm::consumeError(std::move(E)); llvm::consumeError(std::move(E));
reportWarning("invalid range list ignored.", DMO); reportWarning("invalid range list ignored.", DMO);
RangeList.clear(); RangeList.clear();
} }
const auto &Entries = RangeList.getEntries(); const auto &Entries = RangeList.getEntries();
if (!RangeList.empty()) { if (!Entries.empty()) {
const auto &First = Entries.front(); const DWARFDebugRangeList::RangeListEntry &First = Entries.front();
if (CurrRange == InvalidRange || if (CurrRange == InvalidRange ||
First.getStartAddress() + OrigLowPc < CurrRange.start() || First.StartAddress + OrigLowPc < CurrRange.start() ||
First.getStartAddress() + OrigLowPc >= CurrRange.stop()) { First.StartAddress + OrigLowPc >= CurrRange.stop()) {
CurrRange = FunctionRanges.find(First.getStartAddress() + OrigLowPc); CurrRange = FunctionRanges.find(First.StartAddress + OrigLowPc);
if (CurrRange == InvalidRange || if (CurrRange == InvalidRange ||
CurrRange.start() > First.getStartAddress() + OrigLowPc) { CurrRange.start() > First.StartAddress + OrigLowPc) {
reportWarning("no mapping for range.", DMO); reportWarning("no mapping for range.", DMO);
continue; continue;
} }
} }
} }
Streamer->emitRangesEntries(UnitPcOffset, OrigLowPc, CurrRange, RangeList, Streamer->emitRangesEntries(UnitPcOffset, OrigLowPc, CurrRange, Entries,
AddressSize); AddressSize);
} }
} }

19
tools/dsymutil/DwarfStreamer.cpp
View File

@ -269,27 +269,28 @@ void DwarfStreamer::emitSwiftAST(StringRef Buffer) {
void DwarfStreamer::emitRangesEntries( void DwarfStreamer::emitRangesEntries(
int64_t UnitPcOffset, uint64_t OrigLowPc, int64_t UnitPcOffset, uint64_t OrigLowPc,
const FunctionIntervals::const_iterator &FuncRange, const FunctionIntervals::const_iterator &FuncRange,
const DWARFDebugRnglist &RangeList, unsigned AddressSize) { const std::vector<DWARFDebugRangeList::RangeListEntry> &Entries,
unsigned AddressSize) {
MS->SwitchSection(MC->getObjectFileInfo()->getDwarfRangesSection()); MS->SwitchSection(MC->getObjectFileInfo()->getDwarfRangesSection());
// Offset each range by the right amount. // Offset each range by the right amount.
int64_t PcOffset = RangeList.empty() ? 0 : FuncRange.value() + UnitPcOffset; int64_t PcOffset = Entries.empty() ? 0 : FuncRange.value() + UnitPcOffset;
for (const auto &Range : RangeList.getEntries()) { for (const auto &Range : Entries) {
if (Range.isBaseAddressSelectionEntry()) { if (Range.isBaseAddressSelectionEntry(AddressSize)) {
warn("unsupported base address selection operation", warn("unsupported base address selection operation",
"emitting debug_ranges"); "emitting debug_ranges");
break; break;
} }
// Do not emit empty ranges. // Do not emit empty ranges.
if (Range.isEndOfList() || Range.getStartAddress() == Range.getEndAddress()) if (Range.StartAddress == Range.EndAddress)
continue; continue;
// All range entries should lie in the function range. // All range entries should lie in the function range.
if (!(Range.getStartAddress() + OrigLowPc >= FuncRange.start() && if (!(Range.StartAddress + OrigLowPc >= FuncRange.start() &&
Range.getEndAddress() + OrigLowPc <= FuncRange.stop())) Range.EndAddress + OrigLowPc <= FuncRange.stop()))
warn("inconsistent range data.", "emitting debug_ranges"); warn("inconsistent range data.", "emitting debug_ranges");
MS->EmitIntValue(Range.getStartAddress() + PcOffset, AddressSize); MS->EmitIntValue(Range.StartAddress + PcOffset, AddressSize);
MS->EmitIntValue(Range.getEndAddress() + PcOffset, AddressSize); MS->EmitIntValue(Range.EndAddress + PcOffset, AddressSize);
RangesSectionSize += 2 * AddressSize; RangesSectionSize += 2 * AddressSize;
} }

4
tools/dsymutil/DwarfStreamer.h
View File

@ -17,7 +17,7 @@
#include "llvm/CodeGen/AccelTable.h" #include "llvm/CodeGen/AccelTable.h"
#include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/AsmPrinter.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugLine.h" #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
#include "llvm/DebugInfo/DWARF/DWARFDebugRnglists.h" #include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
#include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/MCAsmBackend.h"
#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCCodeEmitter.h" #include "llvm/MC/MCCodeEmitter.h"
@ -83,7 +83,7 @@ public:
void emitRangesEntries( void emitRangesEntries(
int64_t UnitPcOffset, uint64_t OrigLowPc, int64_t UnitPcOffset, uint64_t OrigLowPc,
const FunctionIntervals::const_iterator &FuncRange, const FunctionIntervals::const_iterator &FuncRange,
const DWARFDebugRnglist &RangeList, const std::vector<DWARFDebugRangeList::RangeListEntry> &Entries,
unsigned AddressSize); unsigned AddressSize);
/// Emit debug_aranges entries for \p Unit and if \p DoRangesSection is true, /// Emit debug_aranges entries for \p Unit and if \p DoRangesSection is true,