Correct the ownership passing semantics of object::createBinary and make them explici...

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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213557 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/Binary.h b/include/llvm/Object/Binary.h
index 9be2fbe08371bb46eab3ffebe21d19778774ca69..91984cb527156940d9d47b5e2418373ea056fc1d 100644 (file)
--- a/include/llvm/Object/Binary.h
+++ b/include/llvm/Object/Binary.h
@@ -125,10 +125,8 @@ public:
 
 /// @brief Create a Binary from Source, autodetecting the file type.
 ///
-/// @param Source The data to create the Binary from. Ownership is transferred
-///        to the Binary if successful. If an error is returned,
-///        Source is destroyed by createBinary before returning.
-ErrorOr<Binary *> createBinary(std::unique_ptr<MemoryBuffer> &Source,
+/// @param Source The data to create the Binary from.
+ErrorOr<Binary *> createBinary(std::unique_ptr<MemoryBuffer> Source,
                                LLVMContext *Context = nullptr);
 
 ErrorOr<Binary *> createBinary(StringRef Path);

diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index 3c683408969d5b3ba57f8077bef1bae705210211..e32bdd5c5bece0cf716ec684b0dbcb1a5f3259f1 100644 (file)
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -181,7 +181,7 @@ Archive::Child::getAsBinary(LLVMContext *Context) const {
   if (std::error_code EC = BuffOrErr.getError())
     return EC;
 
-  return createBinary(*BuffOrErr, Context);
+  return createBinary(std::move(*BuffOrErr), Context);
 }
 
 ErrorOr<Archive *> Archive::create(std::unique_ptr<MemoryBuffer> Source) {

diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp
index 9f6a68556f9a845881379d6f78e508d9092c4505..552d5db89c5499dbbf798f3f844c1bf57c1dfa15 100644 (file)
--- a/lib/Object/Binary.cpp
+++ b/lib/Object/Binary.cpp
@@ -38,7 +38,7 @@ StringRef Binary::getFileName() const {
   return Data->getBufferIdentifier();
 }
 
-ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> &Buffer,
+ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> Buffer,
                                        LLVMContext *Context) {
   sys::fs::file_magic Type = sys::fs::identify_magic(Buffer->getBuffer());
 
@@ -79,5 +79,5 @@ ErrorOr<Binary *> 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));
 }

diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index d021a0d341f6126f8914226682324d97dcede849..15304c40b887d036858d78d9d1202c8f526ab113 100644 (file)
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -993,13 +993,12 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (error(BufferOrErr.getError(), Filename))
     return;
-  std::unique_ptr<MemoryBuffer> Buffer = std::move(BufferOrErr.get());
 
   LLVMContext &Context = getGlobalContext();
-  ErrorOr<Binary *> BinaryOrErr = createBinary(Buffer, &Context);
+  ErrorOr<Binary *> BinaryOrErr =
+      createBinary(std::move(*BufferOrErr), &Context);
   if (error(BinaryOrErr.getError(), Filename))
     return;
-  Buffer.release();
   std::unique_ptr<Binary> Bin(BinaryOrErr.get());
 
   if (Archive *A = dyn_cast<Archive>(Bin.get())) {