Fix

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

Author: zhiweij1

clang/lib/DPCT/AnalysisInfo.cpp

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

clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -625,11 +625,13 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
            VD && VD->isConstexpr()) {
     if (VD->getInit() && VD->getInit()->getBeginLoc().isValid() &&
         !ConstExprExpansion) {
-      std::string VDInitStr = ExprAnalysis::ref(VD->getInit());
+      ConstExprExpansion = true;
+      ExprAnalysis EA(VD->getInit());
+      std::string VDInitStr = EA.getReplacedString();
       std::string VDStr = VD->getNameAsString();
       ReplSet.addConstExprExpansionInfo(VDStr, VDInitStr);
-      ConstExprExpansion = true;
-      dispatch(VD->getInit());
+      ReplSet.addTemplateDependentReplacementInConstExprExpansion(
+          EA.getReplSetTDRs());
       ConstExprExpansion = false;
     }
   } else if (auto ECD = dyn_cast<EnumConstantDecl>(DRE->getDecl())) {

clang/lib/DPCT/RuleInfra/ExprAnalysis.h

@@ -139,10 +139,9 @@ class StringReplacements {
   }
 
   inline void addTemplateDependentReplacementInConstExprExpansion(
-      size_t Offset, size_t Length, unsigned TemplateIndex) {
-    TDRsInConstExprExpansion.insert(
-        std::make_pair(Offset, std::make_shared<TemplateDependentReplacement>(
-                                   SourceStr, Offset, Length, TemplateIndex)));
+      const std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
+          &InTDRs) {
+    TDRsInConstExprExpansion.insert(InTDRs.begin(), InTDRs.end());
   }
 
   inline void addConstExprExpansionInfo(std::string VDStr,
@@ -183,6 +182,10 @@ class StringReplacements {
     replaceString();
     return SourceStr;
   }
+  inline std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
+  getTDRs() {
+    return TDRs;
+  }
 
 private:
   StringReplacements(const StringReplacements &) = delete;
@@ -255,6 +258,10 @@ class ExprAnalysis {
   inline const std::string &getReplacedString() {
     return ReplSet.getReplacedString();
   }
+  inline std::map<size_t, std::shared_ptr<TemplateDependentReplacement>>
+  getReplSetTDRs() {
+    return ReplSet.getTDRs();
+  }
   inline std::shared_ptr<TemplateDependentStringInfo>
   getTemplateDependentStringInfo() {
     auto Res = ReplSet.getTemplateDependentStringInfo();
@@ -608,11 +615,7 @@ class ExprAnalysis {
 
   inline void addReplacement(size_t Offset, size_t Length,
                              unsigned TemplateIndex) {
-    if (ConstExprExpansion)
-      ReplSet.addTemplateDependentReplacementInConstExprExpansion(
-          Offset, Length, TemplateIndex);
-    else
-      ReplSet.addTemplateDependentReplacement(Offset, Length, TemplateIndex);
+    ReplSet.addTemplateDependentReplacement(Offset, Length, TemplateIndex);
   }
 
   // Analyze the expression, jump to corresponding analysis function according

clang/test/dpct/sharedmem_var_static.cu

@@ -236,6 +236,6 @@ template <int ThreadsPerBlock, int NumWarpQ> __global__ void kerfunc() {
 }
 
 void foo2() {
-  // CHECK: sycl::local_accessor<int, 1> smem_acc_ct1(sycl::range<1>(ThreadsPerBlock / kWarpSize * 8), cgh);
+  // CHECK: sycl::local_accessor<int, 1> smem_acc_ct1(sycl::range<1>(128 / kWarpSize * 8), cgh);
   kerfunc<128, 8><<<32, 32>>>();
 }