Add whitespace to try to fix bulleted list.

[oota-llvm.git] / lib / Object / Binary.cpp

diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp
index 4f35d9752626353d49e4029463e7051218f435e9..c7f868fcdd1453050ac80a4b880737b2bc6908bf 100644 (file)
--- a/lib/Object/Binary.cpp
+++ b/lib/Object/Binary.cpp
@@ -26,12 +26,12 @@ using namespace llvm;
 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();
@@ -41,17 +41,18 @@ StringRef Binary::getFileName() const {
   return Data->getBufferIdentifier();
 }
 
-ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
+ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source,
+                                       LLVMContext *Context) {
   OwningPtr<MemoryBuffer> scopedSource(Source);
-  sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer());
-  switch (type) {
+  sys::fs::file_magic Type = sys::fs::identify_magic(Source->getBuffer());
+
+  switch (Type) {
     case sys::fs::file_magic::archive:
       return Archive::create(scopedSource.take());
     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 ObjectFile::createELFObjectFile(scopedSource.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:
@@ -62,19 +63,18 @@ ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
     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 ObjectFile::createMachOObjectFile(scopedSource.take());
-    case sys::fs::file_magic::macho_universal_binary:
-      return MachOUniversalBinary::create(scopedSource.take());
     case sys::fs::file_magic::coff_object:
     case sys::fs::file_magic::coff_import_library:
     case sys::fs::file_magic::pecoff_executable:
-      return ObjectFile::createCOFFObjectFile(scopedSource.take());
-    case sys::fs::file_magic::unknown:
     case sys::fs::file_magic::bitcode:
-    case sys::fs::file_magic::windows_resource: {
+      return ObjectFile::createSymbolicFile(scopedSource.take(), true, Type,
+                                            Context);
+    case sys::fs::file_magic::macho_universal_binary:
+      return MachOUniversalBinary::create(scopedSource.take());
+    case sys::fs::file_magic::unknown:
+    case sys::fs::file_magic::windows_resource:
       // Unrecognized object file format.
       return object_error::invalid_file_type;
-    }
   }
   llvm_unreachable("Unexpected Binary File Type");
 }