From a364d599ab76802eff58ed6dfdcbc8fc104405ca Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 17 Apr 2019 09:11:08 +0000 Subject: [PATCH] [DWARF] llvm::Error -> Error. NFC The unqualified name is more common and is used in the file as well. llvm-svn: 358567 --- llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h | 8 ++++---- llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h index 0f09a59..ed06e1e 100644 --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h @@ -71,7 +71,7 @@ public: : AccelSection(AccelSection), StringSection(StringSection) {} virtual ~DWARFAcceleratorTable(); - virtual llvm::Error extract() = 0; + virtual Error extract() = 0; virtual void dump(raw_ostream &OS) const = 0; DWARFAcceleratorTable(const DWARFAcceleratorTable &) = delete; @@ -174,7 +174,7 @@ public: DataExtractor StringSection) : DWARFAcceleratorTable(AccelSection, StringSection) {} - llvm::Error extract() override; + Error extract() override; uint32_t getNumBuckets(); uint32_t getNumHashes(); uint32_t getSizeHdr(); @@ -459,7 +459,7 @@ public: NameIterator begin() const { return NameIterator(this, 1); } NameIterator end() const { return NameIterator(this, getNameCount() + 1); } - llvm::Error extract(); + Error extract(); uint32_t getUnitOffset() const { return Base; } uint32_t getNextUnitOffset() const { return Base + 4 + Hdr.UnitLength; } void dump(ScopedPrinter &W) const; @@ -579,7 +579,7 @@ public: DataExtractor StringSection) : DWARFAcceleratorTable(AccelSection, StringSection) {} - llvm::Error extract() override; + Error extract() override; void dump(raw_ostream &OS) const override; /// Look up all entries in the accelerator table matching \c Key. diff --git a/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp index 1d8f234..5d58313 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp @@ -41,7 +41,7 @@ static Atom formatAtom(unsigned Atom) { return {Atom}; } DWARFAcceleratorTable::~DWARFAcceleratorTable() = default; -llvm::Error AppleAcceleratorTable::extract() { +Error AppleAcceleratorTable::extract() { uint32_t Offset = 0; // Check that we can at least read the header. @@ -376,7 +376,7 @@ void DWARFDebugNames::Header::dump(ScopedPrinter &W) const { W.startLine() << "Augmentation: '" << AugmentationString << "'\n"; } -llvm::Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS, +Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS, uint32_t *Offset) { // Check that we can read the fixed-size part. if (!AS.isValidOffset(*Offset + sizeof(HeaderPOD) - 1)) @@ -518,6 +518,7 @@ Error DWARFDebugNames::NameIndex::extract() { "Duplicate abbreviation code."); } } + DWARFDebugNames::Entry::Entry(const NameIndex &NameIdx, const Abbrev &Abbr) : NameIdx(&NameIdx), Abbr(&Abbr) { // This merely creates form values. It is up to the caller @@ -753,11 +754,11 @@ LLVM_DUMP_METHOD void DWARFDebugNames::NameIndex::dump(ScopedPrinter &W) const { dumpName(W, NTE, None); } -llvm::Error DWARFDebugNames::extract() { +Error DWARFDebugNames::extract() { uint32_t Offset = 0; while (AccelSection.isValidOffset(Offset)) { NameIndex Next(*this, Offset); - if (llvm::Error E = Next.extract()) + if (Error E = Next.extract()) return E; Offset = Next.getNextUnitOffset(); NameIndices.push_back(std::move(Next)); -- 2.7.4