[SYCLomatic] Fix migration of initializer of __constant__ array with incomplete size (#704)

Signed-off-by: Cai, Justin <[email protected]>

Author: jzc

clang/lib/DPCT/AnalysisInfo.h

@@ -2197,6 +2197,15 @@ class CtTypeInfo {
   // will follow as comments. If NeedSizeFold is false, original size expression
   // will be the size string.
   CtTypeInfo(const TypeLoc &TL, bool NeedSizeFold = false);
+  CtTypeInfo(const VarDecl *D, bool NeedSizeFold = false)
+    : CtTypeInfo(D->getTypeSourceInfo()->getTypeLoc(), NeedSizeFold) {
+    if (D &&
+        D->getTypeSourceInfo()
+          ->getTypeLoc().getTypeLocClass()
+        == TypeLoc::IncompleteArray)
+      if (auto CAT = dyn_cast<ConstantArrayType>(D->getType()))
+        Range[0] = std::to_string(CAT->getSize().getZExtValue());
+  }
 
   inline const std::string &getBaseName() { return BaseName; }
 
@@ -2294,10 +2303,9 @@ class CtTypeInfo {
 class VarInfo {
 public:
   VarInfo(unsigned Offset, const std::string &FilePathIn,
-          const DeclaratorDecl *Var, bool NeedFoldSize = false)
+          const VarDecl *Var, bool NeedFoldSize = false)
       : FilePath(FilePathIn), Offset(Offset), Name(Var->getName()),
-        Ty(std::make_shared<CtTypeInfo>(Var->getTypeSourceInfo()->getTypeLoc(),
-                                        NeedFoldSize)) {}
+        Ty(std::make_shared<CtTypeInfo>(Var, NeedFoldSize)) {}
 
   inline const std::string &getFilePath() { return FilePath; }
   inline unsigned getOffset() { return Offset; }

clang/test/dpct/cuda_const.cu

@@ -31,8 +31,13 @@ __constant__ int *const_ptr;
 
 // CHECK: static dpct::constant_memory<int, 1> const_init(sycl::range<1>(5), {1, 2, 3, 7, 8});
 __constant__ int const_init[5] = {1, 2, 3, 7, 8};
+// CHECK: static dpct::constant_memory<int, 1> incomplete_size_init(sycl::range<1>(5), {1, 2, 3, 7, 8});
+__constant__ int incomplete_size_init[] = {1, 2, 3, 7, 8};
 // CHECK: static dpct::constant_memory<int, 2> const_init_2d(sycl::range<2>(5, 5), {{[{][{]}}1, 2, 3, 7, 8}, {2, 4, 5, 8, 2}, {4, 7, 8, 0}, {1, 3}, {4, 0, 56}});
 __constant__ int const_init_2d[5][5] = {{1, 2, 3, 7, 8}, {2, 4, 5, 8, 2}, {4, 7, 8, 0}, {1, 3}, {4, 0, 56}};
+// CHECK: static dpct::constant_memory<int, 2> incomplete_size_init_2d(sycl::range<2>(3, 2), { {1,2},{3,4},{5,6}});
+__constant__ int incomplete_size_init_2d[][2] = { {1,2},{3,4},{5,6}};
+
 
 // CHECK: struct FuncObj {
 // CHECK-NEXT: void operator()(float *out, int index, float *const_angle) {