diff --git a/llvm/include/llvm/Object/ELF.h b/llvm/include/llvm/Object/ELF.h --- a/llvm/include/llvm/Object/ELF.h +++ b/llvm/include/llvm/Object/ELF.h @@ -81,10 +81,6 @@ (uint8_t)Object[ELF::EI_DATA]); } -static inline Error createError(const Twine &Err) { - return make_error(Err, object_error::parse_failed); -} - enum PPCInstrMasks : uint64_t { PADDI_R12_NO_DISP = 0x0610000039800000, ADDIS_R12_TO_R2_NO_DISP = 0x3D820000, diff --git a/llvm/include/llvm/Object/Error.h b/llvm/include/llvm/Object/Error.h --- a/llvm/include/llvm/Object/Error.h +++ b/llvm/include/llvm/Object/Error.h @@ -82,6 +82,10 @@ /// error() function needs to called on the llvm::Error. Error isNotObjectErrorInvalidFileType(llvm::Error Err); +inline Error createError(const Twine &Err) { + return make_error(Err, object_error::parse_failed); +} + } // end namespace object. } // end namespace llvm. diff --git a/llvm/lib/Object/COFFModuleDefinition.cpp b/llvm/lib/Object/COFFModuleDefinition.cpp --- a/llvm/lib/Object/COFFModuleDefinition.cpp +++ b/llvm/lib/Object/COFFModuleDefinition.cpp @@ -80,11 +80,6 @@ (!MingwDef && Sym.contains('@')); } -static Error createError(const Twine &Err) { - return make_error(StringRef(Err.str()), - object_error::parse_failed); -} - class Lexer { public: Lexer(StringRef S) : Buf(S) {} diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp --- a/llvm/lib/Object/XCOFFObjectFile.cpp +++ b/llvm/lib/Object/XCOFFObjectFile.cpp @@ -43,10 +43,6 @@ Offset); } -static Error createError(const Twine &Err) { - return make_error(Err, object_error::parse_failed); -} - template static const T *viewAs(uintptr_t in) { return reinterpret_cast(in); }