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] Switch clang-include-tree to be default for clang modules

Browse Source 
Switch to use clang-include-tree by default for clang module
building/caching when using a CAS. This is the default mode for clang
module and has less issues than CAS file system based implementation.
This commit is contained in:
Steven Wu
2023-11-06 14:53:24 -08:00
parent a09052f2a7
commit 109566fb81
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1605,7 +1605,6 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts, ArgList &Args,
Opts.ExtraArgsOnly |= Args.hasArg(OPT_extra_clang_options_only);
Opts.DirectClangCC1ModuleBuild |= Args.hasArg(OPT_direct_clang_cc1_module_build);
Opts.UseClangIncludeTree |= Args.hasArg(OPT_clang_include_tree);
if (const Arg *A = Args.getLastArg(OPT_pch_output_dir)) {
Opts.PrecompiledHeaderOutputDir = A->getValue();
@@ -1632,8 +1631,12 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts, ArgList &Args,
// Forward the FrontendOptions to clang importer option so it can be
// accessed when creating clang module compilation invocation.
if (FrontendOpts.EnableCaching)
if (FrontendOpts.EnableCaching) {
Opts.CASOpts = FrontendOpts.CASOpts;
// Only set UseClangIncludeTree when caching is enabled since it is not
// useful in non-caching context.
Opts.UseClangIncludeTree = !Args.hasArg(OPT_no_clang_include_tree);
}
return false;
}