RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-05 14:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't return error_code from a function that doesn't fail.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241042 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-06-30 04:08:37 +00:00
parent 06bc362502
commit f8a35ff558
11 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Object/COFF.h
View File

@ -679,9 +679,9 @@ protected:
uint64_t getRelocationOffset(DataRefImpl Rel) const override; uint64_t getRelocationOffset(DataRefImpl Rel) const override;
symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override;
uint64_t getRelocationType(DataRefImpl Rel) const override; uint64_t getRelocationType(DataRefImpl Rel) const override;
std::error_code void getRelocationTypeName(DataRefImpl Rel,
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const override; SmallVectorImpl<char> &Result) const override;
public: public:
COFFObjectFile(MemoryBufferRef Object, std::error_code &EC); COFFObjectFile(MemoryBufferRef Object, std::error_code &EC);
basic_symbol_iterator symbol_begin_impl() const override; basic_symbol_iterator symbol_begin_impl() const override;

14
include/llvm/Object/ELFObjectFile.h
View File

@ -234,8 +234,7 @@ protected:
uint64_t getRelocationOffset(DataRefImpl Rel) const override; uint64_t getRelocationOffset(DataRefImpl Rel) const override;
symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override;
uint64_t getRelocationType(DataRefImpl Rel) const override; uint64_t getRelocationType(DataRefImpl Rel) const override;
std::error_code void getRelocationTypeName(DataRefImpl Rel,
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const override; SmallVectorImpl<char> &Result) const override;
uint32_t getSectionType(DataRefImpl Sec) const override; uint32_t getSectionType(DataRefImpl Sec) const override;
@ -738,17 +737,10 @@ StringRef ELFObjectFile<ELFT>::getRelocationTypeName(uint32_t Type) const {
} }
template <class ELFT> template <class ELFT>
std::error_code ELFObjectFile<ELFT>::getRelocationTypeName( void ELFObjectFile<ELFT>::getRelocationTypeName(
DataRefImpl Rel, SmallVectorImpl<char> &Result) const { DataRefImpl Rel, SmallVectorImpl<char> &Result) const {
const Elf_Shdr *sec = getRelSection(Rel); uint32_t type = getRelocationType(Rel);
uint32_t type;
if (sec->sh_type == ELF::SHT_REL)
type = getRel(Rel)->getType(EF.isMips64EL());
else
type = getRela(Rel)->getType(EF.isMips64EL());
EF.getRelocationTypeName(type, Result); EF.getRelocationTypeName(type, Result);
return std::error_code();
} }
template <class ELFT> template <class ELFT>

3
include/llvm/Object/MachO.h
View File

@ -241,8 +241,7 @@ public:
symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override;
section_iterator getRelocationSection(DataRefImpl Rel) const; section_iterator getRelocationSection(DataRefImpl Rel) const;
uint64_t getRelocationType(DataRefImpl Rel) const override; uint64_t getRelocationType(DataRefImpl Rel) const override;
std::error_code void getRelocationTypeName(DataRefImpl Rel,
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const override; SmallVectorImpl<char> &Result) const override;
uint8_t getRelocationLength(DataRefImpl Rel) const; uint8_t getRelocationLength(DataRefImpl Rel) const;

9
include/llvm/Object/ObjectFile.h
View File

@ -58,8 +58,7 @@ public:
/// @brief Get a string that represents the type of this relocation. /// @brief Get a string that represents the type of this relocation.
/// ///
/// This is for display purposes only. /// This is for display purposes only.
std::error_code getTypeName(SmallVectorImpl<char> &Result) const; void getTypeName(SmallVectorImpl<char> &Result) const;
DataRefImpl getRawDataRefImpl() const; DataRefImpl getRawDataRefImpl() const;
const ObjectFile *getObject() const; const ObjectFile *getObject() const;
@ -238,8 +237,7 @@ protected:
virtual uint64_t getRelocationOffset(DataRefImpl Rel) const = 0; virtual uint64_t getRelocationOffset(DataRefImpl Rel) const = 0;
virtual symbol_iterator getRelocationSymbol(DataRefImpl Rel) const = 0; virtual symbol_iterator getRelocationSymbol(DataRefImpl Rel) const = 0;
virtual uint64_t getRelocationType(DataRefImpl Rel) const = 0; virtual uint64_t getRelocationType(DataRefImpl Rel) const = 0;
virtual std::error_code virtual void getRelocationTypeName(DataRefImpl Rel,
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const = 0; SmallVectorImpl<char> &Result) const = 0;
public: public:
@ -457,8 +455,7 @@ inline uint64_t RelocationRef::getType() const {
return OwningObject->getRelocationType(RelocationPimpl); return OwningObject->getRelocationType(RelocationPimpl);
} }
inline std::error_code inline void RelocationRef::getTypeName(SmallVectorImpl<char> &Result) const {
RelocationRef::getTypeName(SmallVectorImpl<char> &Result) const {
return OwningObject->getRelocationTypeName(RelocationPimpl, Result); return OwningObject->getRelocationTypeName(RelocationPimpl, Result);
} }

5
lib/DebugInfo/DWARF/DWARFContext.cpp
View File

@ -707,10 +707,7 @@ DWARFContextInMemory::DWARFContextInMemory(const object::ObjectFile &Obj,
object::RelocToApply R(V.visit(Type, Reloc, SymAddr)); object::RelocToApply R(V.visit(Type, Reloc, SymAddr));
if (V.error()) { if (V.error()) {
SmallString<32> Name; SmallString<32> Name;
std::error_code ec(Reloc.getTypeName(Name)); Reloc.getTypeName(Name);
if (ec) {
errs() << "Aaaaaa! Nameless relocation! Aaaaaa!\n";
}
errs() << "error: failed to compute relocation: " errs() << "error: failed to compute relocation: "
<< Name << "\n"; << Name << "\n";
continue; continue;

6
lib/Object/COFFObjectFile.cpp
View File

@ -1031,9 +1031,8 @@ COFFObjectFile::getRelocations(const coff_section *Sec) const {
Res = #reloc_type; \ Res = #reloc_type; \
break; break;
std::error_code void COFFObjectFile::getRelocationTypeName(
COFFObjectFile::getRelocationTypeName(DataRefImpl Rel, DataRefImpl Rel, SmallVectorImpl<char> &Result) const {
SmallVectorImpl<char> &Result) const {
const coff_relocation *Reloc = toRel(Rel); const coff_relocation *Reloc = toRel(Rel);
StringRef Res; StringRef Res;
switch (getMachine()) { switch (getMachine()) {
@ -1102,7 +1101,6 @@ COFFObjectFile::getRelocationTypeName(DataRefImpl Rel,
Res = "Unknown"; Res = "Unknown";
} }
Result.append(Res.begin(), Res.end()); Result.append(Res.begin(), Res.end());
return std::error_code();
} }
#undef LLVM_COFF_SWITCH_RELOC_TYPE_NAME #undef LLVM_COFF_SWITCH_RELOC_TYPE_NAME

6
lib/Object/MachOObjectFile.cpp
View File

@ -659,9 +659,8 @@ uint64_t MachOObjectFile::getRelocationType(DataRefImpl Rel) const {
return getAnyRelocationType(RE); return getAnyRelocationType(RE);
} }
std::error_code void MachOObjectFile::getRelocationTypeName(
MachOObjectFile::getRelocationTypeName(DataRefImpl Rel, DataRefImpl Rel, SmallVectorImpl<char> &Result) const {
SmallVectorImpl<char> &Result) const {
StringRef res; StringRef res;
uint64_t RType = getRelocationType(Rel); uint64_t RType = getRelocationType(Rel);
@ -767,7 +766,6 @@ MachOObjectFile::getRelocationTypeName(DataRefImpl Rel,
break; break;
} }
Result.append(res.begin(), res.end()); Result.append(res.begin(), res.end());
return std::error_code();
} }
uint8_t MachOObjectFile::getRelocationLength(DataRefImpl Rel) const { uint8_t MachOObjectFile::getRelocationLength(DataRefImpl Rel) const {

4
lib/Object/Object.cpp
View File

@ -214,9 +214,7 @@ uint64_t LLVMGetRelocationType(LLVMRelocationIteratorRef RI) {
// NOTE: Caller takes ownership of returned string. // NOTE: Caller takes ownership of returned string.
const char *LLVMGetRelocationTypeName(LLVMRelocationIteratorRef RI) { const char *LLVMGetRelocationTypeName(LLVMRelocationIteratorRef RI) {
SmallVector<char, 0> ret; SmallVector<char, 0> ret;
if (std::error_code ec = (*unwrap(RI))->getTypeName(ret)) (*unwrap(RI))->getTypeName(ret);
report_fatal_error(ec.message());
char *str = static_cast<char*>(malloc(ret.size())); char *str = static_cast<char*>(malloc(ret.size()));
std::copy(ret.begin(), ret.end(), str); std::copy(ret.begin(), ret.end(), str);
return str; return str;

5
tools/llvm-objdump/llvm-objdump.cpp
View File

@ -931,7 +931,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
// Stop when rel_cur's address is past the current instruction. // Stop when rel_cur's address is past the current instruction.
if (addr >= Index + Size) break; if (addr >= Index + Size) break;
if (error(rel_cur->getTypeName(name))) goto skip_print_rel; rel_cur->getTypeName(name);
if (error(getRelocationValueString(*rel_cur, val))) if (error(getRelocationValueString(*rel_cur, val)))
goto skip_print_rel; goto skip_print_rel;
outs() << format(Fmt.data(), SectionAddr + addr) << name outs() << format(Fmt.data(), SectionAddr + addr) << name
@ -967,8 +967,7 @@ void llvm::PrintRelocations(const ObjectFile *Obj) {
SmallString<32> valuestr; SmallString<32> valuestr;
if (hidden) if (hidden)
continue; continue;
if (error(Reloc.getTypeName(relocname))) Reloc.getTypeName(relocname);
continue;
if (error(getRelocationValueString(Reloc, valuestr))) if (error(getRelocationValueString(Reloc, valuestr)))
continue; continue;
outs() << format(Fmt.data(), address) << " " << relocname << " " outs() << format(Fmt.data(), address) << " " << relocname << " "

3
tools/llvm-readobj/COFFDumper.cpp
View File

@ -807,8 +807,7 @@ void COFFDumper::printRelocation(const SectionRef &Section,
uint64_t RelocType = Reloc.getType(); uint64_t RelocType = Reloc.getType();
SmallString<32> RelocName; SmallString<32> RelocName;
StringRef SymbolName; StringRef SymbolName;
if (error(Reloc.getTypeName(RelocName))) Reloc.getTypeName(RelocName);
return;
symbol_iterator Symbol = Reloc.getSymbol(); symbol_iterator Symbol = Reloc.getSymbol();
if (Symbol != Obj->symbol_end() && error(Symbol->getName(SymbolName))) if (Symbol != Obj->symbol_end() && error(Symbol->getName(SymbolName)))
return; return;

3
tools/llvm-readobj/MachODumper.cpp
View File

@ -463,8 +463,7 @@ void MachODumper::printRelocation(const MachOObjectFile *Obj,
const RelocationRef &Reloc) { const RelocationRef &Reloc) {
uint64_t Offset = Reloc.getOffset(); uint64_t Offset = Reloc.getOffset();
SmallString<32> RelocName; SmallString<32> RelocName;
if (error(Reloc.getTypeName(RelocName))) Reloc.getTypeName(RelocName);
return;
DataRefImpl DR = Reloc.getRawDataRefImpl(); DataRefImpl DR = Reloc.getRawDataRefImpl();
MachO::any_relocation_info RE = Obj->getRelocation(DR); MachO::any_relocation_info RE = Obj->getRelocation(DR);