RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

llvm-dwarfdump: support dumping static archives.

Browse Source 
llvm-svn: 313272
This commit is contained in:
Adrian Prantl 2017-09-14 17:01:53 +00:00
parent f817a9b5c3
commit 180de22eaf
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/DebugInfo/DWARF/DWARFContext.cpp
View File

@ -230,9 +230,6 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
// Print UUID header.
const auto *ObjFile = DObj->getFile();
if (!(DumpType & DIDT_UUID) || DumpType == DIDT_All)
outs() << ObjFile->getFileName() << ":\tfile format "
<< ObjFile->getFileFormatName() << "\n\n";
if (DumpType & DIDT_UUID)
dumpUUID(OS, *ObjFile);

5
test/tools/llvm-dwarfdump/X86/archive.test Normal file
View File

@ -0,0 +1,5 @@
RUN: llvm-dwarfdump --debug-info %S/../../dsymutil/Inputs/libfat-test.a | FileCheck %s
CHECK: libfat-test.a(x86_64)(fat-test.o): file format Mach-O 64-bit x86-64
CHECK: .debug_info contents:
CHECK: libfat-test.a(i386)(fat-test.o): file format Mach-O 32-bit i386
CHECK: .debug_info contents:

42
tools/llvm-dwarfdump/llvm-dwarfdump.cpp
View File

@ -15,6 +15,7 @@
#include "llvm/ADT/Triple.h"
#include "llvm/DebugInfo/DIContext.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/Object/Archive.h"
#include "llvm/Object/MachOUniversal.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Object/RelocVisitor.h"
@ -122,10 +123,29 @@ static bool verifyObjectFile(ObjectFile &Obj, Twine Filename) {
return Result;
}
static bool handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
std::function<bool(ObjectFile &, Twine)> HandleObj);
static bool handleArchive(StringRef Filename, Archive &Arch,
std::function<bool(ObjectFile &, Twine)> HandleObj) {
bool Result = true;
Error Err = Error::success();
for (auto Child : Arch.children(Err)) {
auto BuffOrErr = Child.getMemoryBufferRef();
error(Filename, errorToErrorCode(BuffOrErr.takeError()));
auto NameOrErr = Child.getName();
error(Filename, errorToErrorCode(NameOrErr.takeError()));
std::string Name = (Filename + "(" + NameOrErr.get() + ")").str();
Result &= handleBuffer(Name, BuffOrErr.get(), HandleObj);
}
error(Filename, errorToErrorCode(std::move(Err)));
return Result;
}
static bool handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
std::function<bool(ObjectFile &, Twine)> HandleObj) {
Expected<std::unique_ptr<Binary>> BinOrErr = object::createBinary(Buffer);
if (!BinOrErr)
error(Filename, errorToErrorCode(BinOrErr.takeError()));
bool Result = true;
@ -133,12 +153,22 @@ static bool handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
Result = HandleObj(*Obj, Filename);
else if (auto *Fat = dyn_cast<MachOUniversalBinary>(BinOrErr->get()))
for (auto &ObjForArch : Fat->objects()) {
auto MachOOrErr = ObjForArch.getAsObjectFile();
error(Filename, errorToErrorCode(MachOOrErr.takeError()));
if (!HandleObj(**MachOOrErr,
Filename + " (" + ObjForArch.getArchFlagName() + ")"))
Result = false;
std::string ObjName =
(Filename + "(" + ObjForArch.getArchFlagName() + ")").str();
if (auto MachOOrErr = ObjForArch.getAsObjectFile()) {
Result &= HandleObj(**MachOOrErr, ObjName);
continue;
} else
consumeError(MachOOrErr.takeError());
if (auto ArchiveOrErr = ObjForArch.getAsArchive()) {
error(ObjName, errorToErrorCode(ArchiveOrErr.takeError()));
Result &= handleArchive(ObjName, *ArchiveOrErr.get(), HandleObj);
continue;
} else
consumeError(ArchiveOrErr.takeError());
}
else if (auto *Arch = dyn_cast<Archive>(BinOrErr->get()))
Result = handleArchive(Filename, *Arch, HandleObj);
return Result;
}