aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2020-02-10 07:06:45 -0800
committerBill Wendling <isanbard@gmail.com>2020-02-10 07:07:40 -0800
commitc55cf4afa9161bb4413b7ca9933d553327f5f069 (patch)
treee4917b94d3e0be14dc470fb2a5d417f2f75acca6 /llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
parent5ad62d3b7f7e75df776a4524bda0c9a1a9952a4e (diff)
downloadllvm-c55cf4afa9161bb4413b7ca9933d553327f5f069.zip
llvm-c55cf4afa9161bb4413b7ca9933d553327f5f069.tar.gz
llvm-c55cf4afa9161bb4413b7ca9933d553327f5f069.tar.bz2
Revert "Remove redundant "std::move"s in return statements"
The build failed with error: call to deleted constructor of 'llvm::Error' errors. This reverts commit 1c2241a7936bf85aa68aef94bd40c3ba77d8ddf2.
Diffstat (limited to 'llvm/lib/ProfileData/Coverage/CoverageMapping.cpp')
-rw-r--r--llvm/lib/ProfileData/Coverage/CoverageMapping.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
index 6509afa..9d39b7c 100644
--- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
+++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -284,14 +284,14 @@ Expected<std::unique_ptr<CoverageMapping>> CoverageMapping::load(
for (const auto &CoverageReader : CoverageReaders) {
for (auto RecordOrErr : *CoverageReader) {
if (Error E = RecordOrErr.takeError())
- return E;
+ return std::move(E);
const auto &Record = *RecordOrErr;
if (Error E = Coverage->loadFunctionRecord(Record, ProfileReader))
- return E;
+ return std::move(E);
}
}
- return Coverage;
+ return std::move(Coverage);
}
// If E is a no_data_found error, returns success. Otherwise returns E.
@@ -309,7 +309,7 @@ CoverageMapping::load(ArrayRef<StringRef> ObjectFilenames,
StringRef ProfileFilename, ArrayRef<StringRef> Arches) {
auto ProfileReaderOrErr = IndexedInstrProfReader::create(ProfileFilename);
if (Error E = ProfileReaderOrErr.takeError())
- return E;
+ return std::move(E);
auto ProfileReader = std::move(ProfileReaderOrErr.get());
SmallVector<std::unique_ptr<CoverageMappingReader>, 4> Readers;
@@ -326,7 +326,7 @@ CoverageMapping::load(ArrayRef<StringRef> ObjectFilenames,
if (Error E = CoverageReadersOrErr.takeError()) {
E = handleMaybeNoDataFoundError(std::move(E));
if (E)
- return E;
+ return std::move(E);
// E == success (originally a no_data_found error).
continue;
}