Skip to content

Commit a5f8dcb

Browse files
committed
[llvm-objdump] errorToErrorCode+message -> toString
llvm-svn: 359100
1 parent 5929553 commit a5f8dcb

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

llvm/tools/llvm-objdump/ELFDump.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static uint64_t getSectionLMA(const ELFFile<ELFT> *Obj,
131131
const object::ELFSectionRef &Sec) {
132132
auto PhdrRangeOrErr = Obj->program_headers();
133133
if (!PhdrRangeOrErr)
134-
report_fatal_error(errorToErrorCode(PhdrRangeOrErr.takeError()).message());
134+
report_fatal_error(toString(PhdrRangeOrErr.takeError()));
135135

136136
// Search for a PT_LOAD segment containing the requested section. Use this
137137
// segment's p_addr to calculate the section's LMA.
@@ -178,7 +178,7 @@ void printDynamicSection(const ELFFile<ELFT> *Elf, StringRef Filename) {
178178
outs() << (Data + Dyn.d_un.d_val) << "\n";
179179
continue;
180180
}
181-
warn(errorToErrorCode(StrTabOrErr.takeError()).message());
181+
warn(toString(StrTabOrErr.takeError()));
182182
consumeError(StrTabOrErr.takeError());
183183
}
184184
outs() << format(Fmt, (uint64_t)Dyn.d_un.d_val);
@@ -189,8 +189,7 @@ template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
189189
outs() << "Program Header:\n";
190190
auto ProgramHeaderOrError = o->program_headers();
191191
if (!ProgramHeaderOrError)
192-
report_fatal_error(
193-
errorToErrorCode(ProgramHeaderOrError.takeError()).message());
192+
report_fatal_error(toString(ProgramHeaderOrError.takeError()));
194193
for (const typename ELFT::Phdr &Phdr : *ProgramHeaderOrError) {
195194
switch (Phdr.p_type) {
196195
case ELF::PT_DYNAMIC:

0 commit comments

Comments
 (0)