From 30f37f5fc426824899632e2a329adaeccddf3065 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. llvm-svn: 212301 --- llvm/include/llvm/Object/IRObjectFile.h | 4 ++++ llvm/include/llvm/Object/SymbolicFile.h | 4 ---- llvm/lib/Object/IRObjectFile.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/include/llvm/Object/IRObjectFile.h b/llvm/include/llvm/Object/IRObjectFile.h index 2ce9c95..bc69de4 100644 --- a/llvm/include/llvm/Object/IRObjectFile.h +++ b/llvm/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/llvm/include/llvm/Object/SymbolicFile.h b/llvm/include/llvm/Object/SymbolicFile.h index e48bf37..77eef4a5 100644 --- a/llvm/include/llvm/Object/SymbolicFile.h +++ b/llvm/include/llvm/Object/SymbolicFile.h @@ -143,10 +143,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/llvm/lib/Object/IRObjectFile.cpp b/llvm/lib/Object/IRObjectFile.cpp index 27b6d20..5039405 100644 --- a/llvm/lib/Object/IRObjectFile.cpp +++ b/llvm/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( -- 2.7.4