Skip to content

Commit ea83517

Browse files
committed
Revert "[Clang][ScanDeps] Use the virtual path for module maps"
This reverts commits: - 0419242. - 015e08c D114206 was landed before it was approved - and was landed knowing that the test crashed on windows, without an xfail. The promised follow-up commit with fixes has not appeared since it was promised on December 14th.
1 parent 6c6bba7 commit ea83517

File tree

2 files changed

+1
-63
lines changed

2 files changed

+1
-63
lines changed

clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,7 @@ ModuleID ModuleDepCollectorPP::handleTopLevelModule(const Module *M) {
237237
.getHeaderSearchInfo()
238238
.getModuleMap()
239239
.getModuleMapFileForUniquing(M);
240-
241-
if (ModuleMap) {
242-
StringRef Path = ModuleMap->tryGetRealPathName();
243-
if (Path.empty())
244-
Path = ModuleMap->getName();
245-
MD.ClangModuleMapFile = std::string(Path);
246-
}
240+
MD.ClangModuleMapFile = std::string(ModuleMap ? ModuleMap->getName() : "");
247241

248242
serialization::ModuleFile *MF =
249243
MDC.ScanInstance.getASTReader()->getModuleManager().lookup(

clang/test/ClangScanDeps/modulemap-via-vfs.m

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)