Author: Archibald Elliott Date: 2022-01-05T12:17:06Z New Revision: ea835171389aa356b865bf9cb72ca8f4f84b64fd
URL: https://github.com/llvm/llvm-project/commit/ea835171389aa356b865bf9cb72ca8f4f84b64fd DIFF: https://github.com/llvm/llvm-project/commit/ea835171389aa356b865bf9cb72ca8f4f84b64fd.diff LOG: Revert "[Clang][ScanDeps] Use the virtual path for module maps" This reverts commits: - 04192422c4e3b730c580498b8e948088cb15580b. - 015e08c6badad6b27404d6f94569e25c18d79049 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. Added: Modified: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp Removed: clang/test/ClangScanDeps/modulemap-via-vfs.m ################################################################################ diff --git a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp index 086215e7a573d..9229c67c41787 100644 --- a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp +++ b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp @@ -237,13 +237,7 @@ ModuleID ModuleDepCollectorPP::handleTopLevelModule(const Module *M) { .getHeaderSearchInfo() .getModuleMap() .getModuleMapFileForUniquing(M); - - if (ModuleMap) { - StringRef Path = ModuleMap->tryGetRealPathName(); - if (Path.empty()) - Path = ModuleMap->getName(); - MD.ClangModuleMapFile = std::string(Path); - } + MD.ClangModuleMapFile = std::string(ModuleMap ? ModuleMap->getName() : ""); serialization::ModuleFile *MF = MDC.ScanInstance.getASTReader()->getModuleManager().lookup( diff --git a/clang/test/ClangScanDeps/modulemap-via-vfs.m b/clang/test/ClangScanDeps/modulemap-via-vfs.m deleted file mode 100644 index b239450a752ec..0000000000000 --- a/clang/test/ClangScanDeps/modulemap-via-vfs.m +++ /dev/null @@ -1,56 +0,0 @@ -// RUN: rm -rf %t.dir -// RUN: split-file %s %t.dir -// RUN: sed -e "s|DIR|%/t.dir|g" %t.dir/build/compile-commands.json.in > %t.dir/build/compile-commands.json -// RUN: sed -e "s|DIR|%/t.dir|g" %t.dir/build/vfs.yaml.in > %t.dir/build/vfs.yaml -// RUN: clang-scan-deps -compilation-database %t.dir/build/compile-commands.json -j 1 -format experimental-full \ -// RUN: -mode preprocess-minimized-sources -generate-modules-path-args > %t.db -// RUN: %python %S/../../utils/module-deps-to-rsp.py %t.db --module-name=A > %t.A.cc1.rsp -// RUN: cat %t.A.cc1.rsp | sed 's:\\\\\?:/:g' | FileCheck %s - -// CHECK-NOT: build/module.modulemap -// CHECK: A/module.modulemap - -//--- build/compile-commands.json.in - -[ -{ - "directory": "DIR", - "command": "clang DIR/main.m -Imodules/A -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-modules -fimplicit-module-maps -ivfsoverlay build/vfs.yaml", - "file": "DIR/main.m" -} -] - -//--- build/module.modulemap - -module A { - umbrella header "A.h" -} - -//--- modules/A/A.h - -typedef int A_t; - -//--- build/vfs.yaml.in - -{ - "version": 0, - "case-sensitive": "false", - "roots": [ - { - "contents": [ - { - "external-contents": "DIR/build/module.modulemap", - "name": "module.modulemap", - "type": "file" - }], - "name": "DIR/modules/A", - "type": "directory" - } - ] -} - -//--- main.m - -@import A; - -A_t a = 0; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
