Renaming the new struct and place it in a better context.

Author: qiongsiwu

clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h

@@ -115,15 +115,6 @@ struct ModuleID {
   }
 };
 
-struct ExtendedModuleID {
-  ModuleID ID;
-  bool Exported;
-
-  bool operator<(const ExtendedModuleID &Other) const {
-    return std::tie(ID, Exported) < std::tie(Other.ID, Other.Exported);
-  }
-};
-
 /// P1689ModuleInfo - Represents the needed information of standard C++20
 /// modules for P1689 format.
 struct P1689ModuleInfo {
@@ -187,12 +178,25 @@ struct ModuleDeps {
   /// on, not including transitive dependencies.
   std::vector<PrebuiltModuleDep> PrebuiltModuleDeps;
 
-  /// A list of module identifiers this module directly depends on, not
-  /// including transitive dependencies.
+  /// This struct contains information about a single dependency.
+  struct DepsInfo {
+    /// Identifies the dependency.
+    ModuleID ID;
+
+    /// Indicates if the module that has this dependency exports it or not.
+    bool Exported = false;
+
+    bool operator<(const DepsInfo &Other) const {
+      return std::tie(ID, Exported) < std::tie(Other.ID, Other.Exported);
+    }
+  };
+
+  /// A list of DepsInfo containing information about modules this module
+  /// directly depends on, not including transitive dependencies.
   ///
   /// This may include modules with a different context hash when it can be
   /// determined that the differences are benign for this compilation.
-  std::vector<ExtendedModuleID> ClangModuleDeps;
+  std::vector<ModuleDeps::DepsInfo> ClangModuleDeps;
 
   /// The set of libraries or frameworks to link against when
   /// an entity from this module is used.
@@ -362,16 +366,16 @@ class ModuleDepCollector final : public DependencyCollector {
 
   /// Collect module map files for given modules.
   llvm::DenseSet<const FileEntry *>
-  collectModuleMapFiles(ArrayRef<ExtendedModuleID> ClangModuleDeps) const;
+  collectModuleMapFiles(ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
 
   /// Add module map files to the invocation, if needed.
   void addModuleMapFiles(CompilerInvocation &CI,
-                         ArrayRef<ExtendedModuleID> ClangModuleDeps) const;
+                         ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
   /// Add module files (pcm) to the invocation, if needed.
   void addModuleFiles(CompilerInvocation &CI,
-                      ArrayRef<ExtendedModuleID> ClangModuleDeps) const;
+                      ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
   void addModuleFiles(CowCompilerInvocation &CI,
-                      ArrayRef<ExtendedModuleID> ClangModuleDeps) const;
+                      ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const;
 
   /// Add paths that require looking up outputs to the given dependencies.
   void addOutputPaths(CowCompilerInvocation &CI, ModuleDeps &Deps);

clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp

@@ -389,7 +389,7 @@ ModuleDepCollector::getInvocationAdjustedForModuleBuildWithoutOutputs(
 }
 
 llvm::DenseSet<const FileEntry *> ModuleDepCollector::collectModuleMapFiles(
-    ArrayRef<ExtendedModuleID> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
   llvm::DenseSet<const FileEntry *> ModuleMapFiles;
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
@@ -404,7 +404,8 @@ llvm::DenseSet<const FileEntry *> ModuleDepCollector::collectModuleMapFiles(
 }
 
 void ModuleDepCollector::addModuleMapFiles(
-    CompilerInvocation &CI, ArrayRef<ExtendedModuleID> ClangModuleDeps) const {
+    CompilerInvocation &CI,
+    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
   if (Service.shouldEagerLoadModules())
     return; // Only pcm is needed for eager load.
 
@@ -416,7 +417,8 @@ void ModuleDepCollector::addModuleMapFiles(
 }
 
 void ModuleDepCollector::addModuleFiles(
-    CompilerInvocation &CI, ArrayRef<ExtendedModuleID> ClangModuleDeps) const {
+    CompilerInvocation &CI,
+    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
     std::string PCMPath =
@@ -432,7 +434,7 @@ void ModuleDepCollector::addModuleFiles(
 
 void ModuleDepCollector::addModuleFiles(
     CowCompilerInvocation &CI,
-    ArrayRef<ExtendedModuleID> ClangModuleDeps) const {
+    ArrayRef<ModuleDeps::DepsInfo> ClangModuleDeps) const {
   for (const auto &MID : ClangModuleDeps) {
     ModuleDeps *MD = ModuleDepsByID.lookup(MID.ID);
     std::string PCMPath =
@@ -472,7 +474,7 @@ void ModuleDepCollector::applyDiscoveredDependencies(CompilerInvocation &CI) {
         CI.getFrontendOpts().ModuleMapFiles.emplace_back(
             CurrentModuleMap->getNameAsRequested());
 
-    SmallVector<ExtendedModuleID> DirectDeps;
+    SmallVector<ModuleDeps::DepsInfo> DirectDeps;
     for (const auto &KV : ModularDeps)
       if (DirectModularDeps.contains(KV.first))
         DirectDeps.push_back({KV.second->ID, /* Exported = */ false});

clang/tools/clang-scan-deps/ClangScanDeps.cpp

@@ -368,12 +368,12 @@ static auto toJSONSorted(llvm::json::OStream &JOS, std::vector<ModuleID> V) {
   };
 }
 
-static auto toJSONSorted(llvm::json::OStream &JOS,
-                         std::vector<ExtendedModuleID> V,
-                         std::function<bool(const ExtendedModuleID &)> filter) {
+static auto
+toJSONSorted(llvm::json::OStream &JOS, std::vector<ModuleDeps::DepsInfo> V,
+             std::function<bool(const ModuleDeps::DepsInfo &)> filter) {
   llvm::sort(V);
   return [&JOS, V = std::move(V), filter] {
-    for (const ExtendedModuleID &MID : V)
+    for (const ModuleDeps::DepsInfo &MID : V)
       if (filter(MID)) {
         toJSONModuleID(JOS, MID.ID.ContextHash, MID.ID.ModuleName);
       }