refine code

Signed-off-by: chenwei.sun <chenwei.sun@intel.com>

Author: tomflinda

clang/lib/DPCT/AnalysisInfo.cpp

@@ -1487,11 +1487,11 @@ std::string DpctGlobalInfo::getStringForRegexReplacement(StringRef MatchedStr) {
         HelperFuncType::HFT_DefaultQueuePtr, Index);
   case 'E': {
     auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
-    SourceProcessType FileType = GetSourceFileType(Vec[Index]);
+    SourceProcessType FileType = GetSourceFileType(Vec[Index].first);
 
-    const bool HasCUDASyntax = DpctGlobalInfo::hasCUDASyntax(Vec[Index]);
+    const bool HasCUDASyntax = DpctGlobalInfo::hasCUDASyntax(Vec[Index].first);
     const bool IsCppSource = (FileType & SPT_CppSource);
-    const auto Extention = Vec[Index + 1];
+    const auto Extention = Vec[Index].second;
 
     if (Extention == ".cc") {
       return (HasCUDASyntax && IsCppSource)
@@ -2532,7 +2532,9 @@ bool DpctGlobalInfo::CVersionCUDALaunchUsedFlag = false;
 unsigned int DpctGlobalInfo::ColorOption = 1;
 std::unordered_map<int, std::shared_ptr<DeviceFunctionInfo>>
     DpctGlobalInfo::CubPlaceholderIndexMap;
-std::vector<tooling::UnifiedPath> DpctGlobalInfo::CSourceFileList;
+std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                      std::string /*extention name*/>>
+    DpctGlobalInfo::CSourceFileList;
 bool DpctGlobalInfo::OptimizeMigrationFlag = false;
 std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>>
     DpctGlobalInfo::PriorityReplInfoMap;

clang/lib/DPCT/AnalysisInfo.h

@@ -1450,7 +1450,9 @@ class DpctGlobalInfo {
   getCubPlaceholderIndexMap() {
     return CubPlaceholderIndexMap;
   }
-  std::vector<tooling::UnifiedPath> &getCSourceFileList() {
+  std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                        std::string /*extention name*/>> &
+  getCSourceFileList() {
     return CSourceFileList;
   }
   static std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>> &
@@ -1703,7 +1705,9 @@ class DpctGlobalInfo {
   static unsigned int ColorOption;
   static std::unordered_map<int, std::shared_ptr<DeviceFunctionInfo>>
       CubPlaceholderIndexMap;
-  static std::vector<tooling::UnifiedPath> CSourceFileList;
+  static std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                               std::string /*extention name*/>>
+      CSourceFileList;
   static bool OptimizeMigrationFlag;
   static std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>>
       PriorityReplInfoMap;

clang/lib/DPCT/RulesInclude/InclusionHeaders.cpp

@@ -10,6 +10,7 @@
 #include "PreProcessor.h"
 #include "UserDefinedRules/UserDefinedRules.h"
 #include <optional>
+#include <string>
 
 namespace clang {
 namespace dpct {
@@ -179,8 +180,8 @@ void IncludesCallbacks::InclusionDirective(
       auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
       path::replace_extension(
           NewFileName, "{{NEEDREPLACEE" + std::to_string(Vec.size()) + "}}");
-      Vec.push_back(IncludedFile);
-      Vec.push_back(Extension);
+      Vec.push_back(std::pair<tooling::UnifiedPath, std::string>(IncludedFile,
+                                                                 Extension));
     } else {
       clang::tooling::UnifiedPath NewFilePath = FileName;
       rewriteFileName(NewFilePath, IncludedFile);