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/ArchiveWriter.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/ArchiveWriter.cpp')
-rw-r--r-- | llvm/lib/Object/ArchiveWriter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Object/ArchiveWriter.cpp b/llvm/lib/Object/ArchiveWriter.cpp index 7af798e..13dafb5 100644 --- a/llvm/lib/Object/ArchiveWriter.cpp +++ b/llvm/lib/Object/ArchiveWriter.cpp @@ -70,7 +70,7 @@ NewArchiveMember::getOldMember(const object::Archive::Child &OldMember, return AccessModeOrErr.takeError(); M.Perms = AccessModeOrErr.get(); } - return M; + return std::move(M); } Expected<NewArchiveMember> NewArchiveMember::getFile(StringRef FileName, @@ -109,7 +109,7 @@ Expected<NewArchiveMember> NewArchiveMember::getFile(StringRef FileName, M.GID = Status.getGroup(); M.Perms = Status.permissions(); } - return M; + return std::move(M); } template <typename T> @@ -379,7 +379,7 @@ getSymbols(MemoryBufferRef Buf, raw_ostream &SymNames, bool &HasObject) { continue; Ret.push_back(SymNames.tell()); if (Error E = S.printName(SymNames)) - return E; + return std::move(E); SymNames << '\0'; } return Ret; @@ -492,7 +492,7 @@ computeMemberData(raw_ostream &StringTable, raw_ostream &SymNames, Expected<std::vector<unsigned>> Symbols = getSymbols(Buf, SymNames, HasObject); if (auto E = Symbols.takeError()) - return E; + return std::move(E); Pos += Header.size() + Data.size() + Padding.size(); Ret.push_back({std::move(*Symbols), std::move(Header), Data, Padding}); |