From c55cf4afa9161bb4413b7ca9933d553327f5f069 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 10 Feb 2020 07:06:45 -0800 Subject: 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. --- llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp') diff --git a/llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp b/llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp index 0bf62f2..e70caa8 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp @@ -415,41 +415,41 @@ static Expected ReadSignature(BitstreamCursor &Stream) { char Signature[6]; if (Error Err = tryRead(Signature[0], 8)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[1], 8)) - return Err; + return std::move(Err); // Autodetect the file contents, if it is one we know. if (Signature[0] == 'C' && Signature[1] == 'P') { if (Error Err = tryRead(Signature[2], 8)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[3], 8)) - return Err; + return std::move(Err); if (Signature[2] == 'C' && Signature[3] == 'H') return ClangSerializedASTBitstream; } else if (Signature[0] == 'D' && Signature[1] == 'I') { if (Error Err = tryRead(Signature[2], 8)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[3], 8)) - return Err; + return std::move(Err); if (Signature[2] == 'A' && Signature[3] == 'G') return ClangSerializedDiagnosticsBitstream; } else if (Signature[0] == 'R' && Signature[1] == 'M') { if (Error Err = tryRead(Signature[2], 8)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[3], 8)) - return Err; + return std::move(Err); if (Signature[2] == 'R' && Signature[3] == 'K') return LLVMBitstreamRemarks; } else { if (Error Err = tryRead(Signature[2], 4)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[3], 4)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[4], 4)) - return Err; + return std::move(Err); if (Error Err = tryRead(Signature[5], 4)) - return Err; + return std::move(Err); if (Signature[0] == 'B' && Signature[1] == 'C' && Signature[2] == 0x0 && Signature[3] == 0xC && Signature[4] == 0xE && Signature[5] == 0xD) return LLVMIRBitstream; -- cgit v1.1