Address review comments

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

Author: tomflinda

clang/lib/DPCT/AnalysisInfo.cpp

@@ -1487,18 +1487,9 @@ std::string DpctGlobalInfo::getStringForRegexReplacement(StringRef MatchedStr) {
         HelperFuncType::HFT_DefaultQueuePtr, Index);
   case 'E': {
     auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
-    SourceProcessType FileType = GetSourceFileType(Vec[Index].first);
-
     const bool HasCUDASyntax = DpctGlobalInfo::hasCUDASyntax(Vec[Index].first);
-    const bool IsCppSource = (FileType & SPT_CppSource);
     const auto Extention = Vec[Index].second;
-
-    if (Extention == ".cc") {
-      return (HasCUDASyntax && IsCppSource)
-                 ? "cc" + DpctGlobalInfo::getSYCLSourceExtension()
-                 : "cc";
-    }
-    return HasCUDASyntax ? "c" + DpctGlobalInfo::getSYCLSourceExtension() : "c";
+    return HasCUDASyntax ? Extention + DpctGlobalInfo::getSYCLSourceExtension() : Extention;
   }
   case 'P': {
     std::string ReplStr;

clang/lib/DPCT/RulesInclude/InclusionHeaders.cpp

@@ -180,8 +180,8 @@ void IncludesCallbacks::InclusionDirective(
       auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
       path::replace_extension(
           NewFileName, "{{NEEDREPLACEE" + std::to_string(Vec.size()) + "}}");
-      Vec.push_back(std::pair<tooling::UnifiedPath, std::string>(IncludedFile,
-                                                                 Extension));
+      Vec.push_back(std::pair<tooling::UnifiedPath, std::string>(
+          IncludedFile, Extension.substr(1)));
     } else {
       clang::tooling::UnifiedPath NewFilePath = FileName;
       rewriteFileName(NewFilePath, IncludedFile);

clang/test/dpct/include/main.cu

@@ -66,7 +66,7 @@
 // CHECK: #include "test9.cc.dp.cpp"
 #include "test9.cc"
 // case 10: source file has CUDA syntax, not in database.
-// CHECK: #include "test10.cc"
+// CHECK: #include "test10.cc.dp.cpp"
 #include "test10.cc"
 // case 11: source file does not have CUDA syntax, in database.
 // CHECK: #include "test11.cc"