Address memory addressing problems in vla (2)

Author: manorom

clang/tools/sotoc/src/TargetCode.cpp

@@ -103,6 +103,7 @@ void TargetCode::generateFunctionPrologue(TargetCodeRegion *TCR,
   Out << "void " << generateFunctionName(TCR) << "(";
   for (auto i = TCR->getCapturedVarsBegin(), e = TCR->getCapturedVarsEnd();
        i != e; ++i) {
+    std::string VarName = (*i)->getDeclName().getAsString();
     auto C = TCR->GetReferredOMPClause(*i);
     if (!first) {
       Out << ", ";
@@ -117,10 +118,10 @@ void TargetCode::generateFunctionPrologue(TargetCodeRegion *TCR,
       int dim = 0;
 
       std::vector<int> VariableDimensions;
-      handleArrays(&t, DimString, dim, VariableDimensions, TCR, elemType);
+      handleArrays(&t, DimString, dim, VariableDimensions, TCR, elemType, VarName);
 
       for (int d : VariableDimensions) {
-        Out << "unsigned long long __sotoc_vla_dim" << d << "_" << (*i)->getDeclName().getAsString() << ", ";
+        Out << "unsigned long long __sotoc_vla_dim" << d << "_" << VarName << ", ";
       }
 
       // set type to void* to avoid warnings from the compiler
@@ -140,7 +141,7 @@ void TargetCode::generateFunctionPrologue(TargetCodeRegion *TCR,
         }
       }
     }
-    Out << (*i)->getDeclName().getAsString();
+    Out << VarName;
   }
   Out << ")\n{\n";
 
@@ -260,7 +261,8 @@ void TargetCode::handleArrays(const clang::ArrayType **t,
                               std::list<std::string> &DimString, int &dim,
                               std::vector<int> &VariableDims,
                               TargetCodeRegion *TCR,
-                              std::string &elemType) {
+                              std::string &elemType,
+                              const std::string &ArrayName) {
   auto OrigT = *t;
 
   if (!t) {
@@ -281,8 +283,7 @@ void TargetCode::handleArrays(const clang::ArrayType **t,
     DEBUGP("ArrayType VAT");
     std::string PrettyStr = "";
     llvm::raw_string_ostream PrettyOS(PrettyStr);
-    clang::PrintingPolicy PP(TCR->GetLangOpts());
-    t1->getSizeExpr()->printPretty(PrettyOS, NULL, PP);
+    PrettyOS << "__sotoc_vla_dim" << dim << "_" << ArrayName;
     DimString.push_back(PrettyOS.str());
     VariableDims.push_back(dim);
     ++dim;
@@ -298,6 +299,6 @@ void TargetCode::handleArrays(const clang::ArrayType **t,
       OrigT->getElementType().getTypePtr());
   if (*t) {
     // Recursively handle all dimensions
-    handleArrays(t, DimString, dim, VariableDims, TCR, elemType);
+    handleArrays(t, DimString, dim, VariableDims, TCR, elemType, ArrayName);
   }
 }

clang/tools/sotoc/src/TargetCode.h

@@ -86,5 +86,6 @@ class TargetCode {
   void handleArrays(const clang::ArrayType **t,
                     std::list<std::string> &DimString, int &dim,
                     std::vector<int> &VariableDimensions,
-                    TargetCodeRegion *TCR, std::string &elemType);
+                    TargetCodeRegion *TCR, std::string &elemType,
+                    const std::string &ArrayName);
 };