diff --git a/clang/lib/Frontend/DependencyFile.cpp b/clang/lib/Frontend/DependencyFile.cpp --- a/clang/lib/Frontend/DependencyFile.cpp +++ b/clang/lib/Frontend/DependencyFile.cpp @@ -141,7 +141,18 @@ } bool DependencyCollector::addDependency(StringRef Filename) { - if (Seen.insert(Filename).second) { + StringRef SearchPath; +#ifdef _WIN32 + // Make the search insensitive to case and separators. + llvm::SmallString<256> TmpPath = Filename; + llvm::sys::path::native(TmpPath); + std::transform(TmpPath.begin(), TmpPath.end(), TmpPath.begin(), ::tolower); + SearchPath = TmpPath.str(); +#else + SearchPath = Filename; +#endif + + if (Seen.insert(SearchPath).second) { Dependencies.push_back(std::string(Filename)); return true; } diff --git a/clang/test/Frontend/dependency-gen-windows-duplicates.c b/clang/test/Frontend/dependency-gen-windows-duplicates.c new file mode 100644 --- /dev/null +++ b/clang/test/Frontend/dependency-gen-windows-duplicates.c @@ -0,0 +1,27 @@ +// REQUIRES: system-windows + +// RUN: rm -rf %t.dir +// RUN: mkdir -p %t.dir/subdir +// RUN: echo > %t.dir/subdir/x.h +// RUN: cp %s %t.dir/test.c +// RUN: cd %t.dir + +// RUN: %clang -MD -MF - %t.dir/test.c -fsyntax-only -I %t.dir/subdir | FileCheck %s +// CHECK: test.o: +// CHECK-NEXT: \test.c +// CHECK-NEXT: \SubDir\X.h +// File x.h must appear only once (case insensitive check). +// CHECK-NOT: {{\\|/}}{{x|X}}.{{h|H}} + +// Include x.h several times, with different casing and separators. +// Since all paths are passed to clang as absolute, all dependencies are absolute paths. +// We expect the output dependencies to contain only one line for file x.h + +// Test case sensitivity. +#include "SubDir/X.h" +#include "subdir/x.h" + +// Test separator sensitivity: +// clang internally concatenates x.h using the Windows native separator. +#include +