6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-28 07:17:32 +00:00
Code Issues Projects Releases Wiki Activity

Change createObjectFile to return an ErrorOr.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199776 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-01-22 00:14:49 +00:00
parent 6220c8f960
commit 825fc31bd3
8 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Object/ObjectFile.cpp
View File

@@ -37,26 +37,22 @@ section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const {
return section_iterator(SectionRef(Sec, this));
}
ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) {
if (Object->getBufferSize() < 64) {
delete Object;
return 0;
}
ErrorOr<ObjectFile *> ObjectFile::createObjectFile(MemoryBuffer *Object) {
OwningPtr<MemoryBuffer> ScopedObj(Object);
sys::fs::file_magic Type = sys::fs::identify_magic(Object->getBuffer());
switch (Type) {
case sys::fs::file_magic::unknown:
case sys::fs::file_magic::bitcode:
case sys::fs::file_magic::archive:
case sys::fs::file_magic::macho_universal_binary:
case sys::fs::file_magic::windows_resource:
delete Object;
return 0;
return object_error::invalid_file_type;
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_core:
return createELFObjectFile(Object).get();
return createELFObjectFile(ScopedObj.take());
case sys::fs::file_magic::macho_object:
case sys::fs::file_magic::macho_executable:
case sys::fs::file_magic::macho_fixed_virtual_memory_shared_lib:
@@ -67,18 +63,18 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) {
case sys::fs::file_magic::macho_bundle:
case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
case sys::fs::file_magic::macho_dsym_companion:
return createMachOObjectFile(Object).get();
return createMachOObjectFile(ScopedObj.take());
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).get();
return createCOFFObjectFile(ScopedObj.take());
}
llvm_unreachable("Unexpected Object File Type");
}
ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) {
ErrorOr<ObjectFile *> ObjectFile::createObjectFile(StringRef ObjectPath) {
OwningPtr<MemoryBuffer> File;
if (MemoryBuffer::getFile(ObjectPath, File))
return NULL;
if (error_code EC = MemoryBuffer::getFile(ObjectPath, File))
return EC;
return createObjectFile(File.take());
}