maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Return Expected from createRTDyldELFObject. 

No functionality change, it just makes it easier to use Expected in
Object.

llvm-svn: 315348
This commit is contained in:
Rafael Espindola 2017-10-10 19:14:30 +00:00
parent 563ede149a
commit ff9f5f3372
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
View File

@ -133,14 +133,17 @@ public:
}; };
template <typename ELFT> template <typename ELFT>
static std::unique_ptr<DyldELFObject<ELFT>> static Expected<std::unique_ptr<DyldELFObject<ELFT>>>
createRTDyldELFObject(MemoryBufferRef Buffer, const ObjectFile &SourceObject, createRTDyldELFObject(MemoryBufferRef Buffer, const ObjectFile &SourceObject,
const LoadedELFObjectInfo &L, std::error_code &ec) { const LoadedELFObjectInfo &L) {
typedef typename ELFFile<ELFT>::Elf_Shdr Elf_Shdr; typedef typename ELFFile<ELFT>::Elf_Shdr Elf_Shdr;
typedef typename ELFDataTypeTypedefHelper<ELFT>::value_type addr_type; typedef typename ELFDataTypeTypedefHelper<ELFT>::value_type addr_type;
std::error_code EC;
std::unique_ptr<DyldELFObject<ELFT>> Obj = std::unique_ptr<DyldELFObject<ELFT>> Obj =
llvm::make_unique<DyldELFObject<ELFT>>(Buffer, ec); llvm::make_unique<DyldELFObject<ELFT>>(Buffer, EC);
if (EC)
return errorCodeToError(EC);
// Iterate over all sections in the object. // Iterate over all sections in the object.
auto SI = SourceObject.section_begin(); auto SI = SourceObject.section_begin();
@ -171,27 +174,25 @@ createELFDebugObject(const ObjectFile &Obj, const LoadedELFObjectInfo &L) {
std::unique_ptr<MemoryBuffer> Buffer = std::unique_ptr<MemoryBuffer> Buffer =
MemoryBuffer::getMemBufferCopy(Obj.getData(), Obj.getFileName()); MemoryBuffer::getMemBufferCopy(Obj.getData(), Obj.getFileName());
std::error_code ec; Expected<std::unique_ptr<ObjectFile>> DebugObj(nullptr);
handleAllErrors(DebugObj.takeError());
std::unique_ptr<ObjectFile> DebugObj;
if (Obj.getBytesInAddress() == 4 && Obj.isLittleEndian()) if (Obj.getBytesInAddress() == 4 && Obj.isLittleEndian())
DebugObj = createRTDyldELFObject<ELF32LE>(Buffer->getMemBufferRef(), Obj, L, DebugObj =
ec); createRTDyldELFObject<ELF32LE>(Buffer->getMemBufferRef(), Obj, L);
else if (Obj.getBytesInAddress() == 4 && !Obj.isLittleEndian()) else if (Obj.getBytesInAddress() == 4 && !Obj.isLittleEndian())
DebugObj = createRTDyldELFObject<ELF32BE>(Buffer->getMemBufferRef(), Obj, L, DebugObj =
ec); createRTDyldELFObject<ELF32BE>(Buffer->getMemBufferRef(), Obj, L);
else if (Obj.getBytesInAddress() == 8 && !Obj.isLittleEndian()) else if (Obj.getBytesInAddress() == 8 && !Obj.isLittleEndian())
DebugObj = createRTDyldELFObject<ELF64BE>(Buffer->getMemBufferRef(), Obj, L, DebugObj =
ec); createRTDyldELFObject<ELF64BE>(Buffer->getMemBufferRef(), Obj, L);
else if (Obj.getBytesInAddress() == 8 && Obj.isLittleEndian()) else if (Obj.getBytesInAddress() == 8 && Obj.isLittleEndian())
DebugObj = createRTDyldELFObject<ELF64LE>(Buffer->getMemBufferRef(), Obj, L, DebugObj =
ec); createRTDyldELFObject<ELF64LE>(Buffer->getMemBufferRef(), Obj, L);
else else
llvm_unreachable("Unexpected ELF format"); llvm_unreachable("Unexpected ELF format");
assert(!ec && "Could not construct copy ELF object file"); handleAllErrors(DebugObj.takeError());
return OwningBinary<ObjectFile>(std::move(*DebugObj), std::move(Buffer));
return OwningBinary<ObjectFile>(std::move(DebugObj), std::move(Buffer));
} }
OwningBinary<ObjectFile> OwningBinary<ObjectFile>