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/MachODump.cpp

diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 974f55a..54c9543 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -412,10 +412,9 @@
   Fmt << S;
 }
 
-std::error_code
-llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
-                                    const RelocationRef &RelRef,
-                                    SmallVectorImpl<char> &Result) {
+Error llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
+                                          const RelocationRef &RelRef,
+                                          SmallVectorImpl<char> &Result) {
   DataRefImpl Rel = RelRef.getRawDataRefImpl();
   MachO::any_relocation_info RE = Obj->getRelocation(Rel);
 
@@ -488,7 +487,7 @@
     // Generic relocation types...
     switch (Type) {
     case MachO::GENERIC_RELOC_PAIR: // prints no info
-      return std::error_code();
+      return Error::success();
     case MachO::GENERIC_RELOC_SECTDIFF: {
       DataRefImpl RelNext = Rel;
       Obj->moveRelocationNext(RelNext);
@@ -588,7 +587,7 @@
 
   Fmt.flush();
   Result.append(FmtBuf.begin(), FmtBuf.end());
-  return std::error_code();
+  return Error::success();
 }
 
 static void PrintIndirectSymbolTable(MachOObjectFile *O, bool verbose,