From cb9ea31868aa4775d6ec9ca526bd705b3a053bca Mon Sep 17 00:00:00 2001
From: Jan Svoboda <jan_svoboda@apple.com>
Date: Thu, 25 Apr 2024 10:18:52 -0700
Subject: [PATCH] [clang][cas] Move Error into Expected

---
 clang/include/clang/CAS/IncludeTree.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/include/clang/CAS/IncludeTree.h b/clang/include/clang/CAS/IncludeTree.h
index 49e87b9dc0e4c..9655923b11270 100644
--- a/clang/include/clang/CAS/IncludeTree.h
+++ b/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);
   }