WIP

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

Author: zhiweij1

clang/lib/DPCT/AnalysisInfo.cpp

@@ -2811,6 +2811,7 @@ void CtTypeInfo::setArrayInfo(const DependentSizedArrayTypeLoc &TL,
                               bool NeedSizeFold) {
   ContainSizeofType = containSizeOfType(TL.getSizeExpr());
   ExprAnalysis EA;
+  EA.IsAnalyzingCtTypeInfo = true;
   EA.analyze(TL.getSizeExpr());
   auto TDSI = EA.getTemplateDependentStringInfo();
   if (TDSI->containsTemplateDependentMacro())

clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -421,74 +421,6 @@ void StringReplacements::replaceString() {
   ReplMap.clear();
 }
 
-void StringReplacements::adjustSourceStrAndTDRs() {
-  std::vector<size_t> Occurrences;
-  size_t Pos = 0;
-  while ((Pos = SourceStr.find(ConstExprExpansionInfoVDStr, Pos)) !=
-         std::string::npos) {
-    Occurrences.push_back(Pos);
-    Pos += ConstExprExpansionInfoVDStr.length();
-  }
-
-  int LengthDiff = ConstExprExpansionInfoVDInitStr.length() -
-                   ConstExprExpansionInfoVDStr.length();
-
-  for (auto Occ : Occurrences) {
-    const auto &Iter = TDRs.find(Occ);
-    if (Iter != TDRs.end()) {
-      TDRs.erase(Iter);
-    }
-  }
-  std::map<size_t, std::shared_ptr<TemplateDependentReplacement>> NewTDRs;
-  for (const auto &[Pos, Value] : TDRs) {
-    int NewPos = Pos;
-    for (auto Occ : Occurrences) {
-      if (Occ < static_cast<size_t>(Pos)) {
-        NewPos += LengthDiff;
-      } else {
-        break;
-      }
-    }
-    auto NewValue = std::make_shared<TemplateDependentReplacement>(
-        SourceStr, NewPos, Value->getLength(), Value->getTemplateIndex());
-    NewTDRs[NewPos] = NewValue;
-  }
-  TDRs = std::move(NewTDRs);
-
-  std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
-      NewTDRsInConstExprExpansion;
-  for (const auto &[Pos, Value] : TDRsInConstExprExpansion) {
-    for (auto Occ : Occurrences) {
-      int NewPos = Occ + Pos;
-      for (auto PrevOcc : Occurrences) {
-        if (PrevOcc < static_cast<size_t>(Occ)) {
-          NewPos += LengthDiff;
-        } else {
-          break;
-        }
-      }
-      auto NewValue = std::make_shared<TemplateDependentReplacement>(
-          SourceStr, NewPos, Value->getLength(), Value->getTemplateIndex());
-      NewTDRsInConstExprExpansion[NewPos] = NewValue;
-      break;
-    }
-  }
-  TDRsInConstExprExpansion = std::move(NewTDRsInConstExprExpansion);
-
-  Pos = 0;
-  while ((Pos = SourceStr.find(ConstExprExpansionInfoVDStr, Pos)) !=
-         std::string::npos) {
-    SourceStr.replace(Pos, ConstExprExpansionInfoVDStr.length(),
-                      ConstExprExpansionInfoVDInitStr);
-    Pos += ConstExprExpansionInfoVDInitStr.length();
-  }
-
-  TDRs.insert(TDRsInConstExprExpansion.begin(), TDRsInConstExprExpansion.end());
-  for (const auto &[Pos, Value] : TDRs) {
-    Value->alterSource(SourceStr);
-  }
-}
-
 ExprAnalysis::ExprAnalysis(const Expr *Expression)
     : Context(DpctGlobalInfo::getContext()),
       SM(DpctGlobalInfo::getSourceManager()) {
@@ -622,17 +554,13 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
   if (auto TemplateDecl = dyn_cast<NonTypeTemplateParmDecl>(DRE->getDecl()))
     addReplacement(DRE, TemplateDecl->getIndex());
   else if (const auto *VD = dyn_cast<VarDecl>(DRE->getDecl());
-           VD && VD->isConstexpr()) {
-    if (VD->getInit() && VD->getInit()->getBeginLoc().isValid() &&
-        !ConstExprExpansion) {
-      ConstExprExpansion = true;
+           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();
-      ReplSet.addConstExprExpansionInfo(VDStr, VDInitStr);
-      ReplSet.addTemplateDependentReplacementInConstExprExpansion(
-          EA.getReplSetTDRs());
-      ConstExprExpansion = false;
+      addReplacement(0, VDStr.size(), VDInitStr);
     }
   } else if (auto ECD = dyn_cast<EnumConstantDecl>(DRE->getDecl())) {
     std::unordered_set<std::string> targetStr = {

clang/lib/DPCT/RuleInfra/ExprAnalysis.h

@@ -138,16 +138,12 @@ class StringReplacements {
                                    SourceStr, Offset, Length, TemplateIndex)));
   }
 
-  inline void addTemplateDependentReplacementInConstExprExpansion(
-      const std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
-          &InTDRs) {
-    TDRsInConstExprExpansion.insert(InTDRs.begin(), InTDRs.end());
-  }
-
-  inline void addConstExprExpansionInfo(std::string VDStr,
-                                        std::string VDInitStr) {
-    ConstExprExpansionInfoVDStr = VDStr;
-    ConstExprExpansionInfoVDInitStr = VDInitStr;
+  inline void addTemplateDependentReplacement(
+      size_t Offset, size_t Length,
+      std::shared_ptr<TemplateDependentStringInfo> TDSI) {
+   // TDRs.insert(
+   //     std::make_pair(Offset, std::make_shared<TemplateDependentReplacement>(
+   //                                SourceStr, Offset, Length, TemplateIndex)));
   }
 
   // Add a string replacement
@@ -169,11 +165,6 @@ class StringReplacements {
   // Generate replacement text info which dependent on template args.
   std::shared_ptr<TemplateDependentStringInfo>
   getTemplateDependentStringInfo() {
-    if (!ConstExprExpansionInfoVDStr.empty() &&
-        !ConstExprExpansionInfoVDInitStr.empty() &&
-        !TDRsInConstExprExpansion.empty()) {
-      adjustSourceStrAndTDRs();
-    }
     replaceString();
     return std::make_shared<TemplateDependentStringInfo>(SourceStr, TDRs);
   }
@@ -193,16 +184,11 @@ class StringReplacements {
   StringReplacements &operator=(StringReplacements) = delete;
 
   void replaceString();
-  void adjustSourceStrAndTDRs();
 
   unsigned ShiftLength;
   std::string SourceStr;
   std::map<size_t, std::shared_ptr<StringReplacement>> ReplMap;
   std::map<size_t, std::shared_ptr<TemplateDependentReplacement>> TDRs;
-  std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
-      TDRsInConstExprExpansion;
-  std::string ConstExprExpansionInfoVDStr;
-  std::string ConstExprExpansionInfoVDInitStr;
 };
 
 /// Analyze expression and generate its migrated string
@@ -618,6 +604,12 @@ class ExprAnalysis {
     ReplSet.addTemplateDependentReplacement(Offset, Length, TemplateIndex);
   }
 
+  inline void
+  addReplacement(size_t Offset, size_t Length,
+                 std::shared_ptr<TemplateDependentStringInfo> TDSI) {
+    ReplSet.addTemplateDependentReplacement(Offset, Length, TDSI);
+  }
+
   // Analyze the expression, jump to corresponding analysis function according
   // to its class
   // Precondition: Expression != nullptr
@@ -723,7 +715,9 @@ class ExprAnalysis {
   std::string RewritePrefix;
   std::string RewritePostfix;
   std::set<HelperFeatureEnum> HelperFeatureSet;
-  bool ConstExprExpansion = false;
+
+public:
+  bool IsAnalyzingCtTypeInfo = false;
 };
 
 // Analyze pointer allocated by cudaMallocManaged.