Swift: collect encountered modules

Author: redsun82

swift/extractor/SwiftExtractor.cpp

@@ -173,7 +173,7 @@ static std::vector<swift::ModuleDecl*> collectLoadedModules(swift::CompilerInsta
 void codeql::extractSwiftFiles(SwiftExtractorState& state, swift::CompilerInstance& compiler) {
   auto inputFiles = collectInputFilenames(compiler);
   std::vector<swift::ModuleDecl*> todo = collectLoadedModules(compiler);
-  std::unordered_set<swift::ModuleDecl*> seen{todo.begin(), todo.end()};
+  state.encounteredModules.insert(todo.begin(), todo.end());
 
   while (!todo.empty()) {
     auto module = todo.back();
@@ -196,9 +196,9 @@ void codeql::extractSwiftFiles(SwiftExtractorState& state, swift::CompilerInstan
       encounteredModules = extractDeclarations(state, compiler, *module);
     }
     for (auto encountered : encounteredModules) {
-      if (seen.count(encountered) == 0) {
+      if (state.encounteredModules.count(encountered) == 0) {
         todo.push_back(encountered);
-        seen.insert(encountered);
+        state.encounteredModules.insert(encountered);
       }
     }
   }

swift/extractor/config/SwiftExtractorState.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include <unordered_set>
 #include <filesystem>
 
 #include <swift/AST/Decl.h>
@@ -14,6 +15,10 @@ struct SwiftExtractorState {
   // All the trap files related to this extraction. This may also include trap files generated in a
   // previous run but that this run requested as well. Paths are relative to `configuration.trapDir`
   std::vector<std::filesystem::path> traps;
+
+  // All modules encountered during this extractor run, which therefore are dependencies of the
+  // outcomes of this run
+  std::unordered_set<const swift::ModuleDecl*> encounteredModules;
 };
 
 }  // namespace codeql