summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-readobj
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2016-11-03 17:28:33 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2016-11-03 17:28:33 +0000
commit6a4949756a0ebcf0f581a9ae6acb476cd4d83911 (patch)
treed8499cbc7b96e024eeeb0cbc5deb779e571fb3f4 /llvm/tools/llvm-readobj
parent7700de8c302ed5d741bb16d807f554ce5e64275c (diff)
downloadbcm5719-llvm-6a4949756a0ebcf0f581a9ae6acb476cd4d83911.tar.gz
bcm5719-llvm-6a4949756a0ebcf0f581a9ae6acb476cd4d83911.zip
Replace a report_fatal_error with an ErrorOr.
llvm-svn: 285942
Diffstat (limited to 'llvm/tools/llvm-readobj')
-rw-r--r--llvm/tools/llvm-readobj/ELFDumper.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 05c018cfe3d..edb35642395 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -1305,7 +1305,7 @@ ELFDumper<ELFT>::ELFDumper(const ELFFile<ELFT> *Obj, ScopedPrinter &Writer)
: ObjDumper(Writer), Obj(Obj) {
SmallVector<const Elf_Phdr *, 4> LoadSegments;
- for (const Elf_Phdr &Phdr : Obj->program_headers()) {
+ for (const Elf_Phdr &Phdr : unwrapOrError(Obj->program_headers())) {
if (Phdr.p_type == ELF::PT_DYNAMIC) {
DynamicTable = createDRIFrom(&Phdr, sizeof(Elf_Dyn));
continue;
@@ -2910,7 +2910,7 @@ void GNUStyle<ELFT>::printProgramHeaders(const ELFO *Obj) {
else
OS << " Type Offset VirtAddr PhysAddr FileSiz "
<< "MemSiz Flg Align\n";
- for (const auto &Phdr : Obj->program_headers()) {
+ for (const auto &Phdr : unwrapOrError(Obj->program_headers())) {
Type = getElfPtType(Header->e_machine, Phdr.p_type);
Offset = to_string(format_hex(Phdr.p_offset, 8));
VMA = to_string(format_hex(Phdr.p_vaddr, Width));
@@ -2937,7 +2937,7 @@ void GNUStyle<ELFT>::printProgramHeaders(const ELFO *Obj) {
}
OS << "\n Section to Segment mapping:\n Segment Sections...\n";
int Phnum = 0;
- for (const Elf_Phdr &Phdr : Obj->program_headers()) {
+ for (const Elf_Phdr &Phdr : unwrapOrError(Obj->program_headers())) {
std::string Sections;
OS << format(" %2.2d ", Phnum++);
for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
@@ -3268,7 +3268,7 @@ void GNUStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
};
if (IsCore) {
- for (const auto &P : Obj->program_headers())
+ for (const auto &P : unwrapOrError(Obj->program_headers()))
if (P.p_type == PT_NOTE)
process(P.p_offset, P.p_filesz);
} else {
@@ -3630,7 +3630,7 @@ template <class ELFT>
void LLVMStyle<ELFT>::printProgramHeaders(const ELFO *Obj) {
ListScope L(W, "ProgramHeaders");
- for (const Elf_Phdr &Phdr : Obj->program_headers()) {
+ for (const Elf_Phdr &Phdr : unwrapOrError(Obj->program_headers())) {
DictScope P(W, "ProgramHeader");
W.printHex("Type",
getElfSegmentType(Obj->getHeader()->e_machine, Phdr.p_type),
OpenPOWER on IntegriCloud