From: JF Bastien <jfbastien@apple.com>
Date: Wed, 24 Apr 2019 16:49:30 +0000 (+0000)
Subject: Revert "[llvm-objdump] errorToErrorCode+message -> toString"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c93fd793ca7dfceed67feca6b5eccd690510563;p=llvm

Revert "[llvm-objdump] errorToErrorCode+message -> toString"

Revert r359100

It breaks llvm/test/Object/elf-invalid-phdr.test

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

diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp
index 9c4d67d0f1b..62a81a9b213 100644
--- a/tools/llvm-objdump/ELFDump.cpp
+++ b/tools/llvm-objdump/ELFDump.cpp
@@ -131,7 +131,7 @@ static uint64_t getSectionLMA(const ELFFile<ELFT> *Obj,
                               const object::ELFSectionRef &Sec) {
   auto PhdrRangeOrErr = Obj->program_headers();
   if (!PhdrRangeOrErr)
-    report_fatal_error(toString(PhdrRangeOrErr.takeError()));
+    report_fatal_error(errorToErrorCode(PhdrRangeOrErr.takeError()).message());
 
   // Search for a PT_LOAD segment containing the requested section. Use this
   // segment's p_addr to calculate the section's LMA.
@@ -178,7 +178,7 @@ void printDynamicSection(const ELFFile<ELFT> *Elf, StringRef Filename) {
         outs() << (Data + Dyn.d_un.d_val) << "\n";
         continue;
       }
-      warn(toString(StrTabOrErr.takeError()));
+      warn(errorToErrorCode(StrTabOrErr.takeError()).message());
       consumeError(StrTabOrErr.takeError());
     }
     outs() << format(Fmt, (uint64_t)Dyn.d_un.d_val);
@@ -189,7 +189,8 @@ template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
   outs() << "Program Header:\n";
   auto ProgramHeaderOrError = o->program_headers();
   if (!ProgramHeaderOrError)
-    report_fatal_error(toString(ProgramHeaderOrError.takeError()));
+    report_fatal_error(
+        errorToErrorCode(ProgramHeaderOrError.takeError()).message());
   for (const typename ELFT::Phdr &Phdr : *ProgramHeaderOrError) {
     switch (Phdr.p_type) {
     case ELF::PT_DYNAMIC: