Merge pull request #71991 from artemcm/ExplicitModulesDefaultCache

[Dependency Scanning] Fallback on system default cache directory when no explicit cache path is specified by the user

Author: artemcm

lib/DependencyScan/ScanDependencies.cpp

@@ -1397,7 +1397,7 @@ static std::set<ModuleDependencyID> computeBridgingHeaderTransitiveDependencies(
 
 static std::vector<ModuleDependencyID>
 findClangDepPath(const ModuleDependencyID &from, const ModuleDependencyID &to,
-                 ModuleDependenciesCache &cache) {
+                 const ModuleDependenciesCache &cache) {
   std::unordered_set<ModuleDependencyID> visited;
   std::vector<ModuleDependencyID> result;
   std::stack<ModuleDependencyID, std::vector<ModuleDependencyID>> stack;
@@ -1431,8 +1431,8 @@ findClangDepPath(const ModuleDependencyID &from, const ModuleDependencyID &to,
   return result;
 }
 
-static bool diagnoseCycle(CompilerInstance &instance,
-                          ModuleDependenciesCache &cache,
+static bool diagnoseCycle(const CompilerInstance &instance,
+                          const ModuleDependenciesCache &cache,
                           ModuleDependencyID mainId) {
   ModuleDependencyIDSetVector openSet;
   ModuleDependencyIDSetVector closeSet;

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -66,6 +66,10 @@ bool ArgsToFrontendOptionsConverter::convert(
   }
   if (const Arg *A = Args.getLastArg(OPT_module_cache_path)) {
     Opts.ExplicitModulesOutputPath = A->getValue();
+  } else {
+    SmallString<128> defaultPath;
+    llvm::sys::path::cache_directory(defaultPath);
+    Opts.ExplicitModulesOutputPath = defaultPath.str().str();
   }
   if (const Arg *A = Args.getLastArg(OPT_backup_module_interface_path)) {
     Opts.BackupModuleInterfaceDir = A->getValue();