From 07dc57c38ac3b933860380c0d8c3fc7b9a830662 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 29 Jan 2014 00:02:26 +0000 Subject: [PATCH] Make createObjectFile's signature a bit less error prone. This will be better with c++11, but right now file_magic converts to bool, which makes the api really easy to misuse. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200357 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/ObjectFile.h | 10 +++++++--- lib/Object/Binary.cpp | 2 +- tools/llvm-ar/llvm-ar.cpp | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index 806de34e76a..7533d625b12 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/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/lib/Object/Binary.cpp b/lib/Object/Binary.cpp index a2f4ec9a0b8..63898d277f3 100644 --- a/lib/Object/Binary.cpp +++ b/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/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 944cce408fa..8917cd3801f 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/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(); -- 2.34.1