Merge pull request #84960 from cachemeifyoucan/eng/cas-fs-for-11638

[CAS] Update swift CAS file system usage after llvm-project change

Author: cachemeifyoucan

include/swift/AST/DiagnosticsFrontend.def

@@ -527,7 +527,7 @@ GROUPED_ERROR(error_invalid_cas_id, CompilationCaching, none, "CAS cannot parse
 GROUPED_ERROR(error_cas, CompilationCaching, none, "CAS error encountered during %0: %1", (StringRef, StringRef))
 GROUPED_ERROR(error_cas_fs_creation, CompilationCaching, none, "cannot create CAS filesystem: %0", (StringRef))
 GROUPED_ERROR(error_cache_key_creation, CompilationCaching, none, "cannot create cache key for compilation %0: %1", (StringRef, StringRef))
-GROUPED_ERROR(error_cas_file_ref, CompilationCaching, none, "cannot load file %0 from CAS filesystem", (StringRef))
+GROUPED_ERROR(error_cas_file_ref, CompilationCaching, none, "cannot load file %0 from CAS filesystem: %1", (StringRef, StringRef))
 GROUPED_ERROR(error_cas_conflict_options, CompilationCaching, none, "cannot setup CAS due to conflicting '-cas-*' options", ())
 GROUPED_ERROR(error_cas_initialization, CompilationCaching, none, "CAS cannot be initialized from the specified '-cas-*' options: %0", (StringRef))
 GROUPED_ERROR(error_cas_malformed_input, CompilationCaching, none, "CAS input '%0' is malformed: %1", (StringRef, StringRef))

include/swift/DependencyScan/ModuleDependencyScanner.h

@@ -17,6 +17,7 @@
 #include "swift/Serialization/ScanningLoaders.h"
 #include "clang/Tooling/DependencyScanning/DependencyScanningTool.h"
 #include "llvm/CAS/CASReference.h"
+#include "llvm/CAS/CASFileSystem.h"
 #include "llvm/Support/ThreadPool.h"
 
 namespace swift {
@@ -249,7 +250,7 @@ class ModuleDependencyScanner {
     return *CAS;
   }
 
-  llvm::vfs::FileSystem &getSharedCachingFS() const {
+  llvm::cas::CASBackedFileSystem &getSharedCachingFS() const {
     assert(CacheFS && "Expect CacheFS available");
     return *CacheFS;
   }
@@ -358,7 +359,7 @@ class ModuleDependencyScanner {
   /// File prefix mapper.
   std::unique_ptr<llvm::PrefixMapper> PrefixMapper;
   /// CAS file system for loading file content.
-  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> CacheFS;
+  llvm::IntrusiveRefCntPtr<llvm::cas::CASBackedFileSystem> CacheFS;
   /// Protect worker access.
   std::mutex WorkersLock;
   /// Count of filesystem queries performed

lib/DependencyScan/ModuleDependencyScanner.cpp

@@ -436,12 +436,14 @@ SwiftDependencyTracker::SwiftDependencyTracker(
     auto status = (*file)->status();
     if (!status)
       return;
-    auto fileRef = (*file)->getObjectRefForContent();
-    if (!fileRef)
+
+    auto casFile = dyn_cast<llvm::cas::CASBackedFile>(*file);
+    if (!casFile)
       return;
 
+    auto fileRef = casFile->getObjectRefForContent();
     std::string realPath = Mapper ? Mapper->mapToString(path) : path.str();
-    CommonFiles.try_emplace(realPath, **fileRef, (size_t)status->getSize());
+    CommonFiles.try_emplace(realPath, fileRef, (size_t)status->getSize());
   };
 
   // Add SDKSetting file.
@@ -493,12 +495,13 @@ void SwiftDependencyTracker::trackFile(const Twine &path) {
   auto status = (*file)->status();
   if (!status)
     return;
-  auto fileRef = (*file)->getObjectRefForContent();
-  if (!fileRef)
+  auto CASFile = dyn_cast<llvm::cas::CASBackedFile>(*file);
+  if (!CASFile)
     return;
+  auto fileRef = CASFile->getObjectRefForContent();
   std::string realPath =
       Mapper ? Mapper->mapToString(path.str()) : path.str();
-  TrackedFiles.try_emplace(realPath, **fileRef, (size_t)status->getSize());
+  TrackedFiles.try_emplace(realPath, fileRef, (size_t)status->getSize());
 }
 
 llvm::Expected<llvm::cas::ObjectProxy>
@@ -557,8 +560,9 @@ ModuleDependencyScanner::ModuleDependencyScanner(
   }
 
   if (CAS)
-    CacheFS = llvm::cas::createCASProvidingFileSystem(
-        CAS, ScanASTContext.SourceMgr.getFileSystem());
+    CacheFS = cast<llvm::cas::CASBackedFileSystem>(
+        llvm::cas::createCASProvidingFileSystem(
+            CAS, ScanASTContext.SourceMgr.getFileSystem()));
 
   // TODO: Make num threads configurable
   for (size_t i = 0; i < NumThreads; ++i)

lib/DependencyScan/ScanDependencies.cpp

@@ -549,22 +549,22 @@ class ExplicitModuleDependencyResolver {
     // action cache. We just use the CASID of the binary module itself as key.
     auto Ref = CASFS.getObjectRefForFileContent(path);
     if (!Ref) {
-      instance.getDiags().diagnose(SourceLoc(), diag::error_cas_file_ref, path);
+      instance.getDiags().diagnose(SourceLoc(), diag::error_cas_file_ref, path,
+                                   toString(Ref.takeError()));
       return true;
     }
-    assert(*Ref && "Binary module should be loaded into CASFS already");
-    depInfo.updateModuleCacheKey(CAS.getID(**Ref).toString());
+    depInfo.updateModuleCacheKey(CAS.getID(*Ref).toString());
 
     swift::cas::CompileJobCacheResult::Builder Builder;
-    Builder.addOutput(file_types::ID::TY_SwiftModuleFile, **Ref);
+    Builder.addOutput(file_types::ID::TY_SwiftModuleFile, *Ref);
     auto Result = Builder.build(CAS);
     if (!Result) {
       instance.getDiags().diagnose(SourceLoc(), diag::error_cas,
                                    "adding binary module dependencies",
                                    toString(Result.takeError()));
       return true;
     }
-    if (auto E = instance.getActionCache().put(CAS.getID(**Ref),
+    if (auto E = instance.getActionCache().put(CAS.getID(*Ref),
                                                CAS.getID(*Result))) {
       instance.getDiags().diagnose(
           SourceLoc(), diag::error_cas,

lib/Frontend/CachedDiagnostics.cpp

@@ -30,6 +30,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/TinyPtrVector.h"
+#include "llvm/CAS/CASFileSystem.h"
 #include "llvm/CAS/ObjectStore.h"
 #include "llvm/Support/Compression.h"
 #include "llvm/Support/Debug.h"
@@ -643,13 +644,13 @@ DiagnosticSerializer::serializeEmittedDiagnostics(llvm::raw_ostream &os) {
     if (!File.Content.empty() || !File.ContentCASID.empty())
       continue;
 
-    auto Ref =
-        SrcMgr.getFileSystem()->getObjectRefForFileContent(File.FileName);
-    if (!Ref)
-      return llvm::createFileError(File.FileName, Ref.getError());
+    if (auto CASFS =
+            dyn_cast<llvm::cas::CASBackedFileSystem>(SrcMgr.getFileSystem())) {
+      auto Ref = CASFS->getObjectRefForFileContent(File.FileName);
+      if (!Ref)
+        return Ref.takeError();
 
-    if (*Ref) {
-      File.ContentCASID = CAS.getID(**Ref).toString();
+      File.ContentCASID = CAS.getID(*Ref).toString();
       continue;
     }