diff --git a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h
index 43656c8ded2298..db02e1b73c6aff 100644
--- a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h
+++ b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h
@@ -287,7 +287,7 @@ llvm::Expected<std::vector<Diagnostic>> diagnoseFunction(
                 llvm::move(EltDiagnostics, std::back_inserter(Diagnostics));
               })
               .takeError())
-    return Err;
+    return std::move(Err);
 
   if (Solver->reachedLimit())
     return llvm::createStringError(llvm::errc::interrupted,
diff --git a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
index 171884afe8f4bf..3394c9f0299e41 100644
--- a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
+++ b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt
@@ -18,6 +18,7 @@ add_clang_library(clangAnalysisFlowSensitive
   LINK_LIBS
   clangAnalysis
   clangAST
+  clangASTMatchers
   clangBasic
   clangLex
   )