[clang] [clang][Lex][NFC] Share directory module map processing (PR #239538)

Chen Miao via cfe-commits cfe-commits at lists.llvm.org
Fri Nov 6 01:15:44 PST 2026


https://github.com/ChenMiaoi created https://github.com/llvm/llvm-project/pull/239538

Share directory cache handling and module map discovery between `parseModuleMapFile` and `parseAndLoadModuleMapFile`. Use an explicit `Load` parameter to preserve their distinct processing and cache state updates.

>From f2baa69f7879a5c6e6b34fddb5f30b62e35633c5 Mon Sep 17 00:00:00 2001
From: Chen Miao <chenmiao.ku at gmail.com>
Date: Fri, 6 Nov 2026 17:13:17 +0800
Subject: [PATCH] [clang][Lex][NFC] Share directory module map processing

Share directory cache handling and module map discovery between
`parseModuleMapFile` and `parseAndLoadModuleMapFile`. Use an explicit `Load`
parameter to preserve their distinct processing and cache state updates.
---
 clang/include/clang/Lex/HeaderSearch.h |  4 ++
 clang/lib/Lex/HeaderSearch.cpp         | 61 +++++++++-----------------
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/clang/include/clang/Lex/HeaderSearch.h b/clang/include/clang/Lex/HeaderSearch.h
index fa46ae78dd0964..15aecda666a6ea 100644
--- a/clang/include/clang/Lex/HeaderSearch.h
+++ b/clang/include/clang/Lex/HeaderSearch.h
@@ -1109,6 +1109,10 @@ class HeaderSearch {
   ModuleMapResult parseModuleMapFile(DirectoryEntryRef Dir, bool IsSystem,
                                      bool ImplicitlyDiscovered,
                                      bool IsFramework);
+
+  ModuleMapResult parseModuleMapFileImpl(DirectoryEntryRef Dir, bool IsSystem,
+                                         bool ImplicitlyDiscovered,
+                                         bool IsFramework, bool Load);
 };
 
 /// Apply the header search options to get given HeaderSearch object.
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
index 1d582535beb1c0..235dc1aad38be9 100644
--- a/clang/lib/Lex/HeaderSearch.cpp
+++ b/clang/lib/Lex/HeaderSearch.cpp
@@ -2307,40 +2307,9 @@ HeaderSearch::ModuleMapResult
 HeaderSearch::parseAndLoadModuleMapFile(DirectoryEntryRef Dir, bool IsSystem,
                                         bool ImplicitlyDiscovered,
                                         bool IsFramework) {
-  auto InsertRes = DirectoryModuleMap.insert(std::pair{
-      Dir, ModuleMapDirectoryState{{}, {}, ModuleMapDirectoryState::Invalid}});
-  ModuleMapDirectoryState &MMState = InsertRes.first->second;
-  if (!InsertRes.second) {
-    switch (MMState.Status) {
-    case ModuleMapDirectoryState::Parsed:
-      break;
-    case ModuleMapDirectoryState::Loaded:
-      return MMR_AlreadyProcessed;
-    case ModuleMapDirectoryState::Invalid:
-      return MMR_InvalidModuleMap;
-    };
-  }
-
-  if (!MMState.ModuleMapFile) {
-    MMState.ModuleMapFile = lookupModuleMapFile(Dir, IsFramework);
-    if (MMState.ModuleMapFile)
-      MMState.PrivateModuleMapFile =
-          getPrivateModuleMap(*MMState.ModuleMapFile, FileMgr, Diags);
-  }
-
-  if (MMState.ModuleMapFile) {
-    ModuleMapResult Result = parseAndLoadModuleMapFileImpl(
-        *MMState.ModuleMapFile, IsSystem, ImplicitlyDiscovered, Dir);
-    // Add Dir explicitly in case ModuleMapFile is in a subdirectory.
-    // E.g. Foo.framework/Modules/module.modulemap
-    //      ^Dir                  ^ModuleMapFile
-    if (Result == MMR_NewlyProcessed)
-      MMState.Status = ModuleMapDirectoryState::Loaded;
-    else if (Result == MMR_InvalidModuleMap)
-      MMState.Status = ModuleMapDirectoryState::Invalid;
-    return Result;
-  }
-  return MMR_InvalidModuleMap;
+  return parseModuleMapFileImpl(Dir, IsSystem, ImplicitlyDiscovered,
+                                IsFramework,
+                                /*Load=*/true);
 }
 
 HeaderSearch::ModuleMapResult
@@ -2356,16 +2325,24 @@ HeaderSearch::parseModuleMapFile(StringRef DirName, bool IsSystem,
 HeaderSearch::ModuleMapResult
 HeaderSearch::parseModuleMapFile(DirectoryEntryRef Dir, bool IsSystem,
                                  bool ImplicitlyDiscovered, bool IsFramework) {
-  if (!HSOpts.LazyLoadModuleMaps)
-    return parseAndLoadModuleMapFile(Dir, IsSystem, ImplicitlyDiscovered,
-                                     IsFramework);
+  return parseModuleMapFileImpl(Dir, IsSystem, ImplicitlyDiscovered,
+                                IsFramework,
+                                /*Load=*/!HSOpts.LazyLoadModuleMaps);
+}
 
+HeaderSearch::ModuleMapResult
+HeaderSearch::parseModuleMapFileImpl(DirectoryEntryRef Dir, bool IsSystem,
+                                     bool ImplicitlyDiscovered,
+                                     bool IsFramework, bool Load) {
   auto InsertRes = DirectoryModuleMap.insert(std::pair{
       Dir, ModuleMapDirectoryState{{}, {}, ModuleMapDirectoryState::Invalid}});
   ModuleMapDirectoryState &MMState = InsertRes.first->second;
   if (!InsertRes.second) {
     switch (MMState.Status) {
     case ModuleMapDirectoryState::Parsed:
+      if (Load)
+        break;
+      [[fallthrough]];
     case ModuleMapDirectoryState::Loaded:
       return MMR_AlreadyProcessed;
     case ModuleMapDirectoryState::Invalid:
@@ -2381,13 +2358,17 @@ HeaderSearch::parseModuleMapFile(DirectoryEntryRef Dir, bool IsSystem,
   }
 
   if (MMState.ModuleMapFile) {
-    ModuleMapResult Result = parseModuleMapFileImpl(
-        *MMState.ModuleMapFile, IsSystem, ImplicitlyDiscovered, Dir);
+    ModuleMapResult Result =
+        Load ? parseAndLoadModuleMapFileImpl(*MMState.ModuleMapFile, IsSystem,
+                                             ImplicitlyDiscovered, Dir)
+             : parseModuleMapFileImpl(*MMState.ModuleMapFile, IsSystem,
+                                      ImplicitlyDiscovered, Dir);
     // Add Dir explicitly in case ModuleMapFile is in a subdirectory.
     // E.g. Foo.framework/Modules/module.modulemap
     //      ^Dir                  ^ModuleMapFile
     if (Result == MMR_NewlyProcessed)
-      MMState.Status = ModuleMapDirectoryState::Parsed;
+      MMState.Status = Load ? ModuleMapDirectoryState::Loaded
+                            : ModuleMapDirectoryState::Parsed;
     else if (Result == MMR_InvalidModuleMap)
       MMState.Status = ModuleMapDirectoryState::Invalid;
     return Result;



More information about the cfe-commits mailing list