[ARM] Do not generate Tag_DIV_use=AllowDIVExt when hardware div is non-optional:...

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

diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp
index a1497708c1e8a06f5508dc637766134ec9b28db4..f1da11ceab58bb92d4dd90d8b2f528b4b3fe4bc3 100644 (file)
--- a/lib/Object/Binary.cpp
+++ b/lib/Object/Binary.cpp
@@ -13,13 +13,14 @@
 
 #include "llvm/Object/Binary.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 
 // 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;
@@ -41,30 +42,26 @@ StringRef Binary::getFileName() const {
   return Data->getBufferIdentifier();
 }
 
-error_code object::createBinary(MemoryBuffer *Source,
-                                OwningPtr<Binary> &Result) {
+ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
   OwningPtr<MemoryBuffer> scopedSource(Source);
-  if (!Source)
-    return make_error_code(errc::invalid_argument);
   sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer());
-  error_code ec;
+  error_code EC;
   switch (type) {
     case sys::fs::file_magic::archive: {
-      OwningPtr<Binary> ret(new Archive(scopedSource.take(), ec));
-      if (ec) return ec;
-      Result.swap(ret);
-      return object_error::success;
+      OwningPtr<Binary> Ret(new Archive(scopedSource.take(), EC));
+      if (EC)
+        return EC;
+      return Ret.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: {
-      OwningPtr<Binary> ret(
-        ObjectFile::createELFObjectFile(scopedSource.take()));
-      if (!ret)
+      OwningPtr<Binary> Ret(
+          ObjectFile::createELFObjectFile(scopedSource.take()));
+      if (!Ret)
         return object_error::invalid_file_type;
-      Result.swap(ret);
-      return object_error::success;
+      return Ret.take();
     }
     case sys::fs::file_magic::macho_object:
     case sys::fs::file_magic::macho_executable:
@@ -74,31 +71,42 @@ error_code object::createBinary(MemoryBuffer *Source,
     case sys::fs::file_magic::macho_dynamically_linked_shared_lib:
     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: {
-      OwningPtr<Binary> ret(
-        ObjectFile::createMachOObjectFile(scopedSource.take()));
-      if (!ret)
+    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;
-      Result.swap(ret);
-      return object_error::success;
+      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::coff_object:
+    case sys::fs::file_magic::coff_import_library:
     case sys::fs::file_magic::pecoff_executable: {
-      OwningPtr<Binary> ret(
+      OwningPtr<Binary> Ret(
           ObjectFile::createCOFFObjectFile(scopedSource.take()));
-      if (!ret)
+      if (!Ret)
         return object_error::invalid_file_type;
-      Result.swap(ret);
-      return object_error::success;
+      return Ret.take();
     }
-    default: // Unrecognized object file format.
+    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;
+    }
   }
+  llvm_unreachable("Unexpected Binary File Type");
 }
 
-error_code object::createBinary(StringRef Path, OwningPtr<Binary> &Result) {
+ErrorOr<Binary *> object::createBinary(StringRef Path) {
   OwningPtr<MemoryBuffer> File;
-  if (error_code ec = MemoryBuffer::getFileOrSTDIN(Path, File))
-    return ec;
-  return createBinary(File.take(), Result);
+  if (error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
+    return EC;
+  return createBinary(File.take());
 }