From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Tue, 30 Jun 2015 03:33:18 +0000 (+0000)
Subject: Don't return error_code from a function that doesn't fail.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=9f2f3bba2bcc38955d82978fda994738d0262f24

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241039 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h
index c067a7023c1..cb1626e0ea5 100644
--- a/include/llvm/Object/MachO.h
+++ b/include/llvm/Object/MachO.h
@@ -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.
diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h
index 3fcafc966e5..59400c996b3 100644
--- a/include/llvm/Object/ObjectFile.h
+++ b/include/llvm/Object/ObjectFile.h
@@ -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(SmallVectorImpl<char> &Result) const {
   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 {
diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index 5de72125afe..14f74c70a66 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/lib/Object/MachOObjectFile.cpp
@@ -770,17 +770,15 @@ MachOObjectFile::getRelocationTypeName(DataRefImpl Rel,
   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::getRelocationHidden(DataRefImpl Rel,
       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 {
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index 6282c5172b6..08a361f7b54 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -888,13 +888,12 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
 
         // 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 ObjectFile *Obj) {
       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)))