[llvm] r248311 - dsymutil: Make resolveDIEReference and getUnitForOffset static functions.
Adrian Prantl via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 22 11:50:58 PDT 2015
Author: adrian
Date: Tue Sep 22 13:50:58 2015
New Revision: 248311
URL: http://llvm.org/viewvc/llvm-project?rev=248311&view=rev
Log:
dsymutil: Make resolveDIEReference and getUnitForOffset static functions.
NFC.
Modified:
llvm/trunk/tools/dsymutil/DwarfLinker.cpp
Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=248311&r1=248310&r2=248311&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Tue Sep 22 13:50:58 2015
@@ -1375,13 +1375,6 @@ private:
/// \defgroup Helpers Various helper methods.
///
/// @{
- const DWARFDebugInfoEntryMinimal *
- resolveDIEReference(const DWARFFormValue &RefValue, const DWARFUnit &Unit,
- const DWARFDebugInfoEntryMinimal &DIE,
- CompileUnit *&ReferencedCU);
-
- CompileUnit *getUnitForOffset(unsigned Offset);
-
bool createStreamer(Triple TheTriple, StringRef OutputFilename);
/// \brief Attempt to load a debug object from disk.
@@ -1425,9 +1418,10 @@ private:
uint32_t LastCIEOffset;
};
-/// \brief Similar to DWARFUnitSection::getUnitForOffset(), but
-/// returning our CompileUnit object instead.
-CompileUnit *DwarfLinker::getUnitForOffset(unsigned Offset) {
+/// Similar to DWARFUnitSection::getUnitForOffset(), but returning our
+/// CompileUnit object instead.
+static CompileUnit *getUnitForOffset(MutableArrayRef<CompileUnit> Units,
+ unsigned Offset) {
auto CU =
std::upper_bound(Units.begin(), Units.end(), Offset,
[](uint32_t LHS, const CompileUnit &RHS) {
@@ -1436,21 +1430,22 @@ CompileUnit *DwarfLinker::getUnitForOffs
return CU != Units.end() ? &*CU : nullptr;
}
-/// \brief Resolve the DIE attribute reference that has been
+/// Resolve the DIE attribute reference that has been
/// extracted in \p RefValue. The resulting DIE migh be in another
/// CompileUnit which is stored into \p ReferencedCU.
/// \returns null if resolving fails for any reason.
-const DWARFDebugInfoEntryMinimal *DwarfLinker::resolveDIEReference(
+static const DWARFDebugInfoEntryMinimal *resolveDIEReference(
+ const DwarfLinker &Linker, MutableArrayRef<CompileUnit> Units,
const DWARFFormValue &RefValue, const DWARFUnit &Unit,
const DWARFDebugInfoEntryMinimal &DIE, CompileUnit *&RefCU) {
assert(RefValue.isFormClass(DWARFFormValue::FC_Reference));
uint64_t RefOffset = *RefValue.getAsReference(&Unit);
- if ((RefCU = getUnitForOffset(RefOffset)))
+ if ((RefCU = getUnitForOffset(Units, RefOffset)))
if (const auto *RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset))
return RefDie;
- reportWarning("could not find referenced DIE", &Unit, &DIE);
+ Linker.reportWarning("could not find referenced DIE", &Unit, &DIE);
return nullptr;
}
@@ -2102,7 +2097,8 @@ void DwarfLinker::keepDIEAndDependencies
Val.extractValue(Data, &Offset, &Unit);
CompileUnit *ReferencedCU;
if (const auto *RefDIE =
- resolveDIEReference(Val, Unit, Die, ReferencedCU)) {
+ resolveDIEReference(*this, MutableArrayRef<CompileUnit>(Units), Val,
+ Unit, Die, ReferencedCU)) {
uint32_t RefIdx = ReferencedCU->getOrigUnit().getDIEIndex(RefDIE);
CompileUnit::DIEInfo &Info = ReferencedCU->getInfo(RefIdx);
// If the referenced DIE has a DeclContext that has already been
@@ -2231,7 +2227,7 @@ unsigned DwarfLinker::DIECloner::cloneDi
DeclContext *Ctxt = nullptr;
const DWARFDebugInfoEntryMinimal *RefDie =
- Linker.resolveDIEReference(Val, U, InputDIE, RefUnit);
+ resolveDIEReference(Linker, CompileUnits, Val, U, InputDIE, RefUnit);
// If the referenced DIE is not found, drop the attribute.
if (!RefDie)
More information about the llvm-commits
mailing list