[clang] 28e8ade - [clang] Fix build after 537344fc

Jan Svoboda via cfe-commits cfe-commits at lists.llvm.org
Fri Oct 6 15:08:38 PDT 2023


Author: Jan Svoboda
Date: 2023-10-06T15:08:06-07:00
New Revision: 28e8ade041d04ba1847d7b05f56b0b2632471169

URL: https://github.com/llvm/llvm-project/commit/28e8ade041d04ba1847d7b05f56b0b2632471169
DIFF: https://github.com/llvm/llvm-project/commit/28e8ade041d04ba1847d7b05f56b0b2632471169.diff

LOG: [clang] Fix build after 537344fc

This fixes the following build failure on lldb-x86_64-debian:

/llvm-project/clang/lib/Serialization/ASTReader.cpp:1453:12: error: call to deleted constructor of 'llvm::Error'
    return Err;
           ^~~
/llvm-project/llvm/include/llvm/Support/Error.h:189:3: note: 'Error' has been explicitly marked deleted here
  Error(const Error &Other) = delete;
  ^
/llvm-project/llvm/include/llvm/Support/Error.h:496:18: note: passing argument to parameter 'Err' here
  Expected(Error Err)
                 ^

Added: 
    

Modified: 
    clang/lib/Serialization/ASTReader.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 9545e6a99341eff..aae9cbb0f52fa57 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -1450,7 +1450,7 @@ ASTReader::readSLocOffset(ModuleFile *F, unsigned Index) {
   SavedStreamPosition SavedPosition(Cursor);
   if (llvm::Error Err = Cursor.JumpToBit(F->SLocEntryOffsetsBase +
                                          F->SLocEntryOffsets[Index]))
-    return Err;
+    return std::move(Err);
 
   Expected<llvm::BitstreamEntry> MaybeEntry = Cursor.advance();
   if (!MaybeEntry)


        


More information about the cfe-commits mailing list