Move createIRObjectFile to the IRObjectFile class and return the concrete type.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212301 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/IRObjectFile.h b/include/llvm/Object/IRObjectFile.h
index 2ce9c95d0848d919dbd9b423094b39f6035eff7e..bc69de40cb56e872d20408bdaf3d12b41b1a2b36 100644 (file)
--- a/include/llvm/Object/IRObjectFile.h
+++ b/include/llvm/Object/IRObjectFile.h
@@ -42,6 +42,10 @@ public:
   static inline bool classof(const Binary *v) {
     return v->isIR();
   }
+
+  static ErrorOr<IRObjectFile *>
+  createIRObjectFile(std::unique_ptr<MemoryBuffer> Object,
+                     LLVMContext &Context);
 };
 }
 }

diff --git a/include/llvm/Object/SymbolicFile.h b/include/llvm/Object/SymbolicFile.h
index e48bf372a6bca1b18147e74480d2276c2d04f535..77eef4a546aa8345b0d71a9b08296ee851d9ef23 100644 (file)
--- a/include/llvm/Object/SymbolicFile.h
+++ b/include/llvm/Object/SymbolicFile.h
@@ -142,10 +142,6 @@ public:
   }
 
   // construction aux.
-  static ErrorOr<SymbolicFile *>
-  createIRObjectFile(std::unique_ptr<MemoryBuffer> Object,
-                     LLVMContext &Context);
-
   static ErrorOr<SymbolicFile *>
   createSymbolicFile(std::unique_ptr<MemoryBuffer> &Object,
                      sys::fs::file_magic Type, LLVMContext *Context);

diff --git a/lib/Object/IRObjectFile.cpp b/lib/Object/IRObjectFile.cpp
index 27b6d208b97aca19854a50495ce146f97a5ef1c0..50394058a87ad69a0da3c73953f1501b7730e12a 100644 (file)
--- a/lib/Object/IRObjectFile.cpp
+++ b/lib/Object/IRObjectFile.cpp
@@ -263,7 +263,7 @@ basic_symbol_iterator IRObjectFile::symbol_end_impl() const {
   return basic_symbol_iterator(BasicSymbolRef(Ret, this));
 }
 
-ErrorOr<SymbolicFile *> llvm::object::SymbolicFile::createIRObjectFile(
+ErrorOr<IRObjectFile *> llvm::object::IRObjectFile::createIRObjectFile(
     std::unique_ptr<MemoryBuffer> Object, LLVMContext &Context) {
   std::error_code EC;
   std::unique_ptr<IRObjectFile> Ret(