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

ELF: Do not return error from handleDefinedSymbol. 

handleDefinedSymbol has return type of ErrorOr<ELFDefinedAtom *>.
However, it never returns an error. We are not checking errors.
It's marked as ErrorOr "just in case". That's a bad engineering
practice.

This patch simplifies the return type of the function.

llvm-svn: 234269
This commit is contained in:
Rui Ueyama 2015-04-07 01:00:20 +00:00
parent 5dcf621c8a
commit 9918155779
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h
View File

@ -81,12 +81,12 @@ private:
}
/// Process the Defined symbol and create an atom for it.
ErrorOr<ELFDefinedAtom<ELFT> *> handleDefinedSymbol(StringRef symName,
StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData,
unsigned int referenceStart, unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
ELFDefinedAtom<ELFT> *
createDefinedAtom(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData, unsigned int referenceStart,
unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
if (symName.size() >= 2 && symName[0] == '$') {
switch (symName[1]) {
case 'a':
@ -106,7 +106,7 @@ private:
referenceStart, referenceEnd, referenceList);
default:
// Fall through and create regular defined atom.
break;
break;
}
}
return new (this->_readerStorage) ARMELFDefinedAtom<ELFT>(

43
lld/lib/ReaderWriter/ELF/ELFFile.h
View File

@ -334,13 +334,13 @@ protected:
sym->getType() == llvm::ELF::STT_TLS);
}
/// Process the Defined symbol and create an atom for it.
virtual ErrorOr<ELFDefinedAtom<ELFT> *>
handleDefinedSymbol(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData,
unsigned int referenceStart, unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) {
/// Creates an atom for a given defined symbol.
virtual ELFDefinedAtom<ELFT> *
createDefinedAtom(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData, unsigned int referenceStart,
unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) {
return new (_readerStorage) ELFDefinedAtom<ELFT>(
*this, symName, sectionName, sym, sectionHdr, contentData,
referenceStart, referenceEnd, referenceList);
@ -789,14 +789,14 @@ template <class ELFT> std::error_code ELFFile<ELFT>::createAtoms() {
// resolution
if (isMergeableStringSection(section)) {
if (symbol->getBinding() == llvm::ELF::STB_GLOBAL) {
auto definedMergeAtom = handleDefinedSymbol(
ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
symbolName, *sectionName, &**si, section, symbolData,
_references.size(), _references.size(), _references);
(*definedMergeAtom)->setOrdinal(++_ordinal);
atom->setOrdinal(++_ordinal);
if (addAtoms)
_definedAtoms._atoms.push_back(*definedMergeAtom);
_definedAtoms._atoms.push_back(atom);
else
atomsForSection[*sectionName].push_back(*definedMergeAtom);
atomsForSection[*sectionName].push_back(atom);
}
continue;
}
@ -891,13 +891,13 @@ std::error_code ELFFile<ELFT>::handleGnuLinkOnceSection(
}
atomsForSection[signature].clear();
// Create a gnu linkonce atom.
auto gnuLinkOnceAtom = handleDefinedSymbol(
ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
signature, signature, nullptr, shdr, ArrayRef<uint8_t>(), referenceStart,
_references.size(), _references);
(*gnuLinkOnceAtom)->setOrdinal(++_ordinal);
_definedAtoms._atoms.push_back(*gnuLinkOnceAtom);
atom->setOrdinal(++_ordinal);
_definedAtoms._atoms.push_back(atom);
for (auto reference : refs)
(*gnuLinkOnceAtom)->addReference(reference);
atom->addReference(reference);
return std::error_code();
}
@ -922,13 +922,13 @@ std::error_code ELFFile<ELFT>::handleSectionGroup(
atomsForSection[sectionName].clear();
}
// Create a gnu linkonce atom.
auto sectionGroupAtom = handleDefinedSymbol(
ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
signature, groupSectionName, nullptr, shdr, ArrayRef<uint8_t>(),
referenceStart, _references.size(), _references);
(*sectionGroupAtom)->setOrdinal(++_ordinal);
_definedAtoms._atoms.push_back(*sectionGroupAtom);
atom->setOrdinal(++_ordinal);
_definedAtoms._atoms.push_back(atom);
for (auto reference : refs)
(*sectionGroupAtom)->addReference(reference);
atom->addReference(reference);
return std::error_code();
}
@ -983,9 +983,8 @@ ELFDefinedAtom<ELFT> *ELFFile<ELFT>::createDefinedAtomAndAssignRelocations(
createRelocationReferences(symbol, symContent, secContent, rri->second);
// Create the DefinedAtom and add it to the list of DefinedAtoms.
return *handleDefinedSymbol(symbolName, sectionName, symbol, section,
symContent, referenceStart, _references.size(),
_references);
return createDefinedAtom(symbolName, sectionName, symbol, section, symContent,
referenceStart, _references.size(), _references);
}
template <class ELFT>

12
lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h
View File

@ -128,12 +128,12 @@ public:
}
/// Process the Defined symbol and create an atom for it.
ErrorOr<ELFDefinedAtom<ELFT> *>
handleDefinedSymbol(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData,
unsigned int referenceStart, unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
ELFDefinedAtom<ELFT> *
createDefinedAtom(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData, unsigned int referenceStart,
unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
return new (this->_readerStorage) HexagonELFDefinedAtom<ELFT>(
*this, symName, sectionName, sym, sectionHdr, contentData,
referenceStart, referenceEnd, referenceList);

11
lld/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
View File

@ -127,11 +127,12 @@ private:
uint64_t _tpOff = 0;
uint64_t _dtpOff = 0;
ErrorOr<ELFDefinedAtom<ELFT> *> handleDefinedSymbol(
StringRef symName, StringRef sectionName, const Elf_Sym *sym,
const Elf_Shdr *sectionHdr, ArrayRef<uint8_t> contentData,
unsigned int referenceStart, unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
ELFDefinedAtom<ELFT> *
createDefinedAtom(StringRef symName, StringRef sectionName,
const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
ArrayRef<uint8_t> contentData, unsigned int referenceStart,
unsigned int referenceEnd,
std::vector<ELFReference<ELFT> *> &referenceList) override {
return new (this->_readerStorage) MipsELFDefinedAtom<ELFT>(
*this, symName, sectionName, sym, sectionHdr, contentData,
referenceStart, referenceEnd, referenceList);