From ab419e6d0c52628e149e740b4d1f1ff6df52fd97 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 3 Jul 2014 23:03:50 +0000 Subject: [PATCH] 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 --- include/llvm/Object/IRObjectFile.h | 4 ++++ include/llvm/Object/SymbolicFile.h | 4 ---- lib/Object/IRObjectFile.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/llvm/Object/IRObjectFile.h b/include/llvm/Object/IRObjectFile.h index 2ce9c95d084..bc69de40cb5 100644 --- 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 + createIRObjectFile(std::unique_ptr Object, + LLVMContext &Context); }; } } diff --git a/include/llvm/Object/SymbolicFile.h b/include/llvm/Object/SymbolicFile.h index e48bf372a6b..77eef4a546a 100644 --- a/include/llvm/Object/SymbolicFile.h +++ b/include/llvm/Object/SymbolicFile.h @@ -142,10 +142,6 @@ public: } // construction aux. - static ErrorOr - createIRObjectFile(std::unique_ptr Object, - LLVMContext &Context); - static ErrorOr createSymbolicFile(std::unique_ptr &Object, sys::fs::file_magic Type, LLVMContext *Context); diff --git a/lib/Object/IRObjectFile.cpp b/lib/Object/IRObjectFile.cpp index 27b6d208b97..50394058a87 100644 --- 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 llvm::object::SymbolicFile::createIRObjectFile( +ErrorOr llvm::object::IRObjectFile::createIRObjectFile( std::unique_ptr Object, LLVMContext &Context) { std::error_code EC; std::unique_ptr Ret(