maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Change isLittleEndian to follow llvm style and add an accessor 

Differential Revision: https://reviews.llvm.org/D134290
This commit is contained in:
Shubham Sandeep Rastogi 2022-09-20 16:58:14 -07:00
parent bb4c53b7ba
commit 636de2bf34
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ class DWARFUnit {
const DWARFSection *AddrOffsetSection; const DWARFSection *AddrOffsetSection;
DWARFUnit *SU; DWARFUnit *SU;
Optional<uint64_t> AddrOffsetSectionBase; Optional<uint64_t> AddrOffsetSectionBase;
bool isLittleEndian; bool IsLittleEndian;
bool IsDWO; bool IsDWO;
const DWARFUnitVector &UnitVector; const DWARFUnitVector &UnitVector;
@ -307,6 +307,7 @@ public:
virtual ~DWARFUnit(); virtual ~DWARFUnit();
bool isLittleEndian() const { return IsLittleEndian; }
bool isDWOUnit() const { return IsDWO; } bool isDWOUnit() const { return IsDWO; }
DWARFContext& getContext() const { return Context; } DWARFContext& getContext() const { return Context; }
const DWARFSection &getInfoSection() const { return InfoSection; } const DWARFSection &getInfoSection() const { return InfoSection; }

24
llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
View File

@ -192,7 +192,7 @@ DWARFUnit::DWARFUnit(DWARFContext &DC, const DWARFSection &Section,
bool IsDWO, const DWARFUnitVector &UnitVector) bool IsDWO, const DWARFUnitVector &UnitVector)
: Context(DC), InfoSection(Section), Header(Header), Abbrev(DA), : Context(DC), InfoSection(Section), Header(Header), Abbrev(DA),
RangeSection(RS), LineSection(LS), StringSection(SS), RangeSection(RS), LineSection(LS), StringSection(SS),
StringOffsetSection(SOS), AddrOffsetSection(AOS), isLittleEndian(LE), StringOffsetSection(SOS), AddrOffsetSection(AOS), IsLittleEndian(LE),
IsDWO(IsDWO), UnitVector(UnitVector) { IsDWO(IsDWO), UnitVector(UnitVector) {
clear(); clear();
} }
@ -200,7 +200,7 @@ DWARFUnit::DWARFUnit(DWARFContext &DC, const DWARFSection &Section,
DWARFUnit::~DWARFUnit() = default; DWARFUnit::~DWARFUnit() = default;
DWARFDataExtractor DWARFUnit::getDebugInfoExtractor() const { DWARFDataExtractor DWARFUnit::getDebugInfoExtractor() const {
return DWARFDataExtractor(Context.getDWARFObj(), InfoSection, isLittleEndian, return DWARFDataExtractor(Context.getDWARFObj(), InfoSection, IsLittleEndian,
getAddressByteSize()); getAddressByteSize());
} }
@ -222,7 +222,7 @@ DWARFUnit::getAddrOffsetSectionItem(uint32_t Index) const {
if (AddrOffsetSection->Data.size() < Offset + getAddressByteSize()) if (AddrOffsetSection->Data.size() < Offset + getAddressByteSize())
return None; return None;
DWARFDataExtractor DA(Context.getDWARFObj(), *AddrOffsetSection, DWARFDataExtractor DA(Context.getDWARFObj(), *AddrOffsetSection,
isLittleEndian, getAddressByteSize()); IsLittleEndian, getAddressByteSize());
uint64_t Section; uint64_t Section;
uint64_t Address = DA.getRelocatedAddress(&Offset, &Section); uint64_t Address = DA.getRelocatedAddress(&Offset, &Section);
return {{Address, Section}}; return {{Address, Section}};
@ -240,7 +240,7 @@ Expected<uint64_t> DWARFUnit::getStringOffsetSectionItem(uint32_t Index) const {
", which is too large", ", which is too large",
inconvertibleErrorCode()); inconvertibleErrorCode());
DWARFDataExtractor DA(Context.getDWARFObj(), StringOffsetSection, DWARFDataExtractor DA(Context.getDWARFObj(), StringOffsetSection,
isLittleEndian, 0); IsLittleEndian, 0);
return DA.getRelocatedValue(ItemSize, &Offset); return DA.getRelocatedValue(ItemSize, &Offset);
} }
@ -367,7 +367,7 @@ Error DWARFUnit::extractRangeList(uint64_t RangeListOffset,
// Require that compile unit is extracted. // Require that compile unit is extracted.
assert(!DieArray.empty()); assert(!DieArray.empty());
DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection, DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection,
isLittleEndian, getAddressByteSize()); IsLittleEndian, getAddressByteSize());
uint64_t ActualRangeListOffset = RangeSectionBase + RangeListOffset; uint64_t ActualRangeListOffset = RangeSectionBase + RangeListOffset;
return RangeList.extract(RangesData, &ActualRangeListOffset); return RangeList.extract(RangesData, &ActualRangeListOffset);
} }
@ -521,7 +521,7 @@ Error DWARFUnit::tryExtractDIEsIfNeeded(bool CUDieOnly) {
// In both cases we need to determine the format of the contribution, // In both cases we need to determine the format of the contribution,
// which may differ from the unit's format. // which may differ from the unit's format.
DWARFDataExtractor DA(Context.getDWARFObj(), StringOffsetSection, DWARFDataExtractor DA(Context.getDWARFObj(), StringOffsetSection,
isLittleEndian, 0); IsLittleEndian, 0);
if (IsDWO || getVersion() >= 5) { if (IsDWO || getVersion() >= 5) {
auto StringOffsetOrError = auto StringOffsetOrError =
IsDWO ? determineStringOffsetsTableContributionDWO(DA) IsDWO ? determineStringOffsetsTableContributionDWO(DA)
@ -566,7 +566,7 @@ Error DWARFUnit::tryExtractDIEsIfNeeded(bool CUDieOnly) {
Header.getVersion() >= 5 ? DW_SECT_LOCLISTS : DW_SECT_EXT_LOC)) Header.getVersion() >= 5 ? DW_SECT_LOCLISTS : DW_SECT_EXT_LOC))
Data = Data.substr(C->Offset, C->Length); Data = Data.substr(C->Offset, C->Length);
DWARFDataExtractor DWARFData(Data, isLittleEndian, getAddressByteSize()); DWARFDataExtractor DWARFData(Data, IsLittleEndian, getAddressByteSize());
LocTable = LocTable =
std::make_unique<DWARFDebugLoclists>(DWARFData, Header.getVersion()); std::make_unique<DWARFDebugLoclists>(DWARFData, Header.getVersion());
LocSectionBase = DWARFListTableHeader::getHeaderSize(Header.getFormat()); LocSectionBase = DWARFListTableHeader::getHeaderSize(Header.getFormat());
@ -574,12 +574,12 @@ Error DWARFUnit::tryExtractDIEsIfNeeded(bool CUDieOnly) {
LocTable = std::make_unique<DWARFDebugLoclists>( LocTable = std::make_unique<DWARFDebugLoclists>(
DWARFDataExtractor(Context.getDWARFObj(), DWARFDataExtractor(Context.getDWARFObj(),
Context.getDWARFObj().getLoclistsSection(), Context.getDWARFObj().getLoclistsSection(),
isLittleEndian, getAddressByteSize()), IsLittleEndian, getAddressByteSize()),
getVersion()); getVersion());
} else { } else {
LocTable = std::make_unique<DWARFDebugLoc>(DWARFDataExtractor( LocTable = std::make_unique<DWARFDebugLoc>(DWARFDataExtractor(
Context.getDWARFObj(), Context.getDWARFObj().getLocSection(), Context.getDWARFObj(), Context.getDWARFObj().getLocSection(),
isLittleEndian, getAddressByteSize())); IsLittleEndian, getAddressByteSize()));
} }
// 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
@ -650,7 +650,7 @@ DWARFUnit::findRnglistFromOffset(uint64_t Offset) {
return RangeList.getAbsoluteRanges(getBaseAddress()); return RangeList.getAbsoluteRanges(getBaseAddress());
} }
DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection, DWARFDataExtractor RangesData(Context.getDWARFObj(), *RangeSection,
isLittleEndian, Header.getAddressByteSize()); IsLittleEndian, Header.getAddressByteSize());
DWARFDebugRnglistTable RnglistTable; DWARFDebugRnglistTable RnglistTable;
auto RangeListOrError = RnglistTable.findList(RangesData, Offset); auto RangeListOrError = RnglistTable.findList(RangesData, Offset);
if (RangeListOrError) if (RangeListOrError)
@ -1175,10 +1175,10 @@ DWARFUnit::determineStringOffsetsTableContributionDWO(DWARFDataExtractor & DA) {
} }
Optional<uint64_t> DWARFUnit::getRnglistOffset(uint32_t Index) { Optional<uint64_t> DWARFUnit::getRnglistOffset(uint32_t Index) {
DataExtractor RangesData(RangeSection->Data, isLittleEndian, DataExtractor RangesData(RangeSection->Data, IsLittleEndian,
getAddressByteSize()); getAddressByteSize());
DWARFDataExtractor RangesDA(Context.getDWARFObj(), *RangeSection, DWARFDataExtractor RangesDA(Context.getDWARFObj(), *RangeSection,
isLittleEndian, 0); IsLittleEndian, 0);
if (Optional<uint64_t> Off = llvm::DWARFListTableHeader::getOffsetEntry( if (Optional<uint64_t> Off = llvm::DWARFListTableHeader::getOffsetEntry(
RangesData, RangeSectionBase, getFormat(), Index)) RangesData, RangeSectionBase, getFormat(), Index))
return *Off + RangeSectionBase; return *Off + RangeSectionBase;

1
llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
View File

@ -1109,6 +1109,7 @@ TEST(DWARFDebugInfo, TestStringOffsets) {
DWARFUnit *U = DwarfContext->getUnitAtIndex(0); DWARFUnit *U = DwarfContext->getUnitAtIndex(0);
auto DieDG = U->getUnitDIE(false); auto DieDG = U->getUnitDIE(false);
ASSERT_TRUE(DieDG.isValid()); ASSERT_TRUE(DieDG.isValid());
ASSERT_TRUE(U->isLittleEndian() == Triple.isLittleEndian());
// Now make sure the string offsets came out properly. Attr2 should have index // Now make sure the string offsets came out properly. Attr2 should have index
// 0 (because it was the first indexed string) even though the string itself // 0 (because it was the first indexed string) even though the string itself