diff --git a/llvm/include/llvm/Object/ObjectFile.h b/llvm/include/llvm/Object/ObjectFile.h index 806de34e76a8..7533d625b125 100644 --- a/llvm/include/llvm/Object/ObjectFile.h +++ b/llvm/include/llvm/Object/ObjectFile.h @@ -378,9 +378,13 @@ public: /// return true. /// @brief Create ObjectFile from path. static ErrorOr createObjectFile(StringRef ObjectPath); - static ErrorOr - createObjectFile(MemoryBuffer *Object, bool BufferOwned = true, - sys::fs::file_magic Type = sys::fs::file_magic::unknown); + static ErrorOr createObjectFile(MemoryBuffer *Object, + bool BufferOwned, + sys::fs::file_magic Type); + static ErrorOr createObjectFile(MemoryBuffer *Object) { + return createObjectFile(Object, true, sys::fs::file_magic::unknown); + } + static inline bool classof(const Binary *v) { return v->isObject(); diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp index a2f4ec9a0b8f..63898d277f35 100644 --- a/llvm/lib/Object/Binary.cpp +++ b/llvm/lib/Object/Binary.cpp @@ -67,7 +67,7 @@ ErrorOr object::createBinary(MemoryBuffer *Source, case sys::fs::file_magic::coff_object: case sys::fs::file_magic::coff_import_library: case sys::fs::file_magic::pecoff_executable: - return ObjectFile::createObjectFile(scopedSource.take(), Type); + return ObjectFile::createObjectFile(scopedSource.take(), true, Type); case sys::fs::file_magic::macho_universal_binary: return MachOUniversalBinary::create(scopedSource.take()); case sys::fs::file_magic::unknown: diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 944cce408fa0..8917cd3801f8 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -703,7 +703,8 @@ static void writeSymbolTable( I != E; ++I, ++MemberNum) { MemoryBuffer *MemberBuffer = Buffers[MemberNum]; ErrorOr ObjOrErr = - object::ObjectFile::createObjectFile(MemberBuffer, false); + object::ObjectFile::createObjectFile(MemberBuffer, false, + sys::fs::file_magic::unknown); if (!ObjOrErr) continue; // FIXME: check only for "not an object file" errors. object::ObjectFile *Obj = ObjOrErr.get();