InstrProf: Use move semantics with unique_ptr

<rdar://problem/15950346>

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

diff --git a/include/llvm/ProfileData/InstrProfReader.h b/include/llvm/ProfileData/InstrProfReader.h
index 3cfbf805a5fd12cbbc1b7241995b14f481870044..d236fecdb63d360bf3d5cbcc564faab18dcee741 100644 (file)
--- a/include/llvm/ProfileData/InstrProfReader.h
+++ b/include/llvm/ProfileData/InstrProfReader.h
@@ -113,8 +113,8 @@ private:
   TextInstrProfReader &operator=(const TextInstrProfReader &)
     LLVM_DELETED_FUNCTION;
 public:
-  TextInstrProfReader(std::unique_ptr<MemoryBuffer> &DataBuffer_)
-      : DataBuffer(DataBuffer_.release()), Line(*DataBuffer, '#') {}
+  TextInstrProfReader(std::unique_ptr<MemoryBuffer> DataBuffer_)
+      : DataBuffer(std::move(DataBuffer_)), Line(*DataBuffer, '#') {}
 
   /// Read the header.
   error_code readHeader() override { return success(); }
@@ -161,7 +161,7 @@ private:
   RawInstrProfReader &operator=(const TextInstrProfReader &)
     LLVM_DELETED_FUNCTION;
 public:
-  RawInstrProfReader(std::unique_ptr<MemoryBuffer> &DataBuffer);
+  RawInstrProfReader(std::unique_ptr<MemoryBuffer> DataBuffer);
 
   static bool hasFormat(const MemoryBuffer &DataBuffer);
   error_code readHeader() override;

diff --git a/lib/ProfileData/InstrProfReader.cpp b/lib/ProfileData/InstrProfReader.cpp
index c317a457bb6d898fc508307855bc83754799e94d..a95d9bc3b08a709d23435101b74ad4c363f3f1b1 100644 (file)
--- a/lib/ProfileData/InstrProfReader.cpp
+++ b/lib/ProfileData/InstrProfReader.cpp
@@ -31,9 +31,9 @@ error_code InstrProfReader::create(std::string Path,
 
   // Create the reader.
   if (RawInstrProfReader::hasFormat(*Buffer))
-    Result.reset(new RawInstrProfReader(Buffer));
+    Result.reset(new RawInstrProfReader(std::move(Buffer)));
   else
-    Result.reset(new TextInstrProfReader(Buffer));
+    Result.reset(new TextInstrProfReader(std::move(Buffer)));
 
   // Read the header and return the result.
   return Result->readHeader();
@@ -85,8 +85,8 @@ error_code TextInstrProfReader::readNextRecord(InstrProfRecord &Record) {
   return success();
 }
 
-RawInstrProfReader::RawInstrProfReader(std::unique_ptr<MemoryBuffer> &DataBuffer)
-    : DataBuffer(DataBuffer.release()) { }
+RawInstrProfReader::RawInstrProfReader(std::unique_ptr<MemoryBuffer> DataBuffer)
+    : DataBuffer(std::move(DataBuffer)) { }
 
 static uint64_t getRawMagic() {
   return