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/llvm-objdump.cpp

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 2d8585c..aa9b13d 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -330,6 +330,13 @@
   exit(1);
 }
 
+void llvm::error(Error E) {
+  if (!E)
+    return;
+  WithColor::error(errs(), ToolName) << toString(std::move(E));
+  exit(1);
+}
+
 LLVM_ATTRIBUTE_NORETURN void llvm::error(Twine Message) {
   WithColor::error(errs(), ToolName) << Message << ".\n";
   errs().flush();
@@ -437,8 +444,8 @@
   return A.getOffset() < B.getOffset();
 }
 
-static std::error_code getRelocationValueString(const RelocationRef &Rel,
-                                                SmallVectorImpl<char> &Result) {
+static Error getRelocationValueString(const RelocationRef &Rel,
+                                      SmallVectorImpl<char> &Result) {
   const ObjectFile *Obj = Rel.getObject();
   if (auto *ELF = dyn_cast<ELFObjectFileBase>(Obj))
     return getELFRelocationValueString(ELF, Rel, Result);
@@ -1554,7 +1561,6 @@
 }
 
 void llvm::printSectionContents(const ObjectFile *Obj) {
-  std::error_code EC;
   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
     StringRef Name;
     StringRef Contents;