Canonicalize clang-scan-deps input-file/file-deps paths for Windows

Author: hjyamauchi

clang/tools/clang-scan-deps/ClangScanDeps.cpp

@@ -601,13 +601,19 @@ static bool useCAS() {
 }
 
 template <typename Container>
-static auto toJSONStrings(llvm::json::OStream &JOS, Container &&Strings) {
-  return [&JOS, Strings = std::forward<Container>(Strings)] {
+static auto toJSONStrings(llvm::json::OStream &JOS, Container &&Strings,
+                          bool CanonicalizePath = false) {
+  return [&JOS, Strings = std::forward<Container>(Strings), CanonicalizePath] {
     for (StringRef Str : Strings)
       // Not reporting SDKSettings.json so that test checks can remain (mostly)
       // platform-agnostic.
       if (!Str.ends_with("SDKSettings.json"))
-        JOS.value(Str);
+        if (CanonicalizePath) {
+          llvm::SmallString<261> Path = Str;
+          llvm::sys::path::make_preferred(Path);
+          JOS.value(Path.str());
+        } else
+          JOS.value(Str);
   };
 }
 
@@ -810,8 +816,11 @@ class FullDeps {
                                        toJSONStrings(JOS, Cmd.Arguments));
                     JOS.attribute("executable", StringRef(Cmd.Executable));
                     JOS.attributeArray("file-deps",
-                                       toJSONStrings(JOS, I.FileDeps));
-                    JOS.attribute("input-file", StringRef(I.FileName));
+                                       toJSONStrings(JOS, I.FileDeps,
+                                                     /*CanonicalizePath*/true));
+                    llvm::SmallString<261> InputFile = StringRef(I.FileName);
+                    llvm::sys::path::make_preferred(InputFile);
+                    JOS.attribute("input-file", InputFile.str());
                     if (EmitVisibleModules)
                       JOS.attributeArray("visible-clang-modules",
                                          toJSONSorted(JOS, I.VisibleModules));
@@ -840,8 +849,11 @@ class FullDeps {
                                      toJSONStrings(JOS, I.DriverCommandLine));
                   JOS.attribute("executable", "clang");
                   JOS.attributeArray("file-deps",
-                                     toJSONStrings(JOS, I.FileDeps));
-                  JOS.attribute("input-file", StringRef(I.FileName));
+                                     toJSONStrings(JOS, I.FileDeps,
+                                                   /*CanonicalizePath*/true));
+                  llvm::SmallString<261> InputFile = StringRef(I.FileName);
+                  llvm::sys::path::make_preferred(InputFile);
+                  JOS.attribute("input-file", InputFile.str());
                   if (EmitVisibleModules)
                     JOS.attributeArray("visible-clang-modules",
                                        toJSONSorted(JOS, I.VisibleModules));