Merge commit '9ad96fab8e2f' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

clang/include/clang/CAS/IncludeTree.h

@@ -378,14 +378,14 @@ class IncludeTree::SpuriousImport
   Expected<ModuleImport> getModuleImport() {
     std::optional<ObjectProxy> Proxy;
     if (llvm::Error Err = getCAS().getProxy(getReference(0)).moveInto(Proxy))
-      return Err;
+      return std::move(Err);
     return ModuleImport(*Proxy);
   }
 
   Expected<IncludeTree> getIncludeTree() {
     std::optional<ObjectProxy> Proxy;
     if (llvm::Error Err = getCAS().getProxy(getReference(1)).moveInto(Proxy))
-      return Err;
+      return std::move(Err);
     return IncludeTree(*Proxy);
   }