[llvm] r241039 - Don't return error_code from a function that doesn't fail.
Rafael Espindola
rafael.espindola at gmail.com
Mon Jun 29 20:33:19 PDT 2015
Author: rafael
Date: Mon Jun 29 22:33:18 2015
New Revision: 241039
URL: http://llvm.org/viewvc/llvm-project?rev=241039&view=rev
Log:
Don't return error_code from a function that doesn't fail.
Modified:
llvm/trunk/include/llvm/Object/MachO.h
llvm/trunk/include/llvm/Object/ObjectFile.h
llvm/trunk/lib/Object/MachOObjectFile.cpp
llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
Modified: llvm/trunk/include/llvm/Object/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=241039&r1=241038&r2=241039&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/MachO.h (original)
+++ llvm/trunk/include/llvm/Object/MachO.h Mon Jun 29 22:33:18 2015
@@ -244,8 +244,7 @@ public:
std::error_code
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const override;
- std::error_code getRelocationHidden(DataRefImpl Rel,
- bool &Result) const override;
+ bool getRelocationHidden(DataRefImpl Rel) const override;
uint8_t getRelocationLength(DataRefImpl Rel) const;
// MachO specific.
Modified: llvm/trunk/include/llvm/Object/ObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ObjectFile.h?rev=241039&r1=241038&r2=241039&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ObjectFile.h (original)
+++ llvm/trunk/include/llvm/Object/ObjectFile.h Mon Jun 29 22:33:18 2015
@@ -58,7 +58,7 @@ public:
/// @brief Indicates whether this relocation should hidden when listing
/// relocations, usually because it is the trailing part of a multipart
/// relocation that will be printed as part of the leading relocation.
- std::error_code getHidden(bool &Result) const;
+ bool getHidden() const;
/// @brief Get a string that represents the type of this relocation.
///
@@ -246,11 +246,7 @@ protected:
virtual std::error_code
getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const = 0;
- virtual std::error_code getRelocationHidden(DataRefImpl Rel,
- bool &Result) const {
- Result = false;
- return std::error_code();
- }
+ virtual bool getRelocationHidden(DataRefImpl Rel) const { return false; }
public:
uint64_t getCommonSymbolSize(DataRefImpl Symb) const {
@@ -472,8 +468,8 @@ RelocationRef::getTypeName(SmallVectorIm
return OwningObject->getRelocationTypeName(RelocationPimpl, Result);
}
-inline std::error_code RelocationRef::getHidden(bool &Result) const {
- return OwningObject->getRelocationHidden(RelocationPimpl, Result);
+inline bool RelocationRef::getHidden() const {
+ return OwningObject->getRelocationHidden(RelocationPimpl);
}
inline DataRefImpl RelocationRef::getRawDataRefImpl() const {
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=241039&r1=241038&r2=241039&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Mon Jun 29 22:33:18 2015
@@ -770,17 +770,15 @@ MachOObjectFile::getRelocationTypeName(D
return std::error_code();
}
-std::error_code MachOObjectFile::getRelocationHidden(DataRefImpl Rel,
- bool &Result) const {
+bool MachOObjectFile::getRelocationHidden(DataRefImpl Rel) const {
unsigned Arch = getArch();
uint64_t Type = getRelocationType(Rel);
- Result = false;
-
// On arches that use the generic relocations, GENERIC_RELOC_PAIR
// is always hidden.
if (Arch == Triple::x86 || Arch == Triple::arm || Arch == Triple::ppc) {
- if (Type == MachO::GENERIC_RELOC_PAIR) Result = true;
+ if (Type == MachO::GENERIC_RELOC_PAIR)
+ return true;
} else if (Arch == Triple::x86_64) {
// On x86_64, X86_64_RELOC_UNSIGNED is hidden only when it follows
// an X86_64_RELOC_SUBTRACTOR.
@@ -789,11 +787,11 @@ std::error_code MachOObjectFile::getRelo
RelPrev.d.a--;
uint64_t PrevType = getRelocationType(RelPrev);
if (PrevType == MachO::X86_64_RELOC_SUBTRACTOR)
- Result = true;
+ return true;
}
}
- return std::error_code();
+ return false;
}
uint8_t MachOObjectFile::getRelocationLength(DataRefImpl Rel) const {
Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=241039&r1=241038&r2=241039&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Mon Jun 29 22:33:18 2015
@@ -888,13 +888,12 @@ static void DisassembleObject(const Obje
// Print relocation for instruction.
while (rel_cur != rel_end) {
- bool hidden = false;
+ bool hidden = rel_cur->getHidden();
uint64_t addr = rel_cur->getOffset();
SmallString<16> name;
SmallString<32> val;
// If this relocation is hidden, skip it.
- if (error(rel_cur->getHidden(hidden))) goto skip_print_rel;
if (hidden) goto skip_print_rel;
// Stop when rel_cur's address is past the current instruction.
@@ -929,12 +928,10 @@ void llvm::PrintRelocations(const Object
continue;
outs() << "RELOCATION RECORDS FOR [" << secname << "]:\n";
for (const RelocationRef &Reloc : Section.relocations()) {
- bool hidden;
+ bool hidden = Reloc.getHidden();
uint64_t address = Reloc.getOffset();
SmallString<32> relocname;
SmallString<32> valuestr;
- if (error(Reloc.getHidden(hidden)))
- continue;
if (hidden)
continue;
if (error(Reloc.getTypeName(relocname)))
More information about the llvm-commits
mailing list