This is an archive of the discontinued LLVM Phabricator instance.

Differential D86771

[llvm-readobj/elf] - Don't fail when dumping an archive with a member that can't be recognized.
ClosedPublic

Authored by grimar on Aug 28 2020, 3:34 AM.

Details

Reviewers
jhenderson
MaskRay
Commits
rG506f89ce914e: [llvm-readobj/elf] - Don't fail when dumping an archive with a member that…
Summary

Imagine we have an archive that has 3 objects in the following order:
<valid known object>,<unknown object> and <valid known object>.

Currently llvm-readelf/obj report an error and stops dumping in the middle.
This patch changes the error reported to warning.

I am improving this warning in a follow-up that will be posted soon.

Diff Detail

Event Timeline

grimar created this revision.Aug 28 2020, 3:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 28 2020, 3:35 AM
Herald added a subscriber: rupprecht. · View Herald Transcript
grimar requested review of this revision.Aug 28 2020, 3:35 AM
grimar mentioned this in D86772: [llvm-readobj] - Remove Error.cpp,.h and drop dependencies in the code..Aug 28 2020, 3:41 AM
grimar added a child revision: D86772: [llvm-readobj] - Remove Error.cpp,.h and drop dependencies in the code..
MaskRay accepted this revision.Aug 28 2020, 8:12 AM

with an object that can't be recognized.

object -> member or element.

This revision is now accepted and ready to land.Aug 28 2020, 8:12 AM
grimar retitled this revision from [llvm-readobj/elf] - Don't fail when dumping an archive with an object that can't be recognized. to [llvm-readobj/elf] - Don't fail when dumping an archive with a member that can't be recognized..Aug 31 2020, 3:05 AM
Herald added a subscriber: danielkiss. · View Herald TranscriptAug 31 2020, 3:05 AM
Closed by commit rG506f89ce914e: [llvm-readobj/elf] - Don't fail when dumping an archive with a member that… (authored by grimar). · Explain WhyAug 31 2020, 3:16 AM
This revision was automatically updated to reflect the committed changes.
grimar added a commit: rG506f89ce914e: [llvm-readobj/elf] - Don't fail when dumping an archive with a member that….
jhenderson added inline comments.Sep 1 2020, 2:06 AM
llvm/test/tools/llvm-readobj/archive.test
89–90
grimar mentioned this in rG6c6984ecd543: [llvm-readobj][test] - Update the comment in archive.test.Sep 1 2020, 4:02 AM
grimar added inline comments.Sep 1 2020, 4:03 AM
llvm/test/tools/llvm-readobj/archive.test
89–90

Fixed in rG6c6984ecd5438f3f7016bf6b79ebf6d9962f5b4b, thanks!

Revision Contents

PathSize
llvm/
test/
tools/
llvm-readobj/
16 lines
tools/
llvm-readobj/
4 lines

Diff 288910

llvm/test/tools/llvm-readobj/archive.test

## Test how we dump archives.
## Show that dumping operations apply to all members in an archive. ## Show that dumping operations apply to all members in an archive.
# RUN: rm -f %t.a # RUN: rm -f %t.a
# RUN: rm -rf %t.dir # RUN: rm -rf %t.dir
# RUN: mkdir -p %t.dir # RUN: mkdir -p %t.dir
# RUN: yaml2obj --docnum=1 %s -o %t.dir/trivial.obj.elf-x86-64 # RUN: yaml2obj --docnum=1 %s -o %t.dir/trivial.obj.elf-x86-64
# RUN: yaml2obj --docnum=2 %s -o %t.dir/trivial.obj.elf-i386 # RUN: yaml2obj --docnum=2 %s -o %t.dir/trivial.obj.elf-i386
# RUN: yaml2obj --docnum=3 %s -o %t.dir/trivial.obj.coff-arm # RUN: yaml2obj --docnum=3 %s -o %t.dir/trivial.obj.coff-arm
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 LinesFileHeader:
Machine: EM_386 Machine: EM_386
--- !COFF --- !COFF
header: header:
Machine: IMAGE_FILE_MACHINE_ARMNT Machine: IMAGE_FILE_MACHINE_ARMNT
Characteristics: [ ] Characteristics: [ ]
sections: [] sections: []
symbols: [] symbols: []
## Here we test that we report a warning and continue dumping when an archive contains
## a unrecognized object. We place a dummy archive to another archive in the middle,
## so that it is placed between two valid objects.
jhendersonUnsubmitted
Not Done
ReplyInline Actions
## Here we test that we report a warning and continue dumping when an archive contains
- ## a unrecognized object. We place a dummy archive to another archive in the middle,
- ## so that it is placed between two valid objects.
+ ## an unrecognized object. We add a dummy archive to the middle of another archive,
+ ## so that it is between two valid objects.
# RUN: rm -f %t2.a
jhenderson:
grimarAuthorUnsubmitted
Done
ReplyInline Actions

Fixed in rG6c6984ecd5438f3f7016bf6b79ebf6d9962f5b4b, thanks!

grimar: Fixed in rG6c6984ecd5438f3f7016bf6b79ebf6d9962f5b4b, thanks!
# RUN: rm -f %t2.a
# RUN: llvm-ar rc %t.dir/broken.a %t.dir/trivial.obj.elf-x86-64
# RUN: llvm-ar qc %t2.a %t.dir/trivial.obj.elf-x86-64 %t.dir/broken.a %t.dir/trivial.obj.elf-x86-64
# RUN: llvm-readobj --all %t2.a 2>&1 | FileCheck %s -DARFILE="%t2.a" --check-prefix=BROKEN
# RUN: llvm-readelf --all %t2.a 2>&1 | FileCheck %s -DARFILE="%t2.a" --check-prefix=BROKEN
# BROKEN: File: [[ARFILE]](trivial.obj.elf-x86-64)
# BROKEN: warning: '[[ARFILE]]': Unrecognized file type.
# BROKEN: File: [[ARFILE]](trivial.obj.elf-x86-64)

llvm/tools/llvm-readobj/llvm-readobj.cpp

Show First 20 Lines • Show All 578 Lines • ▼ Show 20 Lines if (!ChildOrErr) {
reportError(std::move(E), Arc->getFileName()); reportError(std::move(E), Arc->getFileName());
continue; continue;
} }
if (ObjectFile *Obj = dyn_cast<ObjectFile>(&*ChildOrErr.get())) if (ObjectFile *Obj = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
dumpObject(*Obj, Writer, Arc); dumpObject(*Obj, Writer, Arc);
else if (COFFImportFile *Imp = dyn_cast<COFFImportFile>(&*ChildOrErr.get())) else if (COFFImportFile *Imp = dyn_cast<COFFImportFile>(&*ChildOrErr.get()))
dumpCOFFImportFile(Imp, Writer); dumpCOFFImportFile(Imp, Writer);
else else
reportError(errorCodeToError(readobj_error::unrecognized_file_format), reportWarning(errorCodeToError(readobj_error::unrecognized_file_format),
Arc->getFileName()); Arc->getFileName());
} }
if (Err) if (Err)
reportError(std::move(Err), Arc->getFileName()); reportError(std::move(Err), Arc->getFileName());
} }
/// Dumps each object file in \a MachO Universal Binary; /// Dumps each object file in \a MachO Universal Binary;
static void dumpMachOUniversalBinary(const MachOUniversalBinary *UBinary, static void dumpMachOUniversalBinary(const MachOUniversalBinary *UBinary,
ScopedPrinter &Writer) { ScopedPrinter &Writer) {
▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines