Merge pull request #6542 from benlangmuir/include-tree-modules-stable

[clang][cas] include-tree support for modules

Author: benlangmuir

clang/include/clang/AST/ASTContext.h

@@ -477,6 +477,14 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// For module code-gen cases, this is the top-level module we are building.
   Module *TopLevelModule = nullptr;
 
+  /// The include tree that is being built, if any.
+  /// See \c FrontendOptions::CASIncludeTreeID.
+  std::optional<std::string> CASIncludeTreeID;
+
+  /// The cas-fs tree that is being built, if any.
+  /// See \c FileSystemOptions::CASFileSystemRootID.
+  std::optional<std::string> CASFileSystemRootID;
+
   static constexpr unsigned ConstantArrayTypesLog2InitSize = 8;
   static constexpr unsigned GeneralTypesLog2InitSize = 9;
   static constexpr unsigned FunctionProtoTypesLog2InitSize = 12;
@@ -1086,6 +1094,20 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// Get module under construction, nullptr if this is not a C++20 module.
   Module *getModuleForCodeGen() const { return TopLevelModule; }
 
+  std::optional<std::string> getCASIncludeTreeID() const {
+    return CASIncludeTreeID;
+  }
+  void setCASIncludeTreeID(std::string ID) {
+    CASIncludeTreeID = std::move(ID);
+  }
+
+  std::optional<std::string> getCASFileSystemRootID() const {
+    return CASFileSystemRootID;
+  }
+  void setCASFileSystemRootID(std::string ID) {
+    CASFileSystemRootID = std::move(ID);
+  }
+
   TranslationUnitDecl *getTranslationUnitDecl() const {
     return TUDecl->getMostRecentDecl();
   }

clang/include/clang/Basic/DiagnosticCASKinds.td

@@ -36,6 +36,10 @@ def err_cas_missing_root_id : Error<
   "CAS missing expected root-id '%0'">, DefaultFatal;
 def err_cas_cannot_parse_root_id_for_module : Error<
   "CAS cannot parse root-id '%0' for module '%1'">, DefaultFatal;
+def err_cas_cannot_parse_include_tree_id : Error<
+  "CAS cannot parse include-tree-id '%0'">, DefaultFatal;
+def err_cas_missing_include_tree_id : Error<
+  "CAS missing expected include-tree '%0'">, DefaultFatal;
 
 def warn_clang_cache_disabled_caching: Warning<
   "caching disabled because %0">,

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -229,6 +229,8 @@ def err_missing_module_name : Error<
   DefaultFatal;
 def err_missing_module : Error<
   "no module named '%0' declared in module map file '%1'">, DefaultFatal;
+def err_missing_module_include_tree : Error<
+  "no module named '%0' declared in include-tree module map '%1'">, DefaultFatal;
 def err_no_submodule : Error<"no submodule named %0 in module '%1'">;
 def err_no_submodule_suggest : Error<
   "no submodule named %0 in module '%1'; did you mean '%2'?">;

clang/include/clang/Basic/DiagnosticLexKinds.td

@@ -918,6 +918,9 @@ def warn_defined_in_function_type_macro : Extension<
   "macro expansion producing 'defined' has undefined behavior">,
   InGroup<ExpansionToDefined>;
 
+def err_pp_missing_module_include_tree : Error<
+  "no module named '%0' declared in include-tree module map">, DefaultFatal;
+
 let CategoryName = "Nullability Issue" in {
 
 def err_pp_assume_nonnull_syntax : Error<"expected 'begin' or 'end'">;

clang/include/clang/Basic/Module.h

@@ -108,6 +108,10 @@ class alignas(8) Module {
     /// of header files.
     ModuleMapModule,
 
+    /// This is a module that was defined by a module map and built out
+    /// of header files as part of an \c IncludeTree.
+    IncludeTreeModuleMap,
+
     /// This is a C++20 module interface unit.
     ModuleInterfaceUnit,
 
@@ -175,7 +179,9 @@ class alignas(8) Module {
 
   bool isPrivateModule() const { return Kind == PrivateModuleFragment; }
 
-  bool isModuleMapModule() const { return Kind == ModuleMapModule; }
+  bool isModuleMapModule() const {
+    return Kind == ModuleMapModule || Kind == IncludeTreeModuleMap;
+  }
 
 private:
   /// The submodules of this module, indexed by name.
@@ -192,10 +198,6 @@ class alignas(8) Module {
   /// The \c ActionCache key for this module, if any.
   Optional<std::string> ModuleCacheKey;
 
-  /// The CAS filesystem root ID for implicit modules built with the dependency
-  /// scanner, if any.
-  Optional<std::string> CASFileSystemRootID;
-
   /// The top-level headers associated with this module.
   llvm::SmallSetVector<const FileEntry *, 2> TopHeaders;
 
@@ -636,14 +638,6 @@ class alignas(8) Module {
     getTopLevelModule()->ModuleCacheKey = std::move(Key);
   }
 
-  Optional<std::string> getCASFileSystemRootID() const {
-    return getTopLevelModule()->CASFileSystemRootID;
-  }
-
-  void setCASFileSystemRootID(std::string ID) {
-    assert(!getCASFileSystemRootID() || *getCASFileSystemRootID() == ID);
-    getTopLevelModule()->CASFileSystemRootID = std::move(ID);
-  }
 
   /// Retrieve the directory for which this module serves as the
   /// umbrella.