Skip to content

Commit a364d59

Browse files
committed
[DWARF] llvm::Error -> Error. NFC
The unqualified name is more common and is used in the file as well. llvm-svn: 358567
1 parent c9945cc commit a364d59

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class DWARFAcceleratorTable {
7171
: AccelSection(AccelSection), StringSection(StringSection) {}
7272
virtual ~DWARFAcceleratorTable();
7373

74-
virtual llvm::Error extract() = 0;
74+
virtual Error extract() = 0;
7575
virtual void dump(raw_ostream &OS) const = 0;
7676

7777
DWARFAcceleratorTable(const DWARFAcceleratorTable &) = delete;
@@ -174,7 +174,7 @@ class AppleAcceleratorTable : public DWARFAcceleratorTable {
174174
DataExtractor StringSection)
175175
: DWARFAcceleratorTable(AccelSection, StringSection) {}
176176

177-
llvm::Error extract() override;
177+
Error extract() override;
178178
uint32_t getNumBuckets();
179179
uint32_t getNumHashes();
180180
uint32_t getSizeHdr();
@@ -459,7 +459,7 @@ class DWARFDebugNames : public DWARFAcceleratorTable {
459459
NameIterator begin() const { return NameIterator(this, 1); }
460460
NameIterator end() const { return NameIterator(this, getNameCount() + 1); }
461461

462-
llvm::Error extract();
462+
Error extract();
463463
uint32_t getUnitOffset() const { return Base; }
464464
uint32_t getNextUnitOffset() const { return Base + 4 + Hdr.UnitLength; }
465465
void dump(ScopedPrinter &W) const;
@@ -579,7 +579,7 @@ class DWARFDebugNames : public DWARFAcceleratorTable {
579579
DataExtractor StringSection)
580580
: DWARFAcceleratorTable(AccelSection, StringSection) {}
581581

582-
llvm::Error extract() override;
582+
Error extract() override;
583583
void dump(raw_ostream &OS) const override;
584584

585585
/// Look up all entries in the accelerator table matching \c Key.

llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static Atom formatAtom(unsigned Atom) { return {Atom}; }
4141

4242
DWARFAcceleratorTable::~DWARFAcceleratorTable() = default;
4343

44-
llvm::Error AppleAcceleratorTable::extract() {
44+
Error AppleAcceleratorTable::extract() {
4545
uint32_t Offset = 0;
4646

4747
// Check that we can at least read the header.
@@ -376,7 +376,7 @@ void DWARFDebugNames::Header::dump(ScopedPrinter &W) const {
376376
W.startLine() << "Augmentation: '" << AugmentationString << "'\n";
377377
}
378378

379-
llvm::Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS,
379+
Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS,
380380
uint32_t *Offset) {
381381
// Check that we can read the fixed-size part.
382382
if (!AS.isValidOffset(*Offset + sizeof(HeaderPOD) - 1))
@@ -518,6 +518,7 @@ Error DWARFDebugNames::NameIndex::extract() {
518518
"Duplicate abbreviation code.");
519519
}
520520
}
521+
521522
DWARFDebugNames::Entry::Entry(const NameIndex &NameIdx, const Abbrev &Abbr)
522523
: NameIdx(&NameIdx), Abbr(&Abbr) {
523524
// 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 {
753754
dumpName(W, NTE, None);
754755
}
755756

756-
llvm::Error DWARFDebugNames::extract() {
757+
Error DWARFDebugNames::extract() {
757758
uint32_t Offset = 0;
758759
while (AccelSection.isValidOffset(Offset)) {
759760
NameIndex Next(*this, Offset);
760-
if (llvm::Error E = Next.extract())
761+
if (Error E = Next.extract())
761762
return E;
762763
Offset = Next.getNextUnitOffset();
763764
NameIndices.push_back(std::move(Next));

0 commit comments

Comments
 (0)