Merge pull request #6332 from akyrtzi/pr/stable/couple-picks

[stable] A couple of cherry-picks from next related to CAS/caching

Author: akyrtzi

clang/tools/driver/cc1_main.cpp

@@ -244,7 +244,7 @@ class CachingOutputs {
   clang::cas::CompileJobCacheResult::Builder CachedResultBuilder;
   std::string OutputFile;
   std::string DependenciesFile;
-  std::unique_ptr<cas::CachingDiagnosticsProcessor> DiagProcessor;
+  std::unique_ptr<clang::cas::CachingDiagnosticsProcessor> DiagProcessor;
 };
 
 /// Store and retrieve compilation artifacts using \p llvm::cas::ObjectStore and
@@ -551,8 +551,8 @@ CachingOutputs::CachingOutputs(CompilerInstance &Clang,
   OutputFile = fixupRelativePath(FrontendOpts.OutputFile, FM);
   DependenciesFile =
       fixupRelativePath(Invocation.getDependencyOutputOpts().OutputFile, FM);
-  DiagProcessor =
-      std::make_unique<cas::CachingDiagnosticsProcessor>(PrefixMapper, FM);
+  DiagProcessor = std::make_unique<clang::cas::CachingDiagnosticsProcessor>(
+      PrefixMapper, FM);
 }
 
 Expected<bool> ObjectStoreCachingOutputs::tryReplayCachedResult(

clang/tools/driver/cc1depscan_main.cpp

@@ -848,12 +848,15 @@ void ScanServer::start(bool Exclusive) {
 
   if (cc1depscand::bindToSocket(BasePath, ListenSocket))
     reportError(StringRef() + "cannot bind to socket" + ": " + strerror(errno));
+
+  unsigned MaxBacklog =
+      llvm::hardware_concurrency().compute_thread_count() * 16;
+  if (::listen(ListenSocket, MaxBacklog))
+    reportError("cannot listen to socket");
 }
 
 int ScanServer::listen() {
   llvm::ThreadPool Pool;
-  if (::listen(ListenSocket, /*MaxBacklog=*/Pool.getThreadCount() * 16))
-    reportError("cannot listen to socket");
 
   DiagnosticsEngine Diags(new DiagnosticIDs(), new DiagnosticOptions());
   CASOptions CASOpts;