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

[DWARF] llvm::Error -> Error. NFC 

The unqualified name is more common and is used in the file as well.

llvm-svn: 358567
This commit is contained in:
Fangrui Song 2019-04-17 09:11:08 +00:00
parent c9945cca03
commit a364d599ab
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
View File

@ -71,7 +71,7 @@ public:
: AccelSection(AccelSection), StringSection(StringSection) {} : AccelSection(AccelSection), StringSection(StringSection) {}
virtual ~DWARFAcceleratorTable(); virtual ~DWARFAcceleratorTable();
virtual llvm::Error extract() = 0; virtual Error extract() = 0;
virtual void dump(raw_ostream &OS) const = 0; virtual void dump(raw_ostream &OS) const = 0;
DWARFAcceleratorTable(const DWARFAcceleratorTable &) = delete; DWARFAcceleratorTable(const DWARFAcceleratorTable &) = delete;
@ -174,7 +174,7 @@ public:
DataExtractor StringSection) DataExtractor StringSection)
: DWARFAcceleratorTable(AccelSection, StringSection) {} : DWARFAcceleratorTable(AccelSection, StringSection) {}
llvm::Error extract() override; Error extract() override;
uint32_t getNumBuckets(); uint32_t getNumBuckets();
uint32_t getNumHashes(); uint32_t getNumHashes();
uint32_t getSizeHdr(); uint32_t getSizeHdr();
@ -459,7 +459,7 @@ public:
NameIterator begin() const { return NameIterator(this, 1); } NameIterator begin() const { return NameIterator(this, 1); }
NameIterator end() const { return NameIterator(this, getNameCount() + 1); } NameIterator end() const { return NameIterator(this, getNameCount() + 1); }
llvm::Error extract(); Error extract();
uint32_t getUnitOffset() const { return Base; } uint32_t getUnitOffset() const { return Base; }
uint32_t getNextUnitOffset() const { return Base + 4 + Hdr.UnitLength; } uint32_t getNextUnitOffset() const { return Base + 4 + Hdr.UnitLength; }
void dump(ScopedPrinter &W) const; void dump(ScopedPrinter &W) const;
@ -579,7 +579,7 @@ public:
DataExtractor StringSection) DataExtractor StringSection)
: DWARFAcceleratorTable(AccelSection, StringSection) {} : DWARFAcceleratorTable(AccelSection, StringSection) {}
llvm::Error extract() override; Error extract() override;
void dump(raw_ostream &OS) const override; void dump(raw_ostream &OS) const override;
/// Look up all entries in the accelerator table matching \c Key. /// Look up all entries in the accelerator table matching \c Key.

9
llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
View File

@ -41,7 +41,7 @@ static Atom formatAtom(unsigned Atom) { return {Atom}; }
DWARFAcceleratorTable::~DWARFAcceleratorTable() = default; DWARFAcceleratorTable::~DWARFAcceleratorTable() = default;
llvm::Error AppleAcceleratorTable::extract() { Error AppleAcceleratorTable::extract() {
uint32_t Offset = 0; uint32_t Offset = 0;
// Check that we can at least read the header. // 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"; W.startLine() << "Augmentation: '" << AugmentationString << "'\n";
} }
llvm::Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS, Error DWARFDebugNames::Header::extract(const DWARFDataExtractor &AS,
uint32_t *Offset) { uint32_t *Offset) {
// Check that we can read the fixed-size part. // Check that we can read the fixed-size part.
if (!AS.isValidOffset(*Offset + sizeof(HeaderPOD) - 1)) if (!AS.isValidOffset(*Offset + sizeof(HeaderPOD) - 1))
@ -518,6 +518,7 @@ Error DWARFDebugNames::NameIndex::extract() {
"Duplicate abbreviation code."); "Duplicate abbreviation code.");
} }
} }
DWARFDebugNames::Entry::Entry(const NameIndex &NameIdx, const Abbrev &Abbr) DWARFDebugNames::Entry::Entry(const NameIndex &NameIdx, const Abbrev &Abbr)
: NameIdx(&NameIdx), Abbr(&Abbr) { : NameIdx(&NameIdx), Abbr(&Abbr) {
// This merely creates form values. It is up to the caller // 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); dumpName(W, NTE, None);
} }
llvm::Error DWARFDebugNames::extract() { Error DWARFDebugNames::extract() {
uint32_t Offset = 0; uint32_t Offset = 0;
while (AccelSection.isValidOffset(Offset)) { while (AccelSection.isValidOffset(Offset)) {
NameIndex Next(*this, Offset); NameIndex Next(*this, Offset);
if (llvm::Error E = Next.extract()) if (Error E = Next.extract())
return E; return E;
Offset = Next.getNextUnitOffset(); Offset = Next.getNextUnitOffset();
NameIndices.push_back(std::move(Next)); NameIndices.push_back(std::move(Next));