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

diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp
index 2d12904..251c555 100644
--- a/llvm/tools/llvm-objdump/COFFDump.cpp
+++ b/llvm/tools/llvm-objdump/COFFDump.cpp
@@ -468,17 +468,16 @@
   return false;
 }
 
-std::error_code
-llvm::getCOFFRelocationValueString(const COFFObjectFile *Obj,
-                                   const RelocationRef &Rel,
-                                   SmallVectorImpl<char> &Result) {
+Error llvm::getCOFFRelocationValueString(const COFFObjectFile *Obj,
+                                         const RelocationRef &Rel,
+                                         SmallVectorImpl<char> &Result) {
   symbol_iterator SymI = Rel.getSymbol();
   Expected<StringRef> SymNameOrErr = SymI->getName();
   if (!SymNameOrErr)
-    return errorToErrorCode(SymNameOrErr.takeError());
+    return SymNameOrErr.takeError();
   StringRef SymName = *SymNameOrErr;
   Result.append(SymName.begin(), SymName.end());
-  return std::error_code();
+  return Error::success();
 }
 
 static void printWin64EHUnwindInfo(const Win64EH::UnwindInfo *UI) {