aboutsummaryrefslogtreecommitdiff
path: root/llvm/tools/llvm-objcopy/ELF/Object.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/tools/llvm-objcopy/ELF/Object.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/tools/llvm-objcopy/ELF/Object.cpp')
-rw-r--r--llvm/tools/llvm-objcopy/ELF/Object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-objcopy/ELF/Object.cpp b/llvm/tools/llvm-objcopy/ELF/Object.cpp
index 691034f..14ac7bb 100644
--- a/llvm/tools/llvm-objcopy/ELF/Object.cpp
+++ b/llvm/tools/llvm-objcopy/ELF/Object.cpp
@@ -277,7 +277,7 @@ Expected<IHexRecord> IHexRecord::parse(StringRef Line) {
"line is too short: %zu chars.", Line.size());
if (Error E = checkChars(Line))
- return E;
+ return std::move(E);
IHexRecord Rec;
size_t DataLen = checkedGetHex<uint8_t>(Line.substr(1, 2));
@@ -293,7 +293,7 @@ Expected<IHexRecord> IHexRecord::parse(StringRef Line) {
if (getChecksum(Line.drop_front(1)) != 0)
return createStringError(errc::invalid_argument, "incorrect checksum.");
if (Error E = checkRecord(Rec))
- return E;
+ return std::move(E);
return Rec;
}
@@ -1665,7 +1665,7 @@ Expected<std::vector<IHexRecord>> IHexReader::parse() const {
if (!HasSections)
return parseError(-1U, "no sections");
- return Records;
+ return std::move(Records);
}
std::unique_ptr<Object> IHexReader::create(bool /*EnsureSymtab*/) const {