[llvm] r363342 - [Coverage] Speculative fix for r363325 for an older compiler

Vedant Kumar via llvm-commits llvm-commits at lists.llvm.org
Thu Jun 13 17:03:22 PDT 2019


Author: vedantk
Date: Thu Jun 13 17:03:22 2019
New Revision: 363342

URL: http://llvm.org/viewvc/llvm-project?rev=363342&view=rev
Log:
[Coverage] Speculative fix for r363325 for an older compiler

It looks like an older version of gcc can't figure out that it needs to
move a unique_ptr while implicitly constructing an Expected object.

Modified:
    llvm/trunk/lib/ProfileData/Coverage/CoverageMappingReader.cpp

Modified: llvm/trunk/lib/ProfileData/Coverage/CoverageMappingReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/Coverage/CoverageMappingReader.cpp?rev=363342&r1=363341&r2=363342&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/Coverage/CoverageMappingReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/Coverage/CoverageMappingReader.cpp Thu Jun 13 17:03:22 2019
@@ -616,7 +616,7 @@ BinaryCoverageReader::createCoverageRead
       return std::move(E);
   } else
     return make_error<CoverageMapError>(coveragemap_error::malformed);
-  return Reader;
+  return std::move(Reader);
 }
 
 static Expected<std::unique_ptr<BinaryCoverageReader>>
@@ -741,7 +741,7 @@ BinaryCoverageReader::create(
     if (!ReaderOrErr)
       return ReaderOrErr.takeError();
     Readers.push_back(std::move(ReaderOrErr.get()));
-    return Readers;
+    return std::move(Readers);
   }
 
   auto BinOrErr = createBinary(ObjectBuffer);
@@ -795,14 +795,14 @@ BinaryCoverageReader::create(
       for (auto &Buffer : Ar->takeThinBuffers())
         ObjectFileBuffers.push_back(std::move(Buffer));
 
-    return Readers;
+    return std::move(Readers);
   }
 
   auto ReaderOrErr = loadBinaryFormat(std::move(Bin), Arch);
   if (!ReaderOrErr)
     return ReaderOrErr.takeError();
   Readers.push_back(std::move(ReaderOrErr.get()));
-  return Readers;
+  return std::move(Readers);
 }
 
 Error BinaryCoverageReader::readNextRecord(CoverageMappingRecord &Record) {




More information about the llvm-commits mailing list