[DO NOT MERGE][SYCLomatic] reMigration

clang/lib/DPCT/CMakeLists.txt

@@ -233,6 +233,7 @@ add_clang_library(DPCT
   MigrateScript/GenMakefile.cpp
   RulesInclude/InclusionHeaders.cpp
   IncMigration/IncrementalMigrationUtility.cpp
+  IncMigration/ReMigration.cpp
   UserDefinedRules/UserDefinedRules.cpp
   UserDefinedRules/PatternRewriter.cpp
   MigrateScript/MigrateBuildScript.cpp

clang/lib/DPCT/DPCT.cpp

@@ -521,7 +521,7 @@ static void loadMainSrcFileInfo(clang::tooling::UnifiedPath OutRoot) {
                                         DpctGlobalInfo::getYamlFileName());
   auto PreTU = std::make_shared<clang::tooling::TranslationUnitReplacements>();
   if (llvm::sys::fs::exists(YamlFilePath)) {
-    if (loadFromYaml(YamlFilePath, *PreTU) != 0) {
+    if (loadTUFromYaml(YamlFilePath, *PreTU) != 0) {
       llvm::errs() << getLoadYamlFailWarning(YamlFilePath);
     }
 
@@ -1400,6 +1400,8 @@ int runDPCT(int argc, const char **argv) {
     dpctExit(MigrationSucceeded, false);
   }
 
+  tryLoadingUpstreamChangesAndUserChanges();
+
   ReplTy ReplCUDA, ReplSYCL;
   volatile int RunCount = 0;
   do {

clang/lib/DPCT/FileGenerator/GenFiles.cpp

@@ -1210,7 +1210,7 @@ void loadYAMLIntoFileInfo(clang::tooling::UnifiedPath Path) {
   auto PreTU = std::make_shared<clang::tooling::TranslationUnitReplacements>();
   if (fs::exists(YamlFilePath.getCanonicalPath())) {
     if (clang::dpct::DpctGlobalInfo::isIncMigration()) {
-      if (loadFromYaml(YamlFilePath, *PreTU) == 0) {
+      if (loadTUFromYaml(YamlFilePath, *PreTU) == 0) {
         DpctGlobalInfo::getInstance().insertReplInfoFromYAMLToFileInfo(
             OriginPath, std::move(PreTU));
       } else {

clang/lib/DPCT/IncMigration/ExternalReplacement.cpp

@@ -10,19 +10,19 @@
 //   -Load replacement from external (disk file)
 //   -Merge replacement in current migration with previous migration.
 
+#include "ExternalReplacement.h"
 #include "AnalysisInfo.h"
+#include "IncMigration/IncrementalMigrationUtility.h"
 #include "Utility.h"
+
+#include "clang/Tooling/Core/Diagnostic.h"
 #include "clang/Tooling/Core/Replacement.h"
+#include "clang/Tooling/Refactoring.h"
+#include "clang/Tooling/ReplacementsYaml.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
-
-#include "ExternalReplacement.h"
-#include "IncMigration/IncrementalMigrationUtility.h"
-#include "clang/Tooling/Core/Diagnostic.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/ReplacementsYaml.h"
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_os_ostream.h"
 
@@ -75,18 +75,29 @@ int save2Yaml(
   return 0;
 }
 
-int loadFromYaml(const clang::tooling::UnifiedPath &Input,
-                 clang::tooling::TranslationUnitReplacements &TU) {
+template <class T>
+static int loadFromYaml(const clang::tooling::UnifiedPath &Input, T &Content) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Buffer =
       llvm::MemoryBuffer::getFile(Input.getCanonicalPath());
   if (!Buffer) {
     llvm::errs() << "error: failed to read " << Input.getCanonicalPath() << ": "
                  << Buffer.getError().message() << "\n";
     return -1;
   }
-
   llvm::yaml::Input YAMLIn(Buffer.get()->getBuffer());
-  YAMLIn >> TU;
+  YAMLIn >> Content;
+  if (YAMLIn.error()) {
+    Content = T();
+    return -1;
+  }
+  return 0;
+}
+
+int loadTUFromYaml(const clang::tooling::UnifiedPath &Input,
+                   clang::tooling::TranslationUnitReplacements &TU) {
+  int Status = loadFromYaml(Input, TU);
+  if (Status)
+    return Status;
 
   bool IsSrcFileChanged = false;
   for (const auto &digest : TU.MainSourceFilesDigest) {
@@ -98,7 +109,7 @@ int loadFromYaml(const clang::tooling::UnifiedPath &Input,
     }
   }
 
-  if (IsSrcFileChanged || YAMLIn.error()) {
+  if (IsSrcFileChanged) {
     // File doesn't appear to be a header change description. Ignore it.
     TU = clang::tooling::TranslationUnitReplacements();
     return -1;
@@ -107,6 +118,16 @@ int loadFromYaml(const clang::tooling::UnifiedPath &Input,
   return 0;
 }
 
+void loadGDCFromYaml(const clang::tooling::UnifiedPath &Input,
+                     clang::dpct::GitDiffChanges &GDC) {
+  int status = loadFromYaml(Input, GDC);
+  if (status) {
+    llvm::errs() << "Failed to load git diff Changes from "
+                 << Input.getCanonicalPath() << "\n";
+    GDC = clang::dpct::GitDiffChanges();
+  }
+}
+
 void mergeAndUniqueReps(
     Replacements &Replaces,
     const std::vector<clang::tooling::Replacement> &PreRepls) {

clang/lib/DPCT/IncMigration/ExternalReplacement.h

@@ -9,8 +9,8 @@
 #ifndef __EXTERNAL_REPLACEMENT_H__
 #define __EXTERNAL_REPLACEMENT_H__
 
-#include "clang/Tooling/Core/Replacement.h"
-#include "llvm/ADT/StringRef.h"
+#include "IncMigration/ReMigration.h"
+
 #include <map>
 #include <vector>
 
@@ -31,8 +31,10 @@ namespace dpct {
 int mergeExternalReps(clang::tooling::UnifiedPath InRootSrcFilePath,
                       clang::tooling::UnifiedPath OutRootSrcFilePath,
                       clang::tooling::Replacements &Replaces);
-int loadFromYaml(const clang::tooling::UnifiedPath &Input,
-                 clang::tooling::TranslationUnitReplacements &TU);
+int loadTUFromYaml(const clang::tooling::UnifiedPath &Input,
+                   clang::tooling::TranslationUnitReplacements &TU);
+void loadGDCFromYaml(const clang::tooling::UnifiedPath &Input,
+                     clang::dpct::GitDiffChanges &GDC);
 int save2Yaml(
     clang::tooling::UnifiedPath &YamlFile,
     clang::tooling::UnifiedPath &SrcFileName,
@@ -46,6 +48,7 @@ void mergeAndUniqueReps(
     clang::tooling::Replacements &Replaces,
     const std::vector<clang::tooling::Replacement> &PreRepls);
 
+void tryLoadingUpstreamChangesAndUserChanges();
 } // namespace dpct
 } // namespace clang
 

clang/lib/DPCT/IncMigration/IncrementalMigrationUtility.cpp

@@ -376,7 +376,7 @@ bool canContinueMigration(std::string &Msg) {
 
   if (!llvm::sys::fs::exists(YamlFilePath.getCanonicalPath()))
     return true;
-  if (loadFromYaml(YamlFilePath.getCanonicalPath(), *PreTU) != 0) {
+  if (loadTUFromYaml(YamlFilePath.getCanonicalPath(), *PreTU) != 0) {
     llvm::errs() << getLoadYamlFailWarning(YamlFilePath.getCanonicalPath());
     return true;
   }