diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 22:00:37 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 22:00:37 +0000 |
| commit | b138caba43b5c1a370bc9cf52d815c44bdf90159 (patch) | |
| tree | 319bb84424a6ab56954abb3a004a2bf8c1b18b6b /lib/Object/ELFObjectFile.cpp | |
| parent | 20732d55c2fda872a32b2335febafa7327f8b066 (diff) | |
| download | llvm-b138caba43b5c1a370bc9cf52d815c44bdf90159.tar.gz | |
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
Diffstat (limited to 'lib/Object/ELFObjectFile.cpp')
| -rw-r--r-- | lib/Object/ELFObjectFile.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp index 295cb111c38a..a9165af79d64 100644 --- a/lib/Object/ELFObjectFile.cpp +++ b/lib/Object/ELFObjectFile.cpp @@ -17,8 +17,9 @@ namespace llvm { using namespace object; -ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj) { - std::pair<unsigned char, unsigned char> Ident = getElfArchType(Obj); +ErrorOr<ObjectFile *> +ObjectFile::createELFObjectFile(std::unique_ptr<MemoryBuffer> &Obj) { + std::pair<unsigned char, unsigned char> Ident = getElfArchType(Obj.get()); std::size_t MaxAlignment = 1ULL << countTrailingZeros(uintptr_t(Obj->getBufferStart())); @@ -27,41 +28,49 @@ ErrorOr<ObjectFile *> 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<ELFType<support::little, 4, false>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::little, 4, false>>( + Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile<ELFType<support::little, 2, false>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::little, 2, false>>( + 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<ELFType<support::big, 4, false>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::big, 4, false>>(Obj.release(), + EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile<ELFType<support::big, 2, false>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::big, 2, false>>(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<ELFType<support::big, 8, true>>(Obj, EC)); + R.reset( + new ELFObjectFile<ELFType<support::big, 8, true>>(Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile<ELFType<support::big, 2, true>>(Obj, EC)); + R.reset( + new ELFObjectFile<ELFType<support::big, 2, true>>(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<ELFType<support::little, 8, true>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::little, 8, true>>( + Obj.release(), EC)); else #endif if (MaxAlignment >= 2) - R.reset(new ELFObjectFile<ELFType<support::little, 2, true>>(Obj, EC)); + R.reset(new ELFObjectFile<ELFType<support::little, 2, true>>( + Obj.release(), EC)); else return object_error::parse_failed; } |