Revert "[modules] Fix error about the same module being defined in di…

…fferent .pcm files when using VFS overlays." This reverts commit 97dfaf4. llvm-clang-x86_64-sie-win buildbot is failing with the added test.
llvm · Aug 10, 2023 · 91b10f6 · 91b10f6
1 parent d21ec35
commit 91b10f6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 113 deletions.
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
@@ -177,7 +177,7 @@ std::string HeaderSearch::getCachedModuleFileName(Module *Module) {
   // *.modulemap file. In this case, just return an empty string.
   if (!ModuleMap)
     return {};
-  return getCachedModuleFileName(Module->Name, ModuleMap->getNameAsRequested());
+  return getCachedModuleFileName(Module->Name, ModuleMap->getName());
 }
 
 std::string HeaderSearch::getPrebuiltModuleFileName(StringRef ModuleName,

diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
@@ -1327,8 +1327,7 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, ASTContext &Context,
 
     auto &Map = PP.getHeaderSearchInfo().getModuleMap();
     AddPath(WritingModule->PresumedModuleMapFile.empty()
-                ? Map.getModuleMapFileForUniquing(WritingModule)
-                      ->getNameAsRequested()
+                ? Map.getModuleMapFileForUniquing(WritingModule)->getName()
                 : StringRef(WritingModule->PresumedModuleMapFile),
             Record);
 

diff --git a/clang/test/VFS/module-map-path.m b/clang/test/VFS/module-map-path.m