Fix path

Signed-off-by: Jiang, Zhiwei <zhiwei.jiang@intel.com>

Author: zhiweij1

clang/include/clang/Tooling/Core/Replacement.h

@@ -478,8 +478,7 @@ class AddFileHunk : public Hunk {
 
 public:
   AddFileHunk() : Hunk(AddFile) {}
-  AddFileHunk(std::string NewFilePath)
-      : Hunk(AddFile), NewFilePath(std::move(NewFilePath)) {}
+  AddFileHunk(std::string NewFilePath);
   const std::string &getNewFilePath() const { return NewFilePath; }
 };
 
@@ -488,8 +487,7 @@ class DeleteFileHunk : public Hunk {
 
 public:
   DeleteFileHunk() : Hunk(DeleteFile) {}
-  DeleteFileHunk(std::string OldFilePath)
-      : Hunk(DeleteFile), OldFilePath(std::move(OldFilePath)) {}
+  DeleteFileHunk(std::string OldFilePath);
   const std::string &getOldFilePath() const { return OldFilePath; }
 };
 

clang/lib/DPCT/IncMigration/ReMigration.cpp

@@ -11,6 +11,33 @@
 
 namespace clang::dpct {
 
+static void dumpGitDiffChanges(const clang::tooling::GitDiffChanges& GHC) {
+  llvm::errs() << "GitDiffChanges:\n";
+  llvm::errs() << "  ModifyFileHunks:\n";
+  for (const auto &Hunk : GHC.ModifyFileHunks) {
+    llvm::errs() << "    - FilePath:        " << Hunk.getFilePath() << "\n";
+    llvm::errs() << "      Offset:          " << Hunk.getOffset() << "\n";
+    llvm::errs() << "      Length:          " << Hunk.getLength() << "\n";
+    llvm::errs() << "      ReplacementText: " << Hunk.getReplacementText() << "\n";
+  }
+  llvm::errs() << "  AddFileHunks:\n";
+  for (const auto &Hunk : GHC.AddFileHunks) {
+    llvm::errs() << "    - NewFilePath: " << Hunk.getNewFilePath() << "\n";
+  }
+  llvm::errs() << "  DeleteFileHunks:\n";
+  for (const auto &Hunk : GHC.DeleteFileHunks) {
+    llvm::errs() << "    - OldFilePath: " << Hunk.getOldFilePath() << "\n";
+  }
+  llvm::errs() << "  MoveFileHunks:\n";
+  for (const auto &Hunk : GHC.MoveFileHunks) {
+    llvm::errs() << "    - FilePath:        " << Hunk.getFilePath() << "\n";
+    llvm::errs() << "      Offset:          " << Hunk.getOffset() << "\n";
+    llvm::errs() << "      Length:          " << Hunk.getLength() << "\n";
+    llvm::errs() << "      ReplacementText: " << Hunk.getReplacementText() << "\n";
+    llvm::errs() << "      NewFilePath:     " << Hunk.getNewFilePath() << "\n";
+  }
+}
+
 void tryLoadingUpstreamChangesAndUserChanges() {
   llvm::SmallString<128> UpstreamChangesFilePath(
       DpctGlobalInfo::getInRoot().getCanonicalPath());

clang/lib/Tooling/Core/Replacement.cpp

@@ -727,6 +727,12 @@ std::map<std::string, Replacements> groupReplacementsByFile(
   return Result;
 }
 #ifdef SYCLomatic_CUSTOMIZATION
+AddFileHunk::AddFileHunk(std::string NewFilePath)
+    : Hunk(AddFile), NewFilePath(UnifiedPath(NewFilePath).getCanonicalPath()) {}
+DeleteFileHunk::DeleteFileHunk(std::string OldFilePath)
+    : Hunk(DeleteFile),
+      OldFilePath(UnifiedPath(OldFilePath).getCanonicalPath()) {}
+
 #undef Replacement
 #endif // SYCLomatic_CUSTOMIZATION