Remove Clang CASFS (swiftlang#86973)

Author: hjyamauchi

include/swift-c/DependencyScan/DependencyScan.h

@@ -339,6 +339,7 @@ swiftscan_clang_detail_get_command_line(swiftscan_module_details_t details);
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_clang_detail_get_captured_pcm_args(swiftscan_module_details_t details);
 
+// DEPRECATED
 SWIFTSCAN_PUBLIC swiftscan_string_ref_t
 swiftscan_clang_detail_get_cas_fs_root_id(swiftscan_module_details_t details);
 

include/swift/AST/ModuleDependencies.h

@@ -548,9 +548,6 @@ class ClangModuleDependencyStorage : public ModuleDependencyInfoStorageBase {
   /// The file dependencies
   const std::vector<std::string> fileDependencies;
 
-  /// CASID for the Root of CASFS. Empty if CAS is not used.
-  std::string CASFileSystemRootID;
-
   /// CASID for the Root of ClangIncludeTree. Empty if not used.
   std::string CASClangIncludeTreeRootID;
 
@@ -562,7 +559,6 @@ class ClangModuleDependencyStorage : public ModuleDependencyInfoStorageBase {
                                ArrayRef<std::string> buildCommandLine,
                                ArrayRef<std::string> fileDependencies,
                                ArrayRef<LinkLibrary> linkLibraries,
-                               StringRef CASFileSystemRootID,
                                StringRef clangIncludeTreeRoot,
                                StringRef moduleCacheKey, bool IsSystem)
       : ModuleDependencyInfoStorageBase(ModuleDependencyKind::Clang,
@@ -571,7 +567,6 @@ class ClangModuleDependencyStorage : public ModuleDependencyInfoStorageBase {
         pcmOutputPath(pcmOutputPath), mappedPCMPath(mappedPCMPath),
         moduleMapFile(moduleMapFile), contextHash(contextHash),
         buildCommandLine(buildCommandLine), fileDependencies(fileDependencies),
-        CASFileSystemRootID(CASFileSystemRootID),
         CASClangIncludeTreeRootID(clangIncludeTreeRoot), IsSystem(IsSystem) {}
 
   ModuleDependencyInfoStorageBase *clone() const override {
@@ -679,12 +674,12 @@ class ModuleDependencyInfo {
       StringRef pcmOutputPath, StringRef mappedPCMPath, StringRef moduleMapFile,
       StringRef contextHash, ArrayRef<std::string> nonPathCommandLine,
       ArrayRef<std::string> fileDependencies,
-      ArrayRef<LinkLibrary> linkLibraries, StringRef CASFileSystemRootID,
-      StringRef clangIncludeTreeRoot, StringRef moduleCacheKey, bool IsSystem) {
+      ArrayRef<LinkLibrary> linkLibraries, StringRef clangIncludeTreeRoot,
+      StringRef moduleCacheKey, bool IsSystem) {
     return ModuleDependencyInfo(std::make_unique<ClangModuleDependencyStorage>(
         pcmOutputPath, mappedPCMPath, moduleMapFile, contextHash,
         nonPathCommandLine, fileDependencies, linkLibraries,
-        CASFileSystemRootID, clangIncludeTreeRoot, moduleCacheKey, IsSystem));
+        clangIncludeTreeRoot, moduleCacheKey, IsSystem));
   }
 
   /// Retrieve the module-level imports.
@@ -884,9 +879,6 @@ class ModuleDependencyInfo {
     else if (isSwiftSourceModule())
       cast<SwiftSourceModuleDependenciesStorage>(storage.get())
           ->textualModuleDetails.CASFileSystemRootID = rootID;
-    else if (isClangModule())
-      cast<ClangModuleDependencyStorage>(storage.get())->CASFileSystemRootID =
-          rootID;
     else
       llvm_unreachable("Unexpected module dependency kind");
   }

include/swift/DependencyScan/DependencyScanImpl.h

@@ -205,9 +205,6 @@ typedef struct {
   /// Options to the compile command required to build this clang modulemap
   swiftscan_string_set_t *command_line;
 
-  /// The CASID for CASFileSystemRoot
-  swiftscan_string_ref_t cas_fs_root_id;
-
   /// The CASID for CASFileSystemRoot
   swiftscan_string_ref_t clang_include_tree;
 

include/swift/DependencyScan/SerializedModuleDependencyCacheFormat.h

@@ -41,7 +41,7 @@ using llvm::BCVBR;
 const unsigned char MODULE_DEPENDENCY_CACHE_FORMAT_SIGNATURE[] = {'I', 'M', 'D','C'};
 const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MAJOR = 10;
 /// Increment this on every change.
-const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 5;
+const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 6;
 
 /// Various identifiers in this format will rely on having their strings mapped
 /// using this ID.
@@ -293,7 +293,6 @@ using ClangModuleDetailsLayout =
                    ContextHashIDField,        // contextHash
                    FlagIDArrayIDField,        // commandLine
                    FileIDArrayIDField,        // fileDependencies
-                   IdentifierIDField,         // CASFileSystemRootID
                    IdentifierIDField,         // clangIncludeTreeRoot
                    IdentifierIDField,         // moduleCacheKey
                    IsSystemField              // isSystem

lib/AST/ModuleDependencies.cpp

@@ -321,11 +321,6 @@ std::optional<std::string> ModuleDependencyInfo::getCASFSRootID() const {
     Root = swiftSourceStorage->textualModuleDetails.CASFileSystemRootID;
     break;
   }
-  case swift::ModuleDependencyKind::Clang: {
-    auto clangModuleStorage = cast<ClangModuleDependencyStorage>(storage.get());
-    Root = clangModuleStorage->CASFileSystemRootID;
-    break;
-  }
   default:
     return std::nullopt;
   }
@@ -518,11 +513,10 @@ SwiftDependencyScanningService::SwiftDependencyScanningService()
     : Alloc(), Saver(Alloc) {
   ClangScanningService.emplace(
       clang::tooling::dependencies::ScanningMode::DependencyDirectivesScan,
-      clang::tooling::dependencies::ScanningOutputFormat::FullTree,
+      clang::tooling::dependencies::ScanningOutputFormat::Full,
       clang::CASOptions(),
       /* CAS (llvm::cas::ObjectStore) */ nullptr,
       /* Cache (llvm::cas::ActionCache) */ nullptr,
-      /* SharedFS */ nullptr,
       // ScanningOptimizations::Default excludes the current working
       // directory optimization. Clang needs to communicate with
       // the build system to handle the optimization safely.
@@ -656,7 +650,6 @@ bool SwiftDependencyScanningService::setupCachingDependencyScanningService(
       clang::tooling::dependencies::ScanningOutputFormat::FullIncludeTree,
       Instance.getInvocation().getCASOptions().CASOpts,
       Instance.getSharedCASInstance(), Instance.getSharedCacheInstance(),
-      /*CachingOnDiskFileSystem=*/nullptr,
       // The current working directory optimization (off by default)
       // should not impact CAS. We set the optization to all to be
       // consistent with the non-CAS case.

lib/DependencyScan/DependencyScanJSON.cpp

@@ -659,14 +659,9 @@ void writeJSON(llvm::raw_ostream &out,
 
       // Command line.
       writeJSONSingleField(out, "commandLine", clangDeps->command_line, 5,
-                           clangDeps->cas_fs_root_id.length != 0 ||
                            clangDeps->clang_include_tree.length != 0 ||
                            clangDeps->module_cache_key.length != 0);
 
-      if (clangDeps->cas_fs_root_id.length != 0)
-        writeJSONSingleField(out, "casFSRootID", clangDeps->cas_fs_root_id, 5,
-                             clangDeps->clang_include_tree.length != 0 ||
-                             clangDeps->module_cache_key.length != 0);
       if (clangDeps->clang_include_tree.length != 0)
         writeJSONSingleField(out, "clangIncludeTree",
                              clangDeps->clang_include_tree, 5,

lib/DependencyScan/ModuleDependencyCacheSerialization.cpp

@@ -773,14 +773,12 @@ bool ModuleDependenciesCacheDeserializer::readGraph(
       if (!hasCurrentModule)
         llvm::report_fatal_error("Unexpected CLANG_MODULE_DETAILS_NODE record");
       unsigned pcmOutputPathID, mappedPCMPathID, moduleMapPathID, contextHashID,
-          commandLineArrayID, fileDependenciesArrayID,
-          CASFileSystemRootID, clangIncludeTreeRootID, moduleCacheKeyID,
-          isSystem;
+          commandLineArrayID, fileDependenciesArrayID, clangIncludeTreeRootID,
+          moduleCacheKeyID, isSystem;
       ClangModuleDetailsLayout::readRecord(
           Scratch, pcmOutputPathID, mappedPCMPathID, moduleMapPathID,
           contextHashID, commandLineArrayID, fileDependenciesArrayID,
-          CASFileSystemRootID, clangIncludeTreeRootID,
-          moduleCacheKeyID, isSystem);
+          clangIncludeTreeRootID, moduleCacheKeyID, isSystem);
       auto pcmOutputPath = getIdentifier(pcmOutputPathID);
       if (!pcmOutputPath)
         llvm::report_fatal_error("Bad pcm output path");
@@ -799,9 +797,6 @@ bool ModuleDependenciesCacheDeserializer::readGraph(
       auto fileDependencies = getStringArray(fileDependenciesArrayID);
       if (!fileDependencies)
         llvm::report_fatal_error("Bad file dependencies");
-      auto rootFileSystemID = getIdentifier(CASFileSystemRootID);
-      if (!rootFileSystemID)
-        llvm::report_fatal_error("Bad CASFileSystem RootID");
       auto clangIncludeTreeRoot = getIdentifier(clangIncludeTreeRootID);
       if (!clangIncludeTreeRoot)
         llvm::report_fatal_error("Bad clang include tree ID");
@@ -813,7 +808,7 @@ bool ModuleDependenciesCacheDeserializer::readGraph(
       auto moduleDep = ModuleDependencyInfo::forClangModule(
           *pcmOutputPath, *mappedPCMPath, *moduleMapPath, *contextHash,
           *commandLineArgs, *fileDependencies, linkLibraries,
-          *rootFileSystemID, *clangIncludeTreeRoot, *moduleCacheKey, isSystem);
+          *clangIncludeTreeRoot, *moduleCacheKey, isSystem);
       addCommonDependencyInfo(moduleDep);
 
       cache.recordDependency(currentModuleName, std::move(moduleDep));
@@ -1692,7 +1687,6 @@ void ModuleDependenciesCacheSerializer::writeModuleInfo(
                              ModuleIdentifierArrayKind::NonPathCommandLine),
         getIdentifierArrayID(moduleID,
                              ModuleIdentifierArrayKind::FileDependencies),
-        getIdentifier(clangDeps->CASFileSystemRootID),
         getIdentifier(clangDeps->CASClangIncludeTreeRootID),
         getIdentifier(clangDeps->moduleCacheKey), clangDeps->IsSystem);
 
@@ -1982,7 +1976,6 @@ void ModuleDependenciesCacheSerializer::collectStringsAndArrays(
                        clangDeps->buildCommandLine);
         addStringArray(moduleID, ModuleIdentifierArrayKind::FileDependencies,
                        clangDeps->fileDependencies);
-        addIdentifier(clangDeps->CASFileSystemRootID);
         addIdentifier(clangDeps->CASClangIncludeTreeRootID);
         addIdentifier(clangDeps->moduleCacheKey);
         break;

lib/DependencyScan/ModuleDependencyScanner.cpp

@@ -2170,11 +2170,6 @@ ModuleDependencyInfo ModuleDependencyScanner::bridgeClangModuleDependency(
   auto clangArgs = invocation.getCC1CommandLine();
   llvm::for_each(clangArgs, addClangArg);
 
-  // CASFileSystemRootID.
-  std::string RootID = clangModuleDep.CASFileSystemRootID
-                           ? clangModuleDep.CASFileSystemRootID.value()
-                           : "";
-
   std::string IncludeTree =
       clangModuleDep.IncludeTreeID ? *clangModuleDep.IncludeTreeID : "";
 
@@ -2198,7 +2193,7 @@ ModuleDependencyInfo ModuleDependencyScanner::bridgeClangModuleDependency(
   llvm::StringSet<> alreadyAddedModules;
   auto bridgedDependencyInfo = ModuleDependencyInfo::forClangModule(
       pcmPath, mappedPCMPath, clangModuleDep.ClangModuleMapFile,
-      clangModuleDep.ID.ContextHash, swiftArgs, fileDeps, LinkLibraries, RootID,
+      clangModuleDep.ID.ContextHash, swiftArgs, fileDeps, LinkLibraries,
       IncludeTree, /*module-cache-key*/ "", clangModuleDep.IsSystem);
 
   std::vector<ModuleDependencyID> directDependencyIDs;

lib/DependencyScan/ScanDependencies.cpp

@@ -913,7 +913,6 @@ static swiftscan_dependency_graph_t generateFullDependencyGraph(
             create_clone(clangDeps->moduleMapFile.c_str()),
             create_clone(clangDeps->contextHash.c_str()),
             create_set(clangDeps->buildCommandLine),
-            create_clone(clangDeps->CASFileSystemRootID.c_str()),
             create_clone(clangDeps->CASClangIncludeTreeRootID.c_str()),
             create_clone(clangDeps->moduleCacheKey.c_str())};
       }

lib/Tooling/libSwiftScan/libSwiftScan.cpp

@@ -97,7 +97,6 @@ void swiftscan_dependency_info_details_dispose(
     swiftscan_string_dispose(details_impl->clang_details.module_map_path);
     swiftscan_string_dispose(details_impl->clang_details.context_hash);
     swiftscan_string_set_dispose(details_impl->clang_details.command_line);
-    swiftscan_string_dispose(details_impl->clang_details.cas_fs_root_id);
     swiftscan_string_dispose(details_impl->clang_details.module_cache_key);
     break;
   }
@@ -463,7 +462,7 @@ swiftscan_clang_detail_get_command_line(swiftscan_module_details_t details) {
 
 swiftscan_string_ref_t
 swiftscan_clang_detail_get_cas_fs_root_id(swiftscan_module_details_t details) {
-  return details->clang_details.cas_fs_root_id;
+  return swift::c_string_utils::create_null();
 }
 
 swiftscan_string_ref_t swiftscan_clang_detail_get_module_cache_key(