Fix the following CAS-related tests on Windows (#11236)

hjyamauchi · hjyamauchi · commit 379272704f2d · 2025-10-07T11:34:31.000-07:00
Clang :: ClangScanDeps/include-tree.c Clang :: ClangScanDeps/modules-cas-context-hash.c Clang :: ClangScanDeps/modules-cas-full-by-mod-name.c Clang :: ClangScanDeps/modules-cas-module-cache-hash.c Clang :: ClangScanDeps/modules-cas-trees-exclude-files-from-casfs.c Clang :: ClangScanDeps/modules-include-tree-implementation.c Clang :: ClangScanDeps/modules-include-tree-inferred.m Clang :: ClangScanDeps/modules-include-tree-missing-submodule.c Clang :: ClangScanDeps/modules-include-tree-pch-with-private.c Clang :: ClangScanDeps/modules-include-tree-submodules.c Clang :: ClangScanDeps/modules-include-tree-with-pch.c Clang :: ClangScanDeps/modules-include-tree-working-directory.c Clang :: ClangScanDeps/modules-include-tree.c Clang :: Index/Core/scan-deps-cas.m LLVM :: tools/llvm-cas/merge.test LLVM :: tools/llvm-cas/print-id.test LLVM :: tools/llvm-cas/validation.test (Cherry picked from commit 78d4387)
diff --git a/clang/test/ClangScanDeps/include-tree.c b/clang/test/ClangScanDeps/include-tree.c
@@ -12,21 +12,21 @@
 // Make sure order is as expected.
 // RUN: FileCheck %s -input-file %t/result1.txt -DPREFIX=%/t -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-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
@@ -40,7 +40,7 @@
 
 // Capture the tree id from experimental-include-tree ; ensure that it matches
 // the result from experimental-full.
-// FULL: [[TREE_ID:llvmcas://[[:xdigit:]]+]] - [[PREFIX]]/t.c
+// FULL: [[TREE_ID:llvmcas://[[:xdigit:]]+]] - [[PREFIX]]{{[/\\]}}t.c
 // FULL: FULL DEPS START
 
 // FULL-NEXT: {
@@ -67,7 +67,7 @@
 // FULL-NEXT:             "t.c"
 // FULL-NOT:              "t.c"
 // FULL:                ]
-// FULL:                "executable": "[[CLANG]]"
+// FULL:                "{{.*[\\/]clang(\.exe)?}}",
 // FULL:                "file-deps": [
 // FULL-NEXT:             "[[PREFIX]]/t.c"
 // FULL-NEXT:             "[[PREFIX]]/top.h"
@@ -110,16 +110,16 @@
 //--- t.c
 
 #include "top.h" // this is top
-// CHECK: [[@LINE]]:1 [[PREFIX]]/top.h
+// CHECK: [[@LINE]]:1 [[PREFIX]]{{[/\\]}}top.h
 
 // Skipped because of macro guard.
 #include "n1.h"
 
 #include "n3.h"
-// CHECK-DAG: [[@LINE]]:1 [[PREFIX]]/n3.h
+// CHECK-DAG: [[@LINE]]:1 [[PREFIX]]{{[/\\]}}n3.h
 
 #include "n2.h"
-// CHECK-DAG: [[@LINE]]:1 [[PREFIX]]/n2.h
+// CHECK-DAG: [[@LINE]]:1 [[PREFIX]]{{[/\\]}}n2.h
 
 //--- top.h
 #ifndef _TOP_H_
@@ -131,10 +131,10 @@ typedef int MyT;
 
 #define WHATEVER 1
 #include "n1.h"
-// CHECK-DAG:   [[@LINE]]:1 [[PREFIX]]/n1.h
+// CHECK-DAG:   [[@LINE]]:1 [[PREFIX]]{{[/\\]}}n1.h
 
 #include "n3.h"
-// CHECK-DAG:   [[@LINE]]:1 [[PREFIX]]/n3.h
+// CHECK-DAG:   [[@LINE]]:1 [[PREFIX]]{{[/\\]}}n3.h
 
 #define ANOTHER 2
 
@@ -149,7 +149,7 @@ struct S {
 
 int x1;
 #include "n2.h"
-// CHECK-DAG:     [[@LINE]]:1 [[PREFIX]]/n2.h
+// CHECK-DAG:     [[@LINE]]:1 [[PREFIX]]{{[/\\]}}n2.h
 
 int x2;
 
diff --git a/clang/test/ClangScanDeps/modules-cas-context-hash.c b/clang/test/ClangScanDeps/modules-cas-context-hash.c
@@ -12,7 +12,7 @@
 // RUN:   -cas-path %t/cas2 -format experimental-include-tree-full \
 // RUN:   >> %t/result.json
 
-// RUN: cat %t/result.json | FileCheck %s -DPREFIX=%/t
+// RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t
 
 // CHECK: "modules": [
 // CHECK:   {
@@ -105,4 +105,4 @@ module Mod { header "Mod.h" }
 //--- Mod.h
 
 //--- tu.c
-#include "Mod.h"
+#include "Mod.h"
diff --git a/clang/test/ClangScanDeps/modules-include-tree-implementation.c b/clang/test/ClangScanDeps/modules-include-tree-implementation.c
@@ -17,22 +17,22 @@
 // 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:]]+}}
+// CHECK: [[PREFIX]]{{[/\\]}}tu.c llvmcas://{{[[:xdigit:]]+}}
 // CHECK: 1:1 <built-in> llvmcas://{{[[:xdigit:]]+}}
 
 // Note: this is surprising, but correct: when building the implementation files
 // of a module, the first include is textual but still uses the submodule
 // machinery. The second include is treated as a module import (unless in a PCH)
 // but will not actually import the module only trigger visibility changes.
 
-// CHECK: 2:1 [[PREFIX]]/Mod.h llvmcas://{{[[:xdigit:]]+}}
+// CHECK: 2:1 [[PREFIX]]{{[/\\]}}Mod.h llvmcas://{{[[:xdigit:]]+}}
 // CHECK:   Submodule: Mod
 // CHECK: 3:1 (Module for visibility only) Mod
 
 // CHECK: Files:
-// CHECK: [[PREFIX]]/tu.c llvmcas://{{[[:xdigit:]]+}}
+// CHECK: [[PREFIX]]{{[/\\]}}tu.c llvmcas://{{[[:xdigit:]]+}}
 // CHECK-NOT: [[PREFIX]]/module.modulemap
-// CHECK: [[PREFIX]]/Mod.h llvmcas://{{[[:xdigit:]]+}}
+// CHECK: [[PREFIX]]{{[/\\]}}Mod.h llvmcas://{{[[:xdigit:]]+}}
 // CHECK-NOT: [[PREFIX]]/module.modulemap
 
 // RUN: %deps-to-rsp %t/deps.json --tu-index 1 > %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
@@ -18,15 +18,15 @@
 
 // CHECK: <module-includes> 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: Module Map:
 // CHECK: Mod (framework)
 // CHECK:   link Mod (framework)
 // CHECK: Files:
-// CHECK-NOT: [[PREFIX]]/module.modulemap
-// CHECK: [[PREFIX]]/Mod.framework/Headers/Mod.h llvmcas://
-// CHECK-NOT: [[PREFIX]]/module.modulemap
+// CHECK-NOT: [[PREFIX]]{{[/\\]}}module.modulemap
+// CHECK: [[PREFIX]]{{[/\\]}}Mod.framework{{[/\\]}}Headers{{[/\\]}}Mod.h llvmcas://
+// CHECK-NOT: [[PREFIX]]{{[/\\]}}module.modulemap
 
 //--- cdb.json.template
 [{
diff --git a/clang/test/ClangScanDeps/modules-include-tree-missing-submodule.c b/clang/test/ClangScanDeps/modules-include-tree-missing-submodule.c
@@ -37,7 +37,7 @@
 // CHECK-LABEL: MODULE Foo
 // CHECK: <module-includes> llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
-// CHECK: 2:1 [[PREFIX]]/Foo.framework/Headers/Foo.h llvmcas://
+// CHECK: 2:1 [[PREFIX]]{{[/\\]}}Foo.framework{{[/\\]}}Headers{{[/\\]}}Foo.h llvmcas://
 // CHECK:   Submodule: Foo
 // CHECK-NOT: Bar
 // CHECK: Module Map:
@@ -50,7 +50,7 @@
 // CHECK: (PCH) <PCH> 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://
+// CHECK: 2:1 (Spurious import) (Module) Foo.Bar [[PREFIX]]{{[/\\]}}Foo.framework{{[/\\]}}Headers{{[/\\]}}Bar.h llvmcas://
 
 // RUN: %clang @%t/tu.rsp
 
diff --git a/clang/test/ClangScanDeps/modules-include-tree-pch-with-private.c b/clang/test/ClangScanDeps/modules-include-tree-pch-with-private.c
@@ -47,7 +47,7 @@
 // CHECK-LABEL: MODULE Indirect2
 // CHECK: <module-includes> llvmcas://
 // CHECK: 1:1 <built-in> llvmcas://
-// CHECK: 2:1 [[PREFIX]]/indirect2.h llvmcas://
+// CHECK: 2:1 [[PREFIX]]{{[/\\]}}indirect2.h llvmcas://
 // CHECK:   Submodule: Indirect2
 // CHECK:   2:1 (Module) Indirect1
 // CHECK:   3:1 (Module) Mod_Private
diff --git a/clang/test/ClangScanDeps/modules-include-tree-submodules.c b/clang/test/ClangScanDeps/modules-include-tree-submodules.c
@@ -30,7 +30,7 @@
 // RUN: echo "TRANSLATION UNIT 2" >> %t/result.txt
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu2.casid >> %t/result.txt
 
-// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%/t
+// RUN: cat %t/result.txt | sed 's/\\/\//g' | FileCheck %s -DPREFIX=%/t
 
 // Build the include-tree commands
 // RUN: %clang @%t/TwoSubs.rsp
diff --git a/clang/test/ClangScanDeps/modules-include-tree-with-pch.c b/clang/test/ClangScanDeps/modules-include-tree-with-pch.c
@@ -34,7 +34,7 @@
 // RUN: rm -rf %t/outputs
 // RUN: %clang @%t/tu.rsp
 
-// RUN: FileCheck %s -input-file %t/deps.json -DPREFIX=%/t
+// RUN: cat %t/deps.json | sed 's/\\\\/\//g' | FileCheck %s -DPREFIX=%/t
 
 // CHECK:      {
 // CHECK-NEXT:  "modules": [
diff --git a/clang/test/ClangScanDeps/modules-include-tree-working-directory.c b/clang/test/ClangScanDeps/modules-include-tree-working-directory.c
@@ -23,9 +23,9 @@
 // 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://
+// CHECK: 2:1 [[PREFIX]]{{[/\\]}}relative{{[/\\]}}h1.h llvmcas://
 // CHECK: Files:
-// CHECK: [[PREFIX]]/relative/h1.h llvmcas://
+// CHECK: [[PREFIX]]{{[/\\]}}relative{{[/\\]}}h1.h llvmcas://
 
 //--- cdb.json.template
 [{
diff --git a/clang/test/ClangScanDeps/modules-include-tree.c b/clang/test/ClangScanDeps/modules-include-tree.c
@@ -33,7 +33,7 @@
 // RUN: clang-cas-test -cas %t/cas -print-include-tree @%t/tu.casid >> %t/result.txt
 // RUN: cat %t/deps.json >> %t/result.txt
 
-// RUN: FileCheck %s -input-file %t/result.txt -DPREFIX=%/t
+// RUN: cat %t/result.txt | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t
 
 // CHECK-LABEL: MODULE Top
 // CHECK: <module-includes> llvmcas://{{[[:xdigit:]]+}}
diff --git a/clang/test/Index/Core/scan-deps-cas.m b/clang/test/Index/Core/scan-deps-cas.m
@@ -6,19 +6,19 @@
 // RUN:  -- %clang -c -I %S/Inputs/module \
 // RUN:     -fmodules -fmodules-cache-path=%t/mcpit \
 // RUN:     -o FoE.o -x objective-c %s > %t.result
-// RUN: cat %t.result | sed 's/\\/\//g' | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t -check-prefix=INCLUDE_TREE
+// RUN: cat %t.result | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t -check-prefix=INCLUDE_TREE
 
 // RUN: env CLANG_CACHE_USE_CASFS_DEPSCAN=1 c-index-test core --scan-deps -working-dir %S -output-dir=%t -cas-path %t/cas \
 // RUN:  -- %clang -c -I %S/Inputs/module \
 // RUN:     -fmodules -fmodules-cache-path=%t/mcp \
 // RUN:     -o FoE.o -x objective-c %s > %t.casfs.result
-// RUN: cat %t.casfs.result | sed 's/\\/\//g' | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t
+// RUN: cat %t.casfs.result | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t
 
 // RUN: env CLANG_CACHE_USE_INCLUDE_TREE=1 c-index-test core --scan-deps -working-dir %S -output-dir=%t -cas-path %t/cas \
 // RUN:  -- %clang -c -I %S/Inputs/module \
 // RUN:     -fmodules -fmodules-cache-path=%t/mcpit \
 // RUN:     -o FoE.o -x objective-c %s > %t.includetree.result
-// RUN: cat %t.includetree.result | sed 's/\\/\//g' | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t -check-prefix=INCLUDE_TREE
+// RUN: cat %t.includetree.result | FileCheck %s -DPREFIX=%S -DOUTPUTS=%/t -check-prefix=INCLUDE_TREE
 
 // RUN: c-index-test core --scan-deps -working-dir %S -output-dir=%t \
 // RUN:  -- %clang -c -I %S/Inputs/module \
@@ -35,15 +35,15 @@
 // CHECK-NEXT:     name: ModA
 // CHECK-NEXT:     context-hash: [[HASH_MOD_A:[A-Z0-9]+]]
 // CHECK-NEXT:     cwd-ignored: 0
-// CHECK-NEXT:     module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
+// CHECK-NEXT:     module-map-path: [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}module.modulemap
 // CHECK-NEXT:     casfs-root-id: [[CASFS_MODA_ROOT_ID:llvmcas://[[:xdigit:]]+]]
 // CHECK-NEXT:     cache-key: [[CASFS_MODA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
 // CHECK-NEXT:     module-deps:
 // CHECK-NEXT:     file-deps:
-// CHECK-NEXT:       [[PREFIX]]/Inputs/module/module.modulemap
-// CHECK-NEXT:       [[PREFIX]]/Inputs/module/ModA.h
-// CHECK-NEXT:       [[PREFIX]]/Inputs/module/SubModA.h
-// CHECK-NEXT:       [[PREFIX]]/Inputs/module/SubSubModA.h
+// CHECK-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}module.modulemap
+// CHECK-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}ModA.h
+// CHECK-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}SubModA.h
+// CHECK-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}SubSubModA.h
 // CHECK-NEXT:     link libraries:
 // CHECK-NEXT:         libModA(framework)
 // CHECK-NEXT:         libModB
@@ -65,7 +65,7 @@
 // CHECK-NEXT:     module-deps:
 // CHECK-NEXT:       ModA:[[HASH_MOD_A]]
 // CHECK-NEXT:     file-deps:
-// CHECK-NEXT:       [[PREFIX]]/scan-deps-cas.m
+// CHECK-NEXT:       [[PREFIX]]{{[/\\]}}scan-deps-cas.m
 // CHECK-NEXT:     build-args:
 // CHECK-SAME:       -cc1
 // CHECK-SAME:       -fcas-path
@@ -80,15 +80,15 @@
 // INCLUDE_TREE-NEXT:     name: ModA
 // INCLUDE_TREE-NEXT:     context-hash: [[HASH_MOD_A:[A-Z0-9]+]]
 // INCLUDE_TREE-NEXT:     cwd-ignored: 0
-// INCLUDE_TREE-NEXT:     module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
+// INCLUDE_TREE-NEXT:     module-map-path: [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}module.modulemap
 // INCLUDE_TREE-NEXT:     include-tree-id: [[ModA_INCLUDE_TREE_ID:llvmcas://[[:xdigit:]]+]]
 // INCLUDE_TREE-NEXT:     cache-key: [[ModA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
 // INCLUDE_TREE-NEXT:     module-deps:
 // INCLUDE_TREE-NEXT:     file-deps:
-// INCLUDE_TREE-NEXT:       [[PREFIX]]/Inputs/module/module.modulemap
-// INCLUDE_TREE-NEXT:       [[PREFIX]]/Inputs/module/ModA.h
-// INCLUDE_TREE-NEXT:       [[PREFIX]]/Inputs/module/SubModA.h
-// INCLUDE_TREE-NEXT:       [[PREFIX]]/Inputs/module/SubSubModA.h
+// INCLUDE_TREE-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}module.modulemap
+// INCLUDE_TREE-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}ModA.h
+// INCLUDE_TREE-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}SubModA.h
+// INCLUDE_TREE-NEXT:       [[PREFIX]]{{[/\\]}}Inputs{{[/\\]}}module{{[/\\]}}SubSubModA.h
 // INCLUDE_TREE-NEXT:     link libraries:
 // INCLUDE_TREE-NEXT:         libModA(framework)
 // INCLUDE_TREE-NEXT:         libModB
@@ -107,7 +107,7 @@
 // INCLUDE_TREE-NEXT:     module-deps:
 // INCLUDE_TREE-NEXT:       ModA:[[HASH_MOD_A]]
 // INCLUDE_TREE-NEXT:     file-deps:
-// INCLUDE_TREE-NEXT:       [[PREFIX]]/scan-deps-cas.m
+// INCLUDE_TREE-NEXT:       [[PREFIX]]{{[/\\]}}scan-deps-cas.m
 // INCLUDE_TREE-NEXT:     build-args:
 // INCLUDE_TREE-SAME:       -cc1
 // INCLUDE_TREE-SAME:       -fcas-path
diff --git a/llvm/include/llvm/CAS/FileSystemCache.h b/llvm/include/llvm/CAS/FileSystemCache.h
@@ -27,6 +27,37 @@
 namespace llvm {
 namespace cas {
 
+// Used to create StringRef from Twine and slash canonicalization on
+// Windows.
+struct PathStorage {
+  SmallString<261> Storage;
+  StringRef Path;
+  PathStorage() {}
+  PathStorage(const Twine &InputPath,
+              sys::path::Style Style = sys::path::Style::native) {
+    if (is_style_windows(Style)) {
+      // Canonicalize to backslahes
+      InputPath.toVector(Storage);
+      llvm::sys::path::make_preferred(Storage, Style);
+      Path = Storage.str();
+    } else {
+      InputPath.toVector(Storage);
+      Path = Storage.str();
+    }
+  }
+  PathStorage(StringRef InputPath,
+              sys::path::Style Style = sys::path::Style::native) {
+    if (is_style_windows(Style)) {
+      // Canonicalize to backslahes
+      Storage = InputPath;
+      llvm::sys::path::make_preferred(Storage, Style);
+      Path = Storage.str();
+    } else {
+      Path = InputPath;
+    }
+  }
+};
+
 /// Caching for lazily discovering a CAS-based filesystem.
 ///
 /// FIXME: Extract most of this into llvm::vfs::FileSystemCache, so that it can
@@ -187,8 +218,7 @@ class FileSystemCache : public ThreadSafeRefCountedBase<FileSystemCache> {
 
   std::error_code setCurrentWorkingDirectory(const Twine &Path);
 
-  static StringRef canonicalizeWorkingDirectory(const Twine &Path,
-                                                sys::path::Style PathStyle,
+  static StringRef canonicalizeWorkingDirectory(sys::path::Style PathStyle,
                                                 StringRef WorkingDirectory,
                                                 SmallVectorImpl<char> &Storage);
 
diff --git a/llvm/lib/CAS/CASFileSystem.cpp b/llvm/lib/CAS/CASFileSystem.cpp
diff --git a/llvm/lib/CAS/CachingOnDiskFileSystem.cpp b/llvm/lib/CAS/CachingOnDiskFileSystem.cpp
diff --git a/llvm/lib/CAS/FileSystemCache.cpp b/llvm/lib/CAS/FileSystemCache.cpp
