extracting swapStruct into include/llvm/Support/MachO.h (no functional change)

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

diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp
index f1da11ceab58bb92d4dd90d8b2f528b4b3fe4bc3..9f6a68556f9a845881379d6f78e508d9092c4505 100644 (file)
--- a/lib/Object/Binary.cpp
+++ b/lib/Object/Binary.cpp
@@ -19,20 +19,16 @@
 
 // Include headers for createBinary.
 #include "llvm/Object/Archive.h"
-#include "llvm/Object/COFF.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Object/ObjectFile.h"
 
 using namespace llvm;
 using namespace object;
 
-Binary::~Binary() {
-  delete Data;
-}
+Binary::~Binary() {}
 
-Binary::Binary(unsigned int Type, MemoryBuffer *Source)
-  : TypeID(Type)
-  , Data(Source) {}
+Binary::Binary(unsigned int Type, std::unique_ptr<MemoryBuffer> Source)
+    : TypeID(Type), Data(std::move(Source)) {}
 
 StringRef Binary::getData() const {
   return Data->getBuffer();
@@ -42,27 +38,17 @@ StringRef Binary::getFileName() const {
   return Data->getBufferIdentifier();
 }
 
-ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
-  OwningPtr<MemoryBuffer> scopedSource(Source);
-  sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer());
-  error_code EC;
-  switch (type) {
-    case sys::fs::file_magic::archive: {
-      OwningPtr<Binary> Ret(new Archive(scopedSource.take(), EC));
-      if (EC)
-        return EC;
-      return Ret.take();
-    }
+ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> &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(std::move(Buffer));
     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: {
-      OwningPtr<Binary> Ret(
-          ObjectFile::createELFObjectFile(scopedSource.take()));
-      if (!Ret)
-        return object_error::invalid_file_type;
-      return Ret.take();
-    }
+    case sys::fs::file_magic::elf_core:
     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:
@@ -72,41 +58,26 @@ ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
     case sys::fs::file_magic::macho_dynamic_linker:
     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: {
-      OwningPtr<Binary> Ret(
-          ObjectFile::createMachOObjectFile(scopedSource.take()));
-      if (!Ret)
-        return object_error::invalid_file_type;
-      return Ret.take();
-    }
-    case sys::fs::file_magic::macho_universal_binary: {
-      OwningPtr<Binary> Ret(new MachOUniversalBinary(scopedSource.take(), EC));
-      if (EC)
-        return EC;
-      return Ret.take();
-    }
+    case sys::fs::file_magic::macho_dsym_companion:
     case sys::fs::file_magic::coff_object:
     case sys::fs::file_magic::coff_import_library:
-    case sys::fs::file_magic::pecoff_executable: {
-      OwningPtr<Binary> Ret(
-          ObjectFile::createCOFFObjectFile(scopedSource.take()));
-      if (!Ret)
-        return object_error::invalid_file_type;
-      return Ret.take();
-    }
-    case sys::fs::file_magic::unknown:
+    case sys::fs::file_magic::pecoff_executable:
     case sys::fs::file_magic::bitcode:
-    case sys::fs::file_magic::windows_resource: {
+      return ObjectFile::createSymbolicFile(Buffer, Type, Context);
+    case sys::fs::file_magic::macho_universal_binary:
+      return MachOUniversalBinary::create(std::move(Buffer));
+    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");
 }
 
 ErrorOr<Binary *> object::createBinary(StringRef Path) {
-  OwningPtr<MemoryBuffer> File;
-  if (error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
+  ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
+      MemoryBuffer::getFileOrSTDIN(Path);
+  if (std::error_code EC = FileOrErr.getError())
     return EC;
-  return createBinary(File.take());
+  return createBinary(FileOrErr.get());
 }