averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Caching] Remove CASFS clang module implemenation

Browse Source 
Remove the CASFS based clang module implemenation as it is not longer
used.

(cherry picked from commit 3c81c1ca9f)
This commit is contained in:
Steven Wu
2025-04-24 10:13:52 -07:00
parent 4670acf7f9
commit 559734c6d0
18 changed files with 46 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1815,13 +1815,6 @@ void InterfaceSubContextDelegateImpl::inheritOptionsForBuildingInterface(
casOpts.HasImmutableFileSystem;
casOpts.enumerateCASConfigurationFlags(
[&](StringRef Arg) { GenericArgs.push_back(ArgSaver.save(Arg)); });
// ClangIncludeTree is default on when caching is enabled.
genericSubInvocation.getClangImporterOptions().UseClangIncludeTree = true;
}
if (!clangImporterOpts.UseClangIncludeTree) {
genericSubInvocation.getClangImporterOptions().UseClangIncludeTree = false;
GenericArgs.push_back("-no-clang-include-tree");
}
}
@@ -2521,8 +2514,7 @@ struct ExplicitCASModuleLoader::Implementation {
};
for (auto &entry : ExplicitClangModuleMap) {
const auto &moduleMapPath = entry.getValue().moduleMapPath;
if (!moduleMapPath.empty() &&
!Ctx.ClangImporterOpts.UseClangIncludeTree &&
if (!moduleMapPath.empty() && !Ctx.CASOpts.EnableCaching &&
moduleMapsSeen.find(moduleMapPath) == moduleMapsSeen.end()) {
moduleMapsSeen.insert(moduleMapPath);
extraClangArgs.push_back(