Fix the following CAS related test for Windows

hjyamauchi · hjyamauchi · commit ecff2039a96f · 2025-09-22T14:39:43.000-07:00
Clang :: ClangScanDeps/include-tree-working-directory.c
diff --git a/clang/lib/CAS/IncludeTree.cpp b/clang/lib/CAS/IncludeTree.cpp
@@ -47,6 +47,11 @@ IncludeTree::SpuriousImport::create(ObjectStore &DB, ObjectRef ImportRef,
 Expected<IncludeTree::File> IncludeTree::File::create(ObjectStore &DB,
                                                       StringRef Filename,
                                                       ObjectRef Contents) {
+  // We store the file path into CAS here. Canonicalize it for Windows
+  // to avoid cache misses due to slash differences
+  SmallString<256> Storage(Filename);
+  llvm::sys::path::make_preferred(Storage);
+  Filename = StringRef(Storage.data(), Storage.size());
   auto PathRef = DB.storeFromString({}, Filename);
   if (!PathRef)
     return PathRef.takeError();
@@ -1000,6 +1005,9 @@ class IncludeTreeFileSystem final : public llvm::cas::CASBackedFileSystem {
   /// \c createIncludeTreeFileSystem.
   void getPath(const Twine &Path, SmallVectorImpl<char> &Out) {
     Path.toVector(Out);
+    // Canonicalize paths for Windows to avoid duplicate entries in
+    // the Files map.
+    llvm::sys::path::make_preferred(Out);
     // Strip dots, but do not eliminate a path consisting only of '.'
     if (Out.size() != 1)
       llvm::sys::path::remove_dots(Out);
@@ -1044,6 +1052,9 @@ class IncludeTreeFileSystem final : public llvm::cas::CASBackedFileSystem {
 
 static std::string computeFilename(StringRef Name, IncludeTreeFileSystem &FS) {
   SmallString<128> Filename(Name);
+  // Canonicalize paths for Windows to avoid duplicate entries in the
+  // Files map.
+  llvm::sys::path::make_preferred(Filename);
   assert(Filename != ".");
   llvm::sys::path::remove_dots(Filename);
 
diff --git a/clang/test/ClangScanDeps/include-tree-preserve-pch-path.c b/clang/test/ClangScanDeps/include-tree-preserve-pch-path.c
@@ -30,8 +30,8 @@
 // Extract include-tree casid
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
 
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -check-prefix=INCLUDE_TREE -DPREFIX=%/t
-// INCLUDE_TREE: (PCH) [[PREFIX]]/prefix.pch llvmcas://
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -check-prefix=INCLUDE_TREE -DPREFIX=%t
+// INCLUDE_TREE: (PCH) [[PREFIX]]{{/|\\}}prefix.pch llvmcas://
 
 // RUN: clang-scan-deps -compilation-database %t/cdb_no_preserve.json -format experimental-include-tree-full -cas-path %t/cas > %t/deps_no_preserve.json
 // RUN: FileCheck %s -input-file %t/deps_no_preserve.json -DPREFIX=%/t -check-prefix=NO_PRESERVE
diff --git a/clang/test/ClangScanDeps/include-tree-working-directory.c b/clang/test/ClangScanDeps/include-tree-working-directory.c
@@ -20,14 +20,14 @@
 // CACHE-HIT: remark: compile job cache hit
 
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%t
 
-// CHECK: [[PREFIX]]/t.c llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}t.c llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
-// CHECK: 2:1 [[PREFIX]]/relative/h1.h llvmcas://
+// CHECK: 2:1 [[PREFIX]]{{/|\\}}relative{{/|\\}}h1.h llvmcas://
 // CHECK: Files:
-// CHECK: [[PREFIX]]/t.c llvmcas://
-// CHECK: [[PREFIX]]/relative/h1.h llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}t.c llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}relative{{/|\\}}h1.h llvmcas://
 
 /// Using a different working directory should cache hit as well.
 /// FIXME: Working directory affects some codegen options added by clang driver, preserve them to make sure the cache hit.
diff --git a/clang/test/ClangScanDeps/include-tree.c b/clang/test/ClangScanDeps/include-tree.c
@@ -7,27 +7,27 @@
 // Try again to ensure a pre-populated CASDB doesn't change output.
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-include-tree -cas-path %t/cas > %t/result2.txt
 // RUN: diff -u %t/result1.txt %t/result2.txt
-// RUN: FileCheck %s -input-file %t/result1.txt -DPREFIX=%/t
+// RUN: FileCheck %s -input-file %t/result1.txt -DPREFIX=%t
 
 // Make sure order is as expected.
-// RUN: FileCheck %s -input-file %t/result1.txt -DPREFIX=%/t -check-prefix ORDER
+// RUN: cat %t/result1.txt | %PathSanitizingFileCheck --sanitize PREFIX=%/t %s -check-prefix ORDER
 
-// ORDER:      {{.*}} - [[PREFIX]]{{[/\\]}}t.c
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}t.c
+// ORDER:      {{.*}} - PREFIX{{[/\\]}}t.c
+// ORDER-NEXT: PREFIX{{[/\\]}}t.c
 // ORDER-NEXT: 1:1 <built-in>
-// ORDER-NEXT:   [[PREFIX]]{{[/\\]}}top.h
-// ORDER-NEXT:     [[PREFIX]]{{[/\\]}}n1.h
-// ORDER-NEXT:       [[PREFIX]]{{[/\\]}}n2.h
-// ORDER-NEXT:     [[PREFIX]]{{[/\\]}}n3.h
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}n3.h
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}n2.h
+// ORDER-NEXT:   PREFIX{{[/\\]}}top.h
+// ORDER-NEXT:     PREFIX{{[/\\]}}n1.h
+// ORDER-NEXT:       PREFIX{{[/\\]}}n2.h
+// ORDER-NEXT:     PREFIX{{[/\\]}}n3.h
+// ORDER-NEXT: PREFIX{{[/\\]}}n3.h
+// ORDER-NEXT: PREFIX{{[/\\]}}n2.h
 // ORDER-NEXT: Files:
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}t.c
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}top.h
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}n1.h
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}n2.h
-// ORDER-NEXT: [[PREFIX]]{{[/\\]}}n3.h
-// ORDER-NOT: [[PREFIX]]
+// ORDER-NEXT: PREFIX{{[/\\]}}t.c
+// ORDER-NEXT: PREFIX{{[/\\]}}top.h
+// ORDER-NEXT: PREFIX{{[/\\]}}n1.h
+// ORDER-NEXT: PREFIX{{[/\\]}}n2.h
+// ORDER-NEXT: PREFIX{{[/\\]}}n3.h
+// ORDER-NOT: PREFIX
 
 // Full dependency output
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-include-tree-full -cas-path %t/cas > %t/deps.json
diff --git a/clang/test/ClangScanDeps/modules-include-tree-has-include-umbrella-header.c b/clang/test/ClangScanDeps/modules-include-tree-has-include-umbrella-header.c
@@ -50,10 +50,10 @@ module Dependency { header "dependency.h" }
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-include-tree-full -cas-path %t/cas > %t/deps.json
 // RUN: %deps-to-rsp %t/deps.json --tu-index 0 > %t/tu.rsp
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%t
 
 // Let's check that the TU actually imports FW_Private.B instead of treating FW/B.h as textual.
-// CHECK:      [[PREFIX]]/tu.c llvmcas://
+// CHECK:      [[PREFIX]]{{/|\\}}tu.c llvmcas://
 // CHECK-NEXT: 1:1 <built-in> llvmcas://
 // CHECK-NEXT: 2:1 (Module) Poison
 // CHECK-NEXT: 7:1 (Module) Import
diff --git a/clang/test/ClangScanDeps/modules-include-tree-implementation-private.c b/clang/test/ClangScanDeps/modules-include-tree-implementation-private.c
@@ -14,7 +14,7 @@
 
 // RUN: %deps-to-rsp %t/deps.json --tu-index 0 > %t/tu.rsp
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%t
 // RUN: %clang @%t/tu.rsp
 //
 // RUN: FileCheck %s -input-file=%t/tu.d -check-prefix DEPS
@@ -24,11 +24,11 @@
 // DEPS-DAG: Mod.h
 // DEPS-DAG: Priv.h
 
-// CHECK: [[PREFIX]]/tu.m llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}tu.m llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
-// CHECK: 2:1 [[PREFIX]]/Mod.framework/Headers/Mod.h llvmcas://
+// CHECK: 2:1 [[PREFIX]]{{/|\\}}Mod.framework{{/|\\}}Headers{{/|\\}}Mod.h llvmcas://
 // CHECK:   Submodule: Mod
-// CHECK: 3:1 [[PREFIX]]/Mod.framework/PrivateHeaders/Priv.h  llvmcas://
+// CHECK: 3:1 [[PREFIX]]{{/|\\}}Mod.framework{{/|\\}}PrivateHeaders{{/|\\}}Priv.h  llvmcas://
 // CHECK:   Submodule: Mod_Private
 // CHECK: 4:1 (Module for visibility only) Mod
 // CHECK: 5:1 (Module for visibility only) Mod_Private
@@ -39,12 +39,12 @@
 // CHECK:   link Mod (framework)
 
 // CHECK: Files:
-// CHECK: [[PREFIX]]/tu.m llvmcas://
-// CHECK-NOT: [[PREFIX]]/module.modulemap
-// CHECK: [[PREFIX]]/Mod.framework/Headers/Mod.h llvmcas://
-// CHECK-NOT: [[PREFIX]]/module.modulemap
-// CHECK: [[PREFIX]]/Mod.framework/PrivateHeaders/Priv.h llvmcas://
-// CHECK-NOT: [[PREFIX]]/module.modulemap
+// CHECK: [[PREFIX]]{{/|\\}}tu.m llvmcas://
+// CHECK-NOT: [[PREFIX]]{{/|\\}}module.modulemap
+// CHECK: [[PREFIX]]{{/|\\}}Mod.framework{{/|\\}}Headers{{/|\\}}Mod.h llvmcas://
+// CHECK-NOT: [[PREFIX]]{{/|\\}}module.modulemap
+// CHECK: [[PREFIX]]{{/|\\}}Mod.framework{{/|\\}}PrivateHeaders{{/|\\}}Priv.h llvmcas://
+// CHECK-NOT: [[PREFIX]]{{/|\\}}module.modulemap
 
 //--- cdb.json.template
 [{
diff --git a/clang/test/ClangScanDeps/modules-include-tree-implementation-transitive.c b/clang/test/ClangScanDeps/modules-include-tree-implementation-transitive.c
@@ -38,11 +38,11 @@ module Mod { header "Mod.h" }
 
 // RUN: cat %t/cas-tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid > %t/tu-include-tree.txt
-// RUN: FileCheck %s -input-file %t/tu-include-tree.txt -DPREFIX=%/t
-// CHECK:      [[PREFIX]]/tu.m llvmcas://
+// RUN: FileCheck %s -input-file %t/tu-include-tree.txt -DPREFIX=%t
+// CHECK:      [[PREFIX]]{{/|\\}}tu.m llvmcas://
 // CHECK-NEXT: 1:1 <built-in> llvmcas://
 // CHECK-NEXT: 2:1 (Module) Mod
-// CHECK-NEXT: 3:1 [[PREFIX]]/frameworks/FW.framework/Headers/Sub.h llvmcas://{{.*}}
+// CHECK-NEXT: 3:1 [[PREFIX]]{{/|\\}}frameworks{{/|\\}}FW.framework{{/|\\}}Headers{{/|\\}}Sub.h llvmcas://{{.*}}
 // CHECK-NEXT:   Submodule: FW
 
 // RUN: %clang @%t/cas-FW.cc1.rsp
diff --git a/clang/test/ClangScanDeps/modules-include-tree-implementation-via-spurious.c b/clang/test/ClangScanDeps/modules-include-tree-implementation-via-spurious.c
@@ -63,10 +63,10 @@ static mod_int x;
 
 // RUN: cat %t/cas-tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid > %t/tu-include-tree.txt
-// RUN: FileCheck %s -input-file %t/tu-include-tree.txt -DPREFIX=%/t
-// CHECK:      [[PREFIX]]/tu.m llvmcas://
+// RUN: FileCheck %s -input-file %t/tu-include-tree.txt -DPREFIX=%t
+// CHECK:      [[PREFIX]]{{/|\\}}tu.m llvmcas://
 // CHECK-NEXT: 1:1 <built-in> llvmcas://
-// CHECK-NEXT: 2:1 (Spurious import) (Module) Spurious.Missing [[PREFIX]]/frameworks/Spurious.framework/Headers/Missing.h llvmcas://
+// CHECK-NEXT: 2:1 (Spurious import) (Module) Spurious.Missing [[PREFIX]]{{/|\\}}frameworks{{/|\\}}Spurious.framework{{/|\\}}Headers{{/|\\}}Missing.h llvmcas://
 // CHECK-NEXT: 3:1 (Module for visibility only) Mod
 
 // RUN: %clang @%t/cas-Mod.cc1.rsp
diff --git a/clang/test/ClangScanDeps/modules-include-tree-implementation.c b/clang/test/ClangScanDeps/modules-include-tree-implementation.c
@@ -14,7 +14,7 @@
 
 // RUN: %deps-to-rsp %t/deps.json --tu-index 0 > %t/tu.rsp
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid | FileCheck %s -DPREFIX=%t
 // RUN: %clang @%t/tu.rsp
 
 // CHECK: [[PREFIX]]{{[/\\]}}tu.c llvmcas://{{[[:xdigit:]]+}}
@@ -31,9 +31,9 @@
 
 // CHECK: Files:
 // CHECK: [[PREFIX]]{{[/\\]}}tu.c llvmcas://{{[[:xdigit:]]+}}
-// CHECK-NOT: [[PREFIX]]/module.modulemap
+// CHECK-NOT: [[PREFIX]]{{[/\\]}}module.modulemap
 // CHECK: [[PREFIX]]{{[/\\]}}Mod.h llvmcas://{{[[:xdigit:]]+}}
-// CHECK-NOT: [[PREFIX]]/module.modulemap
+// CHECK-NOT: [[PREFIX]]{{[/\\]}}module.modulemap
 
 // RUN: %deps-to-rsp %t/deps.json --tu-index 1 > %t/tu_missing_module.rsp
 // RUN: %clang @%t/tu_missing_module.rsp
diff --git a/clang/test/ClangScanDeps/modules-include-tree-inferred.m b/clang/test/ClangScanDeps/modules-include-tree-inferred.m
@@ -12,7 +12,7 @@
 // RUN: %deps-to-rsp %t/deps.json --module-name Mod > %t/Mod.rsp
 // RUN: %deps-to-rsp %t/deps.json --tu-index 0 > %t/tu.rsp
 // RUN: cat %t/Mod.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/Mod.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/Mod.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/Mod.casid | FileCheck %s -DPREFIX=%t
 // RUN: %clang @%t/Mod.rsp
 // RUN: %clang @%t/tu.rsp
 
diff --git a/clang/test/ClangScanDeps/modules-include-tree-missing-submodule.c b/clang/test/ClangScanDeps/modules-include-tree-missing-submodule.c
@@ -32,7 +32,7 @@
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/Foo.casid >> %t/result.txt
 // RUN: echo "TRANSLATION UNIT" >> %t/result.txt
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid >> %t/result.txt
-// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%/t
+// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%t
 
 // CHECK-LABEL: MODULE Foo
 // CHECK: <module-includes> llvmcas://
@@ -48,7 +48,7 @@
 
 // CHECK-LABEL: TRANSLATION UNIT
 // CHECK: (PCH) <PCH> llvmcas://
-// CHECK: [[PREFIX]]/tu.c llvmcas://
+// CHECK: [[PREFIX]]{{[/\\]}}tu.c llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
 // CHECK: 2:1 (Spurious import) (Module) Foo.Bar [[PREFIX]]{{[/\\]}}Foo.framework{{[/\\]}}Headers{{[/\\]}}Bar.h llvmcas://
 
diff --git a/clang/test/ClangScanDeps/modules-include-tree-pch-with-private.c b/clang/test/ClangScanDeps/modules-include-tree-pch-with-private.c
@@ -42,7 +42,7 @@
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid >> %t/result.txt
 
 // Explicitly check that Mod_Private is imported as a module and not a header.
-// RUN: FileCheck %s -DPREFIX=%/t -input-file %t/result.txt
+// RUN: FileCheck %s -DPREFIX=%t -input-file %t/result.txt
 
 // CHECK-LABEL: MODULE Indirect2
 // CHECK: <module-includes> llvmcas://
@@ -54,7 +54,7 @@
 
 // CHECK-LABEL: TRANSLATION UNIT
 // CHECK: (PCH) <PCH> llvmcas://
-// CHECK: [[PREFIX]]/tu.m llvmcas://
+// CHECK: [[PREFIX]]{{[/\\]}}tu.m llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
 // CHECK: 2:1 (Module) Mod_Private
 // CHECK: 3:1 (Module) Indirect2
diff --git a/clang/test/ClangScanDeps/modules-include-tree-vfsoverlay.c b/clang/test/ClangScanDeps/modules-include-tree-vfsoverlay.c
@@ -24,25 +24,25 @@
 // RUN: echo "TRANSLATION UNIT" >> %t/result.txt
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid >> %t/result.txt
 
-// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%/t
+// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%t
 
 // CHECK-LABEL: MODULE A
 // CHECK: <module-includes> llvmcas://
-// CHECK: 2:1 [[PREFIX]]/elsewhere2/A.h llvmcas://
+// CHECK: 2:1 [[PREFIX]]{{/|\\}}elsewhere2{{/|\\}}A.h llvmcas://
 // CHECK:   Submodule: A
 // CHECK: Module Map:
 // CHECK: A (framework)
 // CHECK:   link A (framework)
 // CHECK: Files:
 // CHECK-NOT: modulemap
-// CHECK: [[PREFIX]]/elsewhere2/A.h llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}elsewhere2{{/|\\}}A.h llvmcas://
 // CHECK-NOT: modulemap
 
 // CHECK-LABEL: TRANSLATION UNIT
 // CHECK: Files:
 // CHECK-NOT: .modulemap
 // CHECK-NOT: .yaml
-// CHECK: [[PREFIX]]/elsewhere2/A.h llvmcas://
+// CHECK: [[PREFIX]]{{/|\\}}elsewhere2{{/|\\}}A.h llvmcas://
 // CHECK-NOT: .modulemap
 // CHECK-NOT: .yaml
 
diff --git a/clang/test/ClangScanDeps/modules-include-tree-working-directory.c b/clang/test/ClangScanDeps/modules-include-tree-working-directory.c
@@ -20,7 +20,7 @@
 // CACHE-HIT: remark: compile job cache hit
 
 // RUN: cat %t/H.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/H.casid
-// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/H.casid | FileCheck %s -DPREFIX=%/t
+// RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/H.casid | FileCheck %s -DPREFIX=%t
 
 // CHEK:C <module-includes>
 // CHECK: 2:1 [[PREFIX]]{{[/\\]}}relative{{[/\\]}}h1.h llvmcas://
