commit f67de6c9406fd8c4f2cb39eda9c686c59317abd3
author Fangrui Song <maskray@google.com> Mon Apr 08 16:24:08 2019 +0000
committer Fangrui Song <maskray@google.com> Mon Apr 08 16:24:08 2019 +0000
tree 82cacc099b8839b59b21ef9a5d22f6d0475e0d71
parent f6a60f1f8031c5e8b17cba6a010add6ae3ac0612

[llvm-objdump] Migrate relocation handling functions from error_code to Error

llvm-svn: 357920

llvm/tools/llvm-objdump/ELFDump.cpp

diff --git a/llvm/tools/llvm-objdump/ELFDump.cpp b/llvm/tools/llvm-objdump/ELFDump.cpp
index 4144b0c..286828d 100644
--- a/llvm/tools/llvm-objdump/ELFDump.cpp
+++ b/llvm/tools/llvm-objdump/ELFDump.cpp
@@ -50,14 +50,14 @@
 }
 
 template <class ELFT>
-static std::error_code getRelocationValueString(const ELFObjectFile<ELFT> *Obj,
-                                                const RelocationRef &RelRef,
-                                                SmallVectorImpl<char> &Result) {
+static Error getRelocationValueString(const ELFObjectFile<ELFT> *Obj,
+                                      const RelocationRef &RelRef,
+                                      SmallVectorImpl<char> &Result) {
   const ELFFile<ELFT> &EF = *Obj->getELFFile();
   DataRefImpl Rel = RelRef.getRawDataRefImpl();
   auto SecOrErr = EF.getSection(Rel.d.a);
   if (!SecOrErr)
-    return errorToErrorCode(SecOrErr.takeError());
+    return SecOrErr.takeError();
 
   int64_t Addend = 0;
   // If there is no Symbol associated with the relocation, we set the undef
@@ -72,7 +72,7 @@
     Addend = ERela->r_addend;
     Undef = ERela->getSymbol(false) == 0;
   } else if ((*SecOrErr)->sh_type != ELF::SHT_REL) {
-    return object_error::parse_failed;
+    return make_error<BinaryError>();
   }
 
   // Default scheme is to print Target, as well as "+ <addend>" for nonzero
@@ -86,17 +86,17 @@
     if (Sym->getType() == ELF::STT_SECTION) {
       Expected<section_iterator> SymSI = SI->getSection();
       if (!SymSI)
-        return errorToErrorCode(SymSI.takeError());
+        return SymSI.takeError();
       const typename ELFT::Shdr *SymSec =
           Obj->getSection((*SymSI)->getRawDataRefImpl());
       auto SecName = EF.getSectionName(SymSec);
       if (!SecName)
-        return errorToErrorCode(SecName.takeError());
+        return SecName.takeError();
       Fmt << *SecName;
     } else {
       Expected<StringRef> SymName = SI->getName();
       if (!SymName)
-        return errorToErrorCode(SymName.takeError());
+        return SymName.takeError();
       if (Demangle)
         Fmt << demangle(*SymName);
       else
@@ -110,13 +110,12 @@
     Fmt << (Addend < 0 ? "" : "+") << Addend;
   Fmt.flush();
   Result.append(FmtBuf.begin(), FmtBuf.end());
-  return std::error_code();
+  return Error::success();
 }
 
-std::error_code
-llvm::getELFRelocationValueString(const ELFObjectFileBase *Obj,
-                                  const RelocationRef &Rel,
-                                  SmallVectorImpl<char> &Result) {
+Error llvm::getELFRelocationValueString(const ELFObjectFileBase *Obj,
+                                        const RelocationRef &Rel,
+                                        SmallVectorImpl<char> &Result) {
   if (auto *ELF32LE = dyn_cast<ELF32LEObjectFile>(Obj))
     return getRelocationValueString(ELF32LE, Rel, Result);
   if (auto *ELF64LE = dyn_cast<ELF64LEObjectFile>(Obj))