From 4b9ae52ac1b936cefa2a9ec4b9b7db6a103182ca Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 21 Jul 2014 16:26:24 +0000 Subject: Correct the ownership passing semantics of object::createBinary and make them explicit in the type system. createBinary documented that it destroyed the parameter in error cases, though by observation it does not. By passing the unique_ptr by value rather than lvalue reference, callers are now explicit about passing ownership and the function implements the documented contract. Remove the explicit documentation, since now the behavior cannot be anything other than what was documented, so it's redundant. Also drops a unique_ptr::release in llvm-nm that was always run on a null unique_ptr anyway. llvm-svn: 213557 --- llvm/lib/Object/Binary.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Object/Binary.cpp') diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp index 9f6a68556f9..552d5db89c5 100644 --- a/llvm/lib/Object/Binary.cpp +++ b/llvm/lib/Object/Binary.cpp @@ -38,7 +38,7 @@ StringRef Binary::getFileName() const { return Data->getBufferIdentifier(); } -ErrorOr object::createBinary(std::unique_ptr &Buffer, +ErrorOr object::createBinary(std::unique_ptr Buffer, LLVMContext *Context) { sys::fs::file_magic Type = sys::fs::identify_magic(Buffer->getBuffer()); @@ -79,5 +79,5 @@ ErrorOr object::createBinary(StringRef Path) { MemoryBuffer::getFileOrSTDIN(Path); if (std::error_code EC = FileOrErr.getError()) return EC; - return createBinary(FileOrErr.get()); + return createBinary(std::move(*FileOrErr)); } -- cgit v1.2.3