diff options
author | Bill Wendling <isanbard@gmail.com> | 2020-02-10 07:06:45 -0800 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2020-02-10 07:07:40 -0800 |
commit | c55cf4afa9161bb4413b7ca9933d553327f5f069 (patch) | |
tree | e4917b94d3e0be14dc470fb2a5d417f2f75acca6 /llvm/lib/Object/Archive.cpp | |
parent | 5ad62d3b7f7e75df776a4524bda0c9a1a9952a4e (diff) | |
download | llvm-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/Object/Archive.cpp')
-rw-r--r-- | llvm/lib/Object/Archive.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp index 4f7cea8..17d5eec 100644 --- a/llvm/lib/Object/Archive.cpp +++ b/llvm/lib/Object/Archive.cpp @@ -481,7 +481,7 @@ Expected<Archive::Child> Archive::Child::getNext() const { Error Err = Error::success(); Child Ret(Parent, NextLoc, &Err); if (Err) - return Err; + return std::move(Err); return Ret; } @@ -531,8 +531,8 @@ Expected<std::unique_ptr<Archive>> Archive::create(MemoryBufferRef Source) { Error Err = Error::success(); std::unique_ptr<Archive> Ret(new Archive(Source, Err)); if (Err) - return Err; - return Ret; + return std::move(Err); + return std::move(Ret); } void Archive::setFirstRegular(const Child &C) { @@ -852,7 +852,7 @@ Expected<Archive::Child> Archive::Symbol::getMember() const { Error Err = Error::success(); Child C(Parent, Loc, &Err); if (Err) - return Err; + return std::move(Err); return C; } |