[llvm-objdump] errorToErrorCode+message -> toString

For test/Object/elf-invalid-phdr.test, the intended error message got lost due to errorToErrorCode().

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

diff --git a/test/Object/elf-invalid-phdr.test b/test/Object/elf-invalid-phdr.test
index aef1772..08c5487 100644 (file)
--- a/test/Object/elf-invalid-phdr.test
+++ b/test/Object/elf-invalid-phdr.test
@@ -23,4 +23,4 @@
 RUN: not llvm-objdump -private-headers %p/Inputs/invalid-phdr.elf 2>&1 \
 RUN:         | FileCheck %s
 
-CHECK: LLVM ERROR: Invalid data was encountered while parsing the file
+CHECK: LLVM ERROR: program headers longer than binary

diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp
index 62a81a9..9c4d67d 100644 (file)
--- 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(errorToErrorCode(PhdrRangeOrErr.takeError()).message());
+    report_fatal_error(toString(PhdrRangeOrErr.takeError()));
 
   // 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(errorToErrorCode(StrTabOrErr.takeError()).message());
+      warn(toString(StrTabOrErr.takeError()));
       consumeError(StrTabOrErr.takeError());
     }
     outs() << format(Fmt, (uint64_t)Dyn.d_un.d_val);
@@ -189,8 +189,7 @@ template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
   outs() << "Program Header:\n";
   auto ProgramHeaderOrError = o->program_headers();
   if (!ProgramHeaderOrError)
-    report_fatal_error(
-        errorToErrorCode(ProgramHeaderOrError.takeError()).message());
+    report_fatal_error(toString(ProgramHeaderOrError.takeError()));
   for (const typename ELFT::Phdr &Phdr : *ProgramHeaderOrError) {
     switch (Phdr.p_type) {
     case ELF::PT_DYNAMIC: