Merge pull request #35356 from artemcm/DependencyScannerUseCacheWhenAppropriate

[Dependency Scanning] Optionally, resolve direct dependencies of a module using only the `ModuleDependenciesCache`.

Author: artemcm

include/swift/AST/ASTContext.h

@@ -795,7 +795,8 @@ class ASTContext final {
       StringRef moduleName,
       bool isUnderlyingClangModule,
       ModuleDependenciesCache &cache,
-      InterfaceSubContextDelegate &delegate);
+      InterfaceSubContextDelegate &delegate,
+      bool cacheOnly = false);
 
   /// Retrieve the module dependencies for the Swift module with the given name.
   Optional<ModuleDependencies> getSwiftModuleDependencies(

lib/AST/ASTContext.cpp

@@ -1528,15 +1528,35 @@ void ASTContext::addModuleInterfaceChecker(
 
 Optional<ModuleDependencies> ASTContext::getModuleDependencies(
     StringRef moduleName, bool isUnderlyingClangModule,
-    ModuleDependenciesCache &cache, InterfaceSubContextDelegate &delegate) {
-  for (auto &loader : getImpl().ModuleLoaders) {
-    if (isUnderlyingClangModule &&
-        loader.get() != getImpl().TheClangModuleLoader)
-      continue;
+    ModuleDependenciesCache &cache, InterfaceSubContextDelegate &delegate,
+    bool cacheOnly) {
+  // Retrieve the dependencies for this module.
+  if (cacheOnly) {
+    // Check whether we've cached this result.
+    if (!isUnderlyingClangModule) {
+      if (auto found = cache.findDependencies(moduleName,
+                                              ModuleDependenciesKind::SwiftTextual))
+        return found;
+      if (auto found = cache.findDependencies(moduleName,
+                                              ModuleDependenciesKind::SwiftTextual))
+        return found;
+      if (auto found = cache.findDependencies(moduleName,
+                                              ModuleDependenciesKind::SwiftPlaceholder))
+        return found;
+    }
+    if (auto found = cache.findDependencies(moduleName,
+                                            ModuleDependenciesKind::Clang))
+      return found;
+  } else {
+    for (auto &loader : getImpl().ModuleLoaders) {
+      if (isUnderlyingClangModule &&
+          loader.get() != getImpl().TheClangModuleLoader)
+        continue;
 
-    if (auto dependencies = loader->getModuleDependencies(moduleName, cache,
-                                                          delegate))
-      return dependencies;
+      if (auto dependencies = loader->getModuleDependencies(moduleName, cache,
+                                                            delegate))
+        return dependencies;
+    }
   }
 
   return None;

lib/DependencyScan/ScanDependencies.cpp

@@ -153,7 +153,8 @@ static void findAllImportedClangModules(ASTContext &ctx, StringRef moduleName,
 static std::vector<ModuleDependencyID>
 resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
                           ModuleDependenciesCache &cache,
-                          InterfaceSubContextDelegate &ASTDelegate) {
+                          InterfaceSubContextDelegate &ASTDelegate,
+                          bool cacheOnly = false) {
   auto &ctx = instance.getASTContext();
   auto knownDependencies = *cache.findDependencies(module.first, module.second);
   auto isSwiftInterface = knownDependencies.isSwiftTextualModule();
@@ -164,10 +165,8 @@ resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
   for (auto dependsOn : knownDependencies.getModuleDependencies()) {
     // Figure out what kind of module we need.
     bool onlyClangModule = !isSwift || module.first == dependsOn;
-
-    // Retrieve the dependencies for this module.
     if (auto found = ctx.getModuleDependencies(dependsOn, onlyClangModule,
-                                               cache, ASTDelegate)) {
+                                               cache, ASTDelegate, cacheOnly)) {
       result.insert({dependsOn, found->getKind()});
     }
   }
@@ -210,7 +209,7 @@ resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
     // directly depends on these.
     for (const auto &clangDep : allClangModules) {
       if (auto found = ctx.getModuleDependencies(
-              clangDep, /*onlyClangModule=*/false, cache, ASTDelegate)) {
+              clangDep, /*onlyClangModule=*/false, cache, ASTDelegate, cacheOnly)) {
         // ASTContext::getModuleDependencies returns dependencies for a module
         // with a given name. This Clang module may have the same name as the
         // Swift module we are resolving, so we need to make sure we don't add a
@@ -762,7 +761,7 @@ generateFullDependencyGraph(CompilerInstance &instance,
     // DirectDependencies
     auto directDependencies = resolveDirectDependencies(
         instance, ModuleDependencyID(module.first, module.second), cache,
-        ASTDelegate);
+        ASTDelegate, /*cacheOnly*/ true);
 
     // Generate a swiftscan_clang_details_t object based on the dependency kind
     auto getModuleDetails = [&]() -> swiftscan_module_details_t {
@@ -872,7 +871,7 @@ static bool diagnoseCycle(CompilerInstance &instance,
     auto &lastOpen = openSet.back();
     auto beforeSize = openSet.size();
     for (auto dep :
-         resolveDirectDependencies(instance, lastOpen, cache, astDelegate)) {
+         resolveDirectDependencies(instance, lastOpen, cache, astDelegate, /*cacheOnly*/ true)) {
       if (closeSet.count(dep))
         continue;
       if (openSet.insert(dep)) {