projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[C++11] Replace OwningPtr::take() with OwningPtr::release().
[oota-llvm.git]
/
lib
/
Object
/
Binary.cpp
diff --git
a/lib/Object/Binary.cpp
b/lib/Object/Binary.cpp
index a0c412a64b282b83975a09a8f29de3b12288b00d..673a34e98a617de027f0fb01e38c147e275042ac 100644
(file)
--- a/
lib/Object/Binary.cpp
+++ b/
lib/Object/Binary.cpp
@@
-26,12
+26,12
@@
using namespace llvm;
using namespace object;
Binary::~Binary() {
using namespace object;
Binary::~Binary() {
- delete Data;
+ if (BufferOwned)
+ delete Data;
}
}
-Binary::Binary(unsigned int Type, MemoryBuffer *Source)
- : TypeID(Type)
- , Data(Source) {}
+Binary::Binary(unsigned int Type, MemoryBuffer *Source, bool BufferOwned)
+ : TypeID(Type), BufferOwned(BufferOwned), Data(Source) {}
StringRef Binary::getData() const {
return Data->getBuffer();
StringRef Binary::getData() const {
return Data->getBuffer();
@@
-42,14
+42,13
@@
StringRef Binary::getFileName() const {
}
ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source,
}
ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source,
-
sys::fs::file_magic Type
) {
+
LLVMContext *Context
) {
OwningPtr<MemoryBuffer> scopedSource(Source);
OwningPtr<MemoryBuffer> scopedSource(Source);
- if (Type == sys::fs::file_magic::unknown)
- Type = sys::fs::identify_magic(Source->getBuffer());
+ sys::fs::file_magic Type = sys::fs::identify_magic(Source->getBuffer());
switch (Type) {
case sys::fs::file_magic::archive:
switch (Type) {
case sys::fs::file_magic::archive:
- return Archive::create(scopedSource.
tak
e());
+ return Archive::create(scopedSource.
releas
e());
case sys::fs::file_magic::elf_relocatable:
case sys::fs::file_magic::elf_executable:
case sys::fs::file_magic::elf_shared_object:
case sys::fs::file_magic::elf_relocatable:
case sys::fs::file_magic::elf_executable:
case sys::fs::file_magic::elf_shared_object:
@@
-67,11
+66,12
@@
ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source,
case sys::fs::file_magic::coff_object:
case sys::fs::file_magic::coff_import_library:
case sys::fs::file_magic::pecoff_executable:
case sys::fs::file_magic::coff_object:
case sys::fs::file_magic::coff_import_library:
case sys::fs::file_magic::pecoff_executable:
- return ObjectFile::createObjectFile(scopedSource.take(), Type);
+ case sys::fs::file_magic::bitcode:
+ return ObjectFile::createSymbolicFile(scopedSource.release(), true, Type,
+ Context);
case sys::fs::file_magic::macho_universal_binary:
case sys::fs::file_magic::macho_universal_binary:
- return MachOUniversalBinary::create(scopedSource.
tak
e());
+ return MachOUniversalBinary::create(scopedSource.
releas
e());
case sys::fs::file_magic::unknown:
case sys::fs::file_magic::unknown:
- case sys::fs::file_magic::bitcode:
case sys::fs::file_magic::windows_resource:
// Unrecognized object file format.
return object_error::invalid_file_type;
case sys::fs::file_magic::windows_resource:
// Unrecognized object file format.
return object_error::invalid_file_type;
@@
-83,5
+83,5
@@
ErrorOr<Binary *> object::createBinary(StringRef Path) {
OwningPtr<MemoryBuffer> File;
if (error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
return EC;
OwningPtr<MemoryBuffer> File;
if (error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
return EC;
- return createBinary(File.
tak
e());
+ return createBinary(File.
releas
e());
}
}