From b138caba43b5c1a370bc9cf52d815c44bdf90159 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 23 Jun 2014 22:00:37 +0000 Subject: Pass a std::unique_ptr& to the create??? methods is lib/Object. This makes the buffer ownership on error conditions very natural. The buffer is only moved out of the argument if an object is constructed that now owns the buffer. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211546 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/Archive.cpp | 5 +---- lib/Object/Binary.cpp | 8 ++++---- lib/Object/ELFObjectFile.cpp | 29 +++++++++++++++++++---------- lib/Object/MachOObjectFile.cpp | 15 +++++++-------- lib/Object/MachOUniversal.cpp | 4 ++-- lib/Object/Object.cpp | 4 +++- lib/Object/ObjectFile.cpp | 9 +++++---- lib/Object/SymbolicFile.cpp | 5 +++-- 8 files changed, 44 insertions(+), 35 deletions(-) (limited to 'lib/Object') diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp index cd8924920a..cdf987a320 100644 --- a/lib/Object/Archive.cpp +++ b/lib/Object/Archive.cpp @@ -183,10 +183,7 @@ Archive::Child::getAsBinary(LLVMContext *Context) const { return EC; std::unique_ptr Buff(BuffOrErr.get().release()); - ErrorOr> Ret = createBinary(Buff.get(), Context); - if (!Ret.getError()) - Buff.release(); - return Ret; + return createBinary(Buff, Context); } ErrorOr Archive::create(MemoryBuffer *Source) { diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp index 785b3d2318..ee6f58cd75 100644 --- a/lib/Object/Binary.cpp +++ b/lib/Object/Binary.cpp @@ -38,13 +38,13 @@ StringRef Binary::getFileName() const { return Data->getBufferIdentifier(); } -ErrorOr object::createBinary(MemoryBuffer *Buffer, +ErrorOr object::createBinary(std::unique_ptr &Buffer, LLVMContext *Context) { sys::fs::file_magic Type = sys::fs::identify_magic(Buffer->getBuffer()); switch (Type) { case sys::fs::file_magic::archive: - return Archive::create(Buffer); + return Archive::create(Buffer.release()); case sys::fs::file_magic::elf_relocatable: case sys::fs::file_magic::elf_executable: case sys::fs::file_magic::elf_shared_object: @@ -65,7 +65,7 @@ ErrorOr object::createBinary(MemoryBuffer *Buffer, case sys::fs::file_magic::bitcode: return ObjectFile::createSymbolicFile(Buffer, Type, Context); case sys::fs::file_magic::macho_universal_binary: - return MachOUniversalBinary::create(Buffer); + return MachOUniversalBinary::create(Buffer.release()); case sys::fs::file_magic::unknown: case sys::fs::file_magic::windows_resource: // Unrecognized object file format. @@ -78,5 +78,5 @@ ErrorOr object::createBinary(StringRef Path) { std::unique_ptr File; if (std::error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File)) return EC; - return createBinary(File.release()); + return createBinary(File); } diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp index 295cb111c3..a9165af79d 100644 --- a/lib/Object/ELFObjectFile.cpp +++ b/lib/Object/ELFObjectFile.cpp @@ -17,8 +17,9 @@ namespace llvm { using namespace object; -ErrorOr ObjectFile::createELFObjectFile(MemoryBuffer *Obj) { - std::pair Ident = getElfArchType(Obj); +ErrorOr +ObjectFile::createELFObjectFile(std::unique_ptr &Obj) { + std::pair Ident = getElfArchType(Obj.get()); std::size_t MaxAlignment = 1ULL << countTrailingZeros(uintptr_t(Obj->getBufferStart())); @@ -27,41 +28,49 @@ ErrorOr ObjectFile::createELFObjectFile(MemoryBuffer *Obj) { if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2LSB) #if !LLVM_IS_UNALIGNED_ACCESS_FAST if (MaxAlignment >= 4) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>( + Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>( + Obj.release(), EC)); else return object_error::parse_failed; else if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2MSB) #if !LLVM_IS_UNALIGNED_ACCESS_FAST if (MaxAlignment >= 4) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>(Obj.release(), + EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>(Obj.release(), + EC)); else return object_error::parse_failed; else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2MSB) #if !LLVM_IS_UNALIGNED_ACCESS_FAST if (MaxAlignment >= 8) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset( + new ELFObjectFile>(Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset( + new ELFObjectFile>(Obj.release(), EC)); else return object_error::parse_failed; else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2LSB) { #if !LLVM_IS_UNALIGNED_ACCESS_FAST if (MaxAlignment >= 8) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>( + Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile>(Obj, EC)); + R.reset(new ELFObjectFile>( + Obj.release(), EC)); else return object_error::parse_failed; } diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index 7fc02fb893..45fc5ea735 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -1811,22 +1811,21 @@ void MachOObjectFile::ReadULEB128s(uint64_t Index, } } -ErrorOr ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) { +ErrorOr +ObjectFile::createMachOObjectFile(std::unique_ptr &Buffer) { StringRef Magic = Buffer->getBuffer().slice(0, 4); std::error_code EC; std::unique_ptr Ret; if (Magic == "\xFE\xED\xFA\xCE") - Ret.reset(new MachOObjectFile(Buffer, false, false, EC)); + Ret.reset(new MachOObjectFile(Buffer.release(), false, false, EC)); else if (Magic == "\xCE\xFA\xED\xFE") - Ret.reset(new MachOObjectFile(Buffer, true, false, EC)); + Ret.reset(new MachOObjectFile(Buffer.release(), true, false, EC)); else if (Magic == "\xFE\xED\xFA\xCF") - Ret.reset(new MachOObjectFile(Buffer, false, true, EC)); + Ret.reset(new MachOObjectFile(Buffer.release(), false, true, EC)); else if (Magic == "\xCF\xFA\xED\xFE") - Ret.reset(new MachOObjectFile(Buffer, true, true, EC)); - else { - delete Buffer; + Ret.reset(new MachOObjectFile(Buffer.release(), true, true, EC)); + else return object_error::parse_failed; - } if (EC) return EC; diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp index 1f867046eb..330454ac5a 100644 --- a/lib/Object/MachOUniversal.cpp +++ b/lib/Object/MachOUniversal.cpp @@ -73,8 +73,8 @@ MachOUniversalBinary::ObjectForArch::getAsObjectFile() const { StringRef ParentData = Parent->getData(); StringRef ObjectData = ParentData.substr(Header.offset, Header.size); std::string ObjectName = Parent->getFileName().str(); - MemoryBuffer *ObjBuffer = MemoryBuffer::getMemBuffer( - ObjectData, ObjectName, false); + std::unique_ptr ObjBuffer( + MemoryBuffer::getMemBuffer(ObjectData, ObjectName, false)); return ObjectFile::createMachOObjectFile(ObjBuffer); } return object_error::parse_failed; diff --git a/lib/Object/Object.cpp b/lib/Object/Object.cpp index 7282f468b0..567d87f7a0 100644 --- a/lib/Object/Object.cpp +++ b/lib/Object/Object.cpp @@ -59,7 +59,9 @@ wrap(const relocation_iterator *SI) { // ObjectFile creation LLVMObjectFileRef LLVMCreateObjectFile(LLVMMemoryBufferRef MemBuf) { - ErrorOr ObjOrErr(ObjectFile::createObjectFile(unwrap(MemBuf))); + std::unique_ptr Buf(unwrap(MemBuf)); + ErrorOr ObjOrErr(ObjectFile::createObjectFile(Buf)); + Buf.release(); ObjectFile *Obj = ObjOrErr ? ObjOrErr.get() : nullptr; return wrap(Obj); } diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 738ea5fbb9..ee2680e6ba 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -45,8 +45,9 @@ section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const { return section_iterator(SectionRef(Sec, this)); } -ErrorOr ObjectFile::createObjectFile(MemoryBuffer *Object, - sys::fs::file_magic Type) { +ErrorOr +ObjectFile::createObjectFile(std::unique_ptr &Object, + sys::fs::file_magic Type) { if (Type == sys::fs::file_magic::unknown) Type = sys::fs::identify_magic(Object->getBuffer()); @@ -76,7 +77,7 @@ ErrorOr ObjectFile::createObjectFile(MemoryBuffer *Object, case sys::fs::file_magic::coff_object: case sys::fs::file_magic::coff_import_library: case sys::fs::file_magic::pecoff_executable: - return createCOFFObjectFile(Object); + return createCOFFObjectFile(Object.release()); } llvm_unreachable("Unexpected Object File Type"); } @@ -85,5 +86,5 @@ ErrorOr ObjectFile::createObjectFile(StringRef ObjectPath) { std::unique_ptr File; if (std::error_code EC = MemoryBuffer::getFile(ObjectPath, File)) return EC; - return createObjectFile(File.release()); + return createObjectFile(File); } diff --git a/lib/Object/SymbolicFile.cpp b/lib/Object/SymbolicFile.cpp index 48fea0256e..46aba3cf05 100644 --- a/lib/Object/SymbolicFile.cpp +++ b/lib/Object/SymbolicFile.cpp @@ -25,7 +25,8 @@ SymbolicFile::SymbolicFile(unsigned int Type, MemoryBuffer *Source) SymbolicFile::~SymbolicFile() {} ErrorOr -SymbolicFile::createSymbolicFile(MemoryBuffer *Object, sys::fs::file_magic Type, +SymbolicFile::createSymbolicFile(std::unique_ptr &Object, + sys::fs::file_magic Type, LLVMContext *Context) { if (Type == sys::fs::file_magic::unknown) Type = sys::fs::identify_magic(Object->getBuffer()); @@ -33,7 +34,7 @@ SymbolicFile::createSymbolicFile(MemoryBuffer *Object, sys::fs::file_magic Type, switch (Type) { case sys::fs::file_magic::bitcode: if (Context) - return IRObjectFile::createIRObjectFile(Object, *Context); + return IRObjectFile::createIRObjectFile(Object.release(), *Context); // Fallthrough case sys::fs::file_magic::unknown: case sys::fs::file_magic::archive: -- cgit v1.2.3