Fix

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

Author: zhiweij1

clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -552,18 +552,26 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
     RefString = DRE->getNameInfo().getAsString();
   }
   if (auto TemplateDecl = dyn_cast<NonTypeTemplateParmDecl>(DRE->getDecl()))
-    addReplacement(DRE, TemplateDecl->getIndex());
+    if (FFFFF)
+      addReplacement("ThreadsPerBlock", TemplateDecl->getIndex());
+    else
+      addReplacement(DRE, TemplateDecl->getIndex());
   else if (const auto *VD = dyn_cast<VarDecl>(DRE->getDecl());
            VD && VD->isConstexpr() &&
            IsAnalyzingCtTypeInfo /*&& IsDependent*/) {
     if (VD->getInit() && VD->getInit()->getBeginLoc().isValid()) {
       ExprAnalysis EA(VD->getInit());
       std::string VDInitStr = EA.getReplacedString();
       std::string VDStr = VD->getNameAsString();
-      // This offset is relative to the original str
-      addReplacement(0, VDStr.size(), VDInitStr);
-      //
-      addReplacement("ThreadsPerBlock", 0);
+
+      auto Loc = ReplSet.getSourceStr().find(VDStr);
+      // TODO: more than 1 substrings matched
+      if (Loc != std::string::npos) {
+        addReplacement(Loc, VDStr.size(), VDInitStr);
+        FFFFF = true;
+        dispatch(VD->getInit());
+        FFFFF = false;
+      }
     }
   } else if (auto ECD = dyn_cast<EnumConstantDecl>(DRE->getDecl())) {
     std::unordered_set<std::string> targetStr = {

clang/lib/DPCT/RuleInfra/ExprAnalysis.h

@@ -155,7 +155,7 @@ class StringReplacements {
   inline void addTemplateDependentReplacement(std::string String,
                                               unsigned TemplateIndex) {
     auto TDR = std::make_shared<TemplateDependentReplacement>(
-        String, String.size(), TemplateIndex);
+        String, 0, String.size(), TemplateIndex);
     TDRs.insert(std::make_pair(0, TDR));
   }
 
@@ -186,6 +186,7 @@ class StringReplacements {
     replaceString();
     return SourceStr;
   }
+  inline const std::string &getSourceStr() { return SourceStr; }
 
 private:
   StringReplacements(const StringReplacements &) = delete;
@@ -202,6 +203,7 @@ class StringReplacements {
 
 /// Analyze expression and generate its migrated string
 class ExprAnalysis {
+  bool FFFFF = false;
 public:
   inline std::string getRewritePrefix() { return RewritePrefix; }