From 4c20bef1ef1d29e8824dbf68ee91f072dd1b2f09 Mon Sep 17 00:00:00 2001 From: Bruno Cardoso Lopes Date: Thu, 7 Apr 2016 00:00:57 +0000 Subject: [PATCH] [CrashReproducer] Setup 'case-sensitive' in YAML files. The crash reproducer was not setting up case sensitivity in the VFS yaml files, which defaults to true. Make the crash reproducer explicitly set that flag based on the case sensitivity of the .cache path where vfs and modules are dumped. llvm-svn: 265622 --- clang/lib/Frontend/ModuleDependencyCollector.cpp | 31 +++++++++++++++++++++--- clang/test/Modules/crash-vfs-relative-overlay.m | 2 ++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/clang/lib/Frontend/ModuleDependencyCollector.cpp b/clang/lib/Frontend/ModuleDependencyCollector.cpp index d9cf40a..1678d18 100644 --- a/clang/lib/Frontend/ModuleDependencyCollector.cpp +++ b/clang/lib/Frontend/ModuleDependencyCollector.cpp @@ -79,19 +79,42 @@ void ModuleDependencyCollector::attachToPreprocessor(Preprocessor &PP) { llvm::make_unique(*this)); } +static bool isCaseSensitivePath(StringRef Path) { + SmallString TmpDest = Path, UpperDest, RealDest; + // Remove component traversals, links, etc. + if (!real_path(Path, TmpDest)) + return true; // Current default value in vfs.yaml + Path = TmpDest; + + // Change path to all upper case and ask for its real path, if the latter + // exists and is equal to Path, it's not case sensitive. Default to case + // sensitive in the absense of realpath, since this is what the VFSWriter + // already expects when sensitivity isn't setup. + for (auto &C : Path) + UpperDest.push_back(std::toupper(C)); + if (real_path(UpperDest, RealDest) && Path.equals(RealDest)) + return false; + return true; +} + void ModuleDependencyCollector::writeFileMap() { if (Seen.empty()) return; - SmallString<256> Dest = getDest(); - llvm::sys::path::append(Dest, "vfs.yaml"); + StringRef VFSDir = getDest(); // Default to use relative overlay directories in the VFS yaml file. This // allows crash reproducer scripts to work across machines. - VFSWriter.setOverlayDir(getDest()); + VFSWriter.setOverlayDir(VFSDir); + + // Explicitly set case sensitivity for the YAML writer. For that, find out + // the sensitivity at the path where the headers all collected to. + VFSWriter.setCaseSensitivity(isCaseSensitivePath(VFSDir)); std::error_code EC; - llvm::raw_fd_ostream OS(Dest, EC, llvm::sys::fs::F_Text); + SmallString<256> YAMLPath = VFSDir; + llvm::sys::path::append(YAMLPath, "vfs.yaml"); + llvm::raw_fd_ostream OS(YAMLPath, EC, llvm::sys::fs::F_Text); if (EC) { HasErrors = true; return; diff --git a/clang/test/Modules/crash-vfs-relative-overlay.m b/clang/test/Modules/crash-vfs-relative-overlay.m index 29552d0..d785d09 100644 --- a/clang/test/Modules/crash-vfs-relative-overlay.m +++ b/clang/test/Modules/crash-vfs-relative-overlay.m @@ -36,6 +36,8 @@ // CHECKSH: "-ivfsoverlay" "crash-vfs-{{[^ ]*}}.cache/vfs/vfs.yaml" // CHECKSH: "-fmodules-cache-path=crash-vfs-{{[^ ]*}}.cache/modules" +// CHECKYAML: 'case-sensitive': +// CHECKYAML-NEXT: 'overlay-relative': 'true', // CHECKYAML: 'type': 'directory' // CHECKYAML: 'name': "/[[PATH:.*]]/Inputs/crash-recovery/usr/include", // CHECKYAML-NEXT: 'contents': [ -- 2.7.4