private_removing: fix bug in expression substitution

private_removing: fix bug bugreport_1701358632 - add check for build-in functions

private_removing: fix bug bugreport_1699352305 - update logic for finding definitions

dvm/fdvm/trunk/Sage/lib/include/libSage++.h

@@ -243,9 +243,9 @@ public:
     inline void replaceSymbBySymb(SgSymbol &symb, SgSymbol &newsymb);
     inline void replaceSymbBySymbSameName(SgSymbol &symb, SgSymbol &newsymb);
     inline void replaceTypeInStmt(SgType &old, SgType &newtype);
-    char* unparse(int lang = 2); // FORTRAN_LANG
+    char* unparse(int lang = 0); // FORTRAN_LANG
     inline void unparsestdout();
-    std::string sunparse(int lang = 2); // FORTRAN_LANG
+    std::string sunparse(int lang = 0); // FORTRAN_LANG
     inline char *comments();      //preceding comment lines.
     void addComment(const char *com);
     void addComment(char *com);
@@ -3684,7 +3684,7 @@ inline char* SgStatement::unparse(int lang)
 #ifdef __SPF
     checkConsistence();
 #endif
-	return UnparseBif_Char(thebif, lang); //2 - fortran language 
+	return UnparseBif_Char(thebif, lang); //0 - fortran language 
 }
 
 inline void SgStatement::unparsestdout()

dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c

@@ -13,6 +13,7 @@ mkC++extern $SAGEROOT/lib/newsrc/low_level.c > ! $SAGEROOT/lib/include/extcxx_lo
 
 #include <stdlib.h>
 #include <stdarg.h> /* ANSI variable argument header */
+#include <ctype.h>
 
 #include "compatible.h"   /* Make different system compatible... (PHB) */
 #ifdef SYS5
@@ -1028,7 +1029,7 @@ void UnparseBif(bif)
 /* podd 28.01.07 */   /*change podd 16.12.11*/
 char *UnparseBif_Char(bif,lang)
      PTR_BFND bif;
-     int lang; /* 0 - undefined, 1 - C language, 2 - Fortran language */
+     int lang; /* ForSrc=0 - Fortran language, CSrc=1 - C language */
 {
     char *s;
 /*  PTR_BLOB b, bl;
@@ -8932,7 +8933,7 @@ void updateSymbInInterfaceBlock(PTR_BFND block)
     }  
 }
 
-updateSymbolsOfList(PTR_LLND slist, PTR_BFND struct_stmt)
+void updateSymbolsOfList(PTR_LLND slist, PTR_BFND struct_stmt)
 {  
     PTR_LLND ll;
     PTR_SYMB symb, newsymb;

dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c

@@ -12,6 +12,8 @@
 
 #include <stdio.h>
 #include <stdlib.h> /* podd 15.03.99*/
+#include <ctype.h>
+
 #include "compatible.h"   /* Make different system compatible... (PHB) */
 #ifdef SYS5
 #include <string.h>

dvm/fdvm/trunk/fdvm/acc_f2c.cpp

@@ -94,6 +94,7 @@ static map<SgStatement*, vector<SgStatement*> > insertAfter;
 
 static map<SgStatement*, SgStatement*> replaced;
 static int arrayGenNum;
+static int SAPFOR_CONV = 0;
 
 #if TRACE
 static int lvl_convert_st = 0;
@@ -2301,6 +2302,16 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         tt3->setRhs(new SgExprListExp());
         tt3->rhs()->setLhs(&SgAssignOp(*new SgVarRefExp(newVar), *new SgVarRefExp(newVar) + *new SgValueExp(1)));
 
+        if (SAPFOR_CONV) // TODO: negative step
+        {
+            SgExprListExp* start = new SgExprListExp();
+            start->setLhs(SgAssignOp(*new SgVarRefExp(it), *ex1));
+
+            SgExprListExp* step = new SgExprListExp();
+            step->setLhs(&SgAssignOp(*new SgVarRefExp(it), *new SgVarRefExp(it) + *ex3));
+            retSt = new SgForStmt(start, &(*new SgVarRefExp(it) <= ex2->copy()), step, NULL);
+        }
+        else
             retSt = new SgForStmt(tt, &(*new SgVarRefExp(*newVar) < *new SgVarRefExp(cond)), tt3, NULL);
 
         if (cycleName)
@@ -2321,7 +2332,7 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         int sizeStack = bodySt.size();
         for (int i = 0; i < sizeStack; ++i)
         {
-            retSt->insertStmtAfter(*bodySt.top());
+            retSt->insertStmtAfter(*bodySt.top(), *retSt);
             bodySt.pop();
         }
         newVars.push_back(cond);
@@ -2434,7 +2445,7 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         int sizeStack = bodySt.size();
         for (int i = 0; i < sizeStack; ++i)
         {
-            retSt->insertStmtAfter(*bodySt.top());
+            retSt->insertStmtAfter(*bodySt.top(), *retSt);
             bodySt.pop();
         }
 
@@ -2557,7 +2568,7 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
             int sizeStack = bodySt.size();
             for (int i = 0; i < sizeStack; ++i)
             {
-                newIfStmt->insertStmtAfter(*bodySt.top());
+                newIfStmt->insertStmtAfter(*bodySt.top(), *newIfStmt);
                 bodySt.pop();
             }
         }
@@ -2695,6 +2706,30 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         needReplace = true;
 
     }
+    else if (st->variant() == PRINT_STAT) // only for SAPFOR
+    {
+        if (SAPFOR_CONV == 0)
+            Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
+
+        SgInputOutputStmt* outStat = (SgInputOutputStmt*)st;
+        SgExpression* lhs = outStat->itemList();
+        convertExpr(lhs, lhs);
+        
+        SgExpression* list = lhs;
+        while (list)
+        {
+            SgExpression* item = list->lhs();
+            if (item && item->variant() == STRING_VAL)
+            {
+                SgValueExp* exp = (SgValueExp*)item;
+                string str = exp->stringValue();
+                str += "\\n";
+                exp->setValue(strdup(str.c_str()));
+            }
+            list = list->rhs();
+        }
+        retSt = new SgCExpStmt(*new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "printf"), *lhs));
+    }
     else if (st->variant() == PROC_STAT)
     {  
 #if TRACE
@@ -2705,8 +2740,13 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         SgExpression *lhs = st->expr(0);
         convertExpr(lhs, lhs);
 
-        if (lhs == NULL)
+        if (lhs == NULL || SAPFOR_CONV)
+        {
+            if (lhs)
+                retSt = new SgCExpStmt(*new SgFunctionCallExp(*st->symbol(), *lhs));
+            else
                 retSt = new SgCExpStmt(*new SgFunctionCallExp(*st->symbol()));
+        }
         else
         {
             if (st->symbol()->identifier() == string("random_number"))
@@ -2810,7 +2850,7 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
     else
     {
         retSt = st;
-        if (st->variant() != CONTROL_END && st->variant() != EXPR_STMT_NODE)
+        if (st->variant() != CONTROL_END && st->variant() != EXPR_STMT_NODE && first_do_par)
         {
             printf("  [STMT ERROR: %s, line %d, user line %d] unsupported variant of node: %s\n", __FILE__, __LINE__, first_do_par->lineNumber(), tag[st->variant()]);
             if (unSupportedVars.size() != 0)
@@ -3177,11 +3217,18 @@ static void correctLabelsUse(SgStatement *firstStmt, SgStatement *lastStmt)
     }
 }
 
-void Translate_Fortran_To_C(SgStatement *Stmt)
+SgStatement* Translate_Fortran_To_C(SgStatement *Stmt, bool isSapforConv)
 {
 #if TRACE
     printf("START: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
 #endif
+    if (isSapforConv)
+    {
+        SAPFOR_CONV = 1;
+        if (handlersOfFunction.size() == 0)
+            initF2C_FunctionCalls();
+    }
+
     map<string, int> redArraysWithUnknownSize;
     SgExpression* er = red_list;
     for (reduction_operation_list* rsl = red_struct_list; rsl && er; rsl = rsl->next, er = er->rhs())
@@ -3189,6 +3236,8 @@ void Translate_Fortran_To_C(SgStatement *Stmt)
             redArraysWithUnknownSize[rsl->redvar->identifier()] = RedFuncNumber(er->lhs()->lhs());
 
     SgStatement *copyFSt = Stmt;
+    SgStatement* last = (Stmt == Stmt->lastNodeOfStmt()) ? Stmt->lastNodeOfStmt() : Stmt->lastExecutable();
+
     vector<stack<SgStatement*> > copyBlock;
     labelsExitCycle.clear();
     autoTfmReplacing.clear();
@@ -3196,41 +3245,47 @@ void Translate_Fortran_To_C(SgStatement *Stmt)
     cond_generator = 0;
     unSupportedVars.clear();
     bool needReplace = false;
-    pair<SgStatement*, SgStatement*> tmp;
+    pair<SgStatement*, SgStatement*> converted;
 
 #if TRACE
     printfSpaces(lvl_convert_st);
     printf("convert Stmt\n");
     lvl_convert_st += 2;
 #endif
-    needReplace = convertStmt(copyFSt, tmp, copyBlock, 0, 0, redArraysWithUnknownSize);
+    needReplace = convertStmt(copyFSt, converted, copyBlock, 0, 0, redArraysWithUnknownSize);
 #if TRACE
     lvl_convert_st-=2;
     printfSpaces(lvl_convert_st);
     printf("end of convert Stmt\n");
 #endif
-    if (needReplace)
+
+    if (needReplace && !isSapforConv)
     {       
         char *comm = copyFSt->comments();
         if (comm)
-            tmp.first->addComment(comm);
+            converted.first->addComment(comm);
 
-        if (tmp.first)
+        if (converted.first)
-            copyFSt->insertStmtBefore(*tmp.first, *copyFSt->controlParent());
+            copyFSt->insertStmtBefore(*converted.first, *copyFSt->controlParent());
 
         copyFSt->deleteStmt();
     }
         
+    if (first_do_par)
+    {
         for (set<int>::iterator i = unSupportedVars.begin(); i != unSupportedVars.end(); i++)
             printf("  [EXPR ERROR: %s, line %d, %d] unsupported variant of node: %s\n", __FILE__, __LINE__, first_do_par->lineNumber(), tag[*i]);
         if (unSupportedVars.size() != 0)
             Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
+    }
 
-    correctLabelsUse(Stmt, Stmt->lastExecutable());
+    correctLabelsUse(Stmt, last);
 
 #if TRACE
     printf("END: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
 #endif
+
+    return converted.first;
 }
 
 
@@ -3265,13 +3320,13 @@ void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, vecto
     while (copyFSt != lastStmt)
     {
         bool needReplace = false;
-        pair<SgStatement*, SgStatement*> tmp;
+        pair<SgStatement*, SgStatement*> converted;
 #if TRACE
         printfSpaces(lvl_convert_st);
         printf("convert Stmt\n");
         lvl_convert_st += 2;
 #endif        
-        needReplace = convertStmt(copyFSt, tmp, copyBlock, countOfCopy, 0, redArraysWithUnknownSize);
+        needReplace = convertStmt(copyFSt, converted, copyBlock, countOfCopy, 0, redArraysWithUnknownSize);
 #if TRACE
         lvl_convert_st-=2;
         printfSpaces(lvl_convert_st);
@@ -3279,16 +3334,16 @@ void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, vecto
 #endif
         if (needReplace)
         {
-            if (tmp.first)
+            if (converted.first)
             {
                 char *comm = copyFSt->comments();
                 if (comm)
-                    tmp.first->addComment(comm);
+                    converted.first->addComment(comm);
                                
-                copyFSt->insertStmtBefore(*tmp.first, *copyFSt->controlParent());
+                copyFSt->insertStmtBefore(*converted.first, *copyFSt->controlParent());
-                replaced[tmp.first] = copyFSt;
+                replaced[converted.first] = copyFSt;
                 for (int i = 0; i < countOfCopy; ++i)
-                    copyBlock[i].push(&tmp.first->copy());
+                    copyBlock[i].push(&converted.first->copy());
             }
 
             SgStatement *tmp1 = copyFSt;

dvm/fdvm/trunk/include/dvm.h

@@ -2075,7 +2075,7 @@ char *Check_Correct_Name(const char *name);
 char *Check_Correct_Name(const char *name);
 
 /* acc_f2c.cpp */
-void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, std::vector <std::stack <SgStatement*> > &, int);
+void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, std::vector <std::stack <SgStatement*> > &, int);
 SgStatement* Translate_Fortran_To_C(SgStatement* Stmt, bool isSapforConv = false);
 
 SgSymbol* createNewFunctionSymbol(const char *name);

dvm/fdvm/trunk/parser/ftn.gram

@@ -404,6 +404,7 @@ void startioctl();
 void endioctl();
 void redefine_func_arg_type();
 int isResultVar();
+int yylex();
 
 /* used by FORTRAN M */
 PTR_BFND make_processdo();

dvm/fdvm/trunk/parser/gram1.y

@@ -756,6 +756,7 @@ void startioctl();
 void endioctl();
 void redefine_func_arg_type();
 int isResultVar();
+int yylex();
 
 /* used by FORTRAN M */
 PTR_BFND make_processdo();

sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.cpp

@@ -14,7 +14,352 @@
 #include "dvm.h"
 #include "convert_to_c.h"
 
+#include "Utils/utils.h"
+#include "Utils/SgUtils.h"
+
+using std::vector;
+using std::string;
+using std::set;
+
+extern "C" void Set_Function_Language(int);
+extern "C" void Unset_Function_Language();
+extern "C" int out_upper_case;
+
+static SgStatement* createNewFunc(SgSymbol* sF, SgFile* file, SgProgHedrStmt* prog)
+{
+    SgStatement* st_hedr, * st_end;
+    SgExpression* fe, *arg_list = NULL;
+
+    bool isMain = sF == NULL;
+    if (!sF)
+        sF = findSymbolOrCreate(file, "main", C_VoidType());
+    else
+        sF->setType(C_VoidType());
+
+    // create fuction header
+    st_hedr = new SgStatement(FUNC_HEDR);
+    st_hedr->setSymbol(*sF);
+    fe = new SgFunctionRefExp(*sF);
+    fe->setSymbol(*sF);
+    st_hedr->setExpression(0, *fe);
+
+    // create end of function 
+    st_end = new SgStatement(CONTROL_END);
+    st_end->setSymbol(*sF);
+
+    if (!isMain)
+    {
+        //fill global
+        first_do_par = prog;
+
+        fe = st_hedr->expr(0);
+        int num = prog->numberOfParameters();
+        for (int z = 0; z < num; ++z)
+        {
+            SgSymbol* arg = prog->parameter(z);
+            auto typ = C_Type(arg->type());
+            if (arg->type()->variant() == T_STRING)
+                typ = C_PointerType(SgTypeChar());
+            auto s = new SgSymbol(VARIABLE_NAME, arg->identifier(), *typ, *st_hedr);
+            
+            SgExpression* ae = new SgVarRefExp(s);
+            ae->setType(typ);
+            if (arg->type()->variant() == T_STRING)
+                ae = new SgPointerDerefExp(*ae);
+
+            if (z == 0)
+            {
+                arg_list = new SgExprListExp(*ae);
+                fe->setLhs(arg_list);
+            }
+            else
+            {
+                auto el = new SgExpression(EXPR_LIST);
+                el->setLhs(NULL);
+                ae->setLhs(*el);
+
+                arg_list->setRhs(*new SgExprListExp(*ae));
+                arg_list = arg_list->rhs();
+            }
+        }
+
+        first_do_par = NULL;
+    }
+
+    return st_hedr;
+}
+
+static void shiftIntValue(SgExpression* ex, SgExpression* par, bool isLeft, const set<string>& for_vars, bool& rep)
+{
+    if (ex)
+    {
+        if (ex->variant() == VAR_REF && for_vars.find(ex->symbol()->identifier()) != for_vars.end())
+        {
+            if (isLeft)
+                par->setLhs(*new SgExpression(SUBT_OP, ex->copyPtr(), new SgValueExp(1)));
+            else
+                par->setRhs(*new SgExpression(SUBT_OP, ex->copyPtr(), new SgValueExp(1)));
+            rep = true;
+        }
+
+        shiftIntValue(ex->lhs(), ex, true, for_vars, rep);
+        shiftIntValue(ex->rhs(), ex, false, for_vars, rep);
+    }
+}
+
+static void findArrayRef(SgExpression* ex, const set<string>& for_vars)
+{
+    if (ex)
+    {
+        if (ex->variant() == ARRAY_REF)
+        {
+            SgArrayRefExp* ref = (SgArrayRefExp*)ex;
+            SgExpression* list = ex->lhs();
+            for (int z = 0; z < ref->numberOfSubscripts(); ++z)
+            {
+                bool rep = false;
+                if (for_vars.size())
+                    shiftIntValue(ref->subscript(z), list, true, for_vars, rep);
+                
+                if (!rep || for_vars.size() == 0)
+                {
+                    auto sub = ref->subscript(z);
+                    auto val = isSgValueExp(sub);
+                    if (val && val->isInteger())
+                        val->setValue(val->intValue() - 1);
+                    else
+                        list->setLhs(*new SgExpression(SUBT_OP, sub->copyPtr(), new SgValueExp(1)));
+
+                }
+                list = list->rhs();
+            }
+        }
+
+        findArrayRef(ex->lhs(), for_vars);
+        findArrayRef(ex->rhs(), for_vars);
+    }
+}
+
+static void findLoopSymbols(SgExpression* ex, set<string>& vars)
+{
+    if (ex)
+    {
+        if (ex->variant() == VAR_REF)
+            vars.insert(ex->symbol()->identifier());
+        findLoopSymbols(ex->lhs(), vars);
+        findLoopSymbols(ex->rhs(), vars);
+    }
+}
+
 void covertToC(SgFile* file)
 {
-    printf("%s\n", file->firstStatement()->unparse(C_LANG));
+    out_upper_case = 0;
+
+    int funcNum = file->numberOfFunctions();
+    SgStatement* global = file->firstStatement();
+
+    vector<SgStatement*> funcs;
+
+    for (int i = 0; i < funcNum; ++i)
+        funcs.push_back(file->functions(i));
+
+    for (int i = funcs.size() - 1; i >= 0; --i)
+    {
+        SgStatement* st = funcs[i];
+        SgStatement* last = st->lastNodeOfStmt();
+
+        //fill global dvm variables
+        cur_func = st;
+        bind_ = 1;
+        //
+
+        SgStatement* func = createNewFunc(st->variant() == PROG_HEDR ? NULL : st->symbol()->copyPtr(), file, isSgProgHedrStmt(st));
+        SgStatement* lastOfFunc = func->lastNodeOfStmt();
+        global->insertStmtAfter(*func, *global);
+        
+        set<string> for_vars;
+        vector<SgStatement*> dvm_dirs;
+        for (SgStatement* st = funcs[i]; st != last; )
+        {
+            if (st->variant() == FOR_NODE)
+                for_vars.insert(isSgForStmt(st)->doName()->identifier());
+            else if (st->variant() == CONTROL_END)
+            {
+                auto cp = st->controlParent();
+                if (cp->variant() == FOR_NODE)
+                    for_vars.erase(isSgForStmt(cp)->doName()->identifier());
+            }
+            else if (st->variant() == DVM_PARALLEL_ON_DIR)
+            {
+                SgExpression* rule = st->expr(2);
+                findLoopSymbols(rule, for_vars);
+            }
+
+            for (int z = 0; z < 3; ++z)
+                findArrayRef(st->expr(z), for_vars);
+
+            if (isDVM_stat(st))
+            {
+                SgStatement* next = st->lexNext();
+                dvm_dirs.push_back(st->extractStmt());
+                st = next;
+            }
+            else if(st->variant() == ALLOCATE_STMT ||
+                    st->variant() == DEALLOCATE_STMT)
+            {
+                SgStatement* next = st->lexNext();
+                st->extractStmt();
+                st = next;
+            }
+            else
+                st = st->lexNext();
+
+            if (st->variant() == DVM_PARALLEL_ON_DIR)
+                for_vars.clear();
+        }
+
+        string dvm_comm = "";
+        int dir_pos = 0;
+        int dir_line = dvm_dirs.size() ? dvm_dirs[dir_pos]->lineNumber() : -1;
+
+        for (SgStatement* st = funcs[i]; st != last; st = st->lexNext())
+        {
+            int curr_line = st->lineNumber();
+            while (dir_line < curr_line && dir_line != -1)
+            {
+                SgStatement* dir = dvm_dirs[dir_pos];
+                if (dir->variant() == DVM_PARALLEL_ON_DIR)
+                {
+                    vector<SgStatement*> rems;
+                    vector<string> addS;
+
+                    SgStatement* tmp0 = new SgAssignStmt(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "tmp0")), *dir->expr(0));
+                    SgStatement* tmp2 = new SgAssignStmt(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "tmp2")), *dir->expr(2));
+
+                    SgExpression* list = dir->expr(1);
+                    while (list)
+                    {
+                        SgExpression* item = list->lhs();
+                        if (item->variant() != REMOTE_ACCESS_OP)
+                        {
+                            string s = item->unparse();
+                            convertToLower(s);
+                            addS.push_back(s);
+                        }
+                        else
+                            rems.push_back(new SgAssignStmt(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "tmp1")), *item->lhs()));
+                        list = list->rhs();
+                    }
+
+                    SgCExpStmt* conv0 = (SgCExpStmt*)Translate_Fortran_To_C(tmp0, true);
+                    SgCExpStmt* conv2 = (SgCExpStmt*)Translate_Fortran_To_C(tmp2, true);
+
+                    Set_Function_Language(C_LANG);
+                    string array = conv0->expr()->rhs()->unparse();
+                    string rule = conv2->expr()->rhs()->unparse();
+
+                    for (auto& conv : rems)
+                    {
+                        SgCExpStmt* convE = (SgCExpStmt*)Translate_Fortran_To_C(conv, true);
+                        string s = convE->expr()->rhs()->unparse();
+                        convertToLower(s);
+                        addS.push_back(string("remote_access(") + s + ")");
+                    }
+                    Unset_Function_Language();
+
+                    char buf[1024];
+                    sprintf(buf, "#pragma dvm parallel([%s] on %s) ", rule.c_str(), array.c_str());
+                    string pragma = buf;
+
+                    for (int z = 0; z < addS.size(); ++z)
+                    {
+                        pragma += addS[z];
+                        if (z != addS.size() - 1)
+                            pragma += ", ";
+                    }
+
+                    if (dvm_comm.size())
+                        dvm_comm += "\n";
+                    dvm_comm += pragma;
+                }
+                else if (dir->variant() == ACC_END_REGION_DIR)
+                {
+                    if (dvm_comm.size())
+                        dvm_comm += "\n";
+                    dvm_comm += "         }";
+                }
+                else if (dir->variant() == ACC_REGION_DIR)
+                {
+                    if (dvm_comm.size())
+                        dvm_comm += "\n";
+
+                    string type = "";
+                    if (dir->expr(0))
+                    {
+                        type = dir->expr(0)->unparse();
+                        convertToLower(type);
+                    }
+                    dvm_comm += string("#pragma dvm region ") + type + "\n";
+                    dvm_comm += "         {";
+                }
+                else if (dir->variant() == ACC_GET_ACTUAL_DIR)
+                {
+                    if (dvm_comm.size())
+                        dvm_comm += "\n";
+
+                    SgStatement* tmp0 = new SgAssignStmt(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "tmp0")), *dir->expr(0));
+                    SgCExpStmt* conv0 = (SgCExpStmt*)Translate_Fortran_To_C(tmp0, true);
+
+                    Set_Function_Language(C_LANG);
+                    string array = conv0->expr()->rhs()->unparse();
+                    Unset_Function_Language();
+
+                    dvm_comm += "#pragma dvm get_actual(" + array + ")";
+                }
+
+                dir_pos++;
+                dir_line = (dir_pos < dvm_dirs.size()) ? dvm_dirs[dir_pos]->lineNumber() : -1;
+            }
+
+            if (isSgExecutableStatement(st))
+            {
+                SgStatement* conv = Translate_Fortran_To_C(st, true);
+                if (st->comments())
+                {
+                    string str(st->comments());
+                    vector<string> result;
+                    splitString(str, '\n', result);
+                    str = "";
+                    for (int z = 0; z < result.size(); ++z)
+                    {
+                        str += "//" + result[z].substr(1, result[z].size());
+                        if (z != result.size() - 1)
+                            str += "\n";
+                    }
+                    conv->addComment(str.c_str());
+                }
+
+                if (dvm_comm.size())
+                {
+                    conv->addComment(dvm_comm.c_str());
+                    dvm_comm.clear();
+                }
+                lastOfFunc->insertStmtBefore(*conv, *func);
+                //printf("on line %d\n%s\n", st->lineNumber(), conv->unparse(C_LANG));
+                st = st->lastNodeOfStmt();
+            }
+        }
+        funcs[i]->extractStmt();        
+    }
+
+    /*string includes;
+    includes += "#include <math.h>\n";
+    includes += "#include <stdlib.h>\n";
+    includes += "#include <stdio.h>\n";
+
+    global->addComment(includes.c_str());*/
+
+    FILE* file_out = fopen((OnlyName(file->filename()) + ".cdv").c_str(), "w");
+    fprintf(file_out, "%s\n", global->unparse(C_LANG));
+    fclose(file_out);
 }

sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp

@@ -3,6 +3,7 @@
 #include "../Utils/errors.h"
 #include "../Utils/SgUtils.h"
 #include "../Utils/utils.h"
+#include "../ExpressionTransform/expr_transform.h"
 
 using std::make_pair;
 using std::map;
@@ -26,7 +27,6 @@ struct FixedSubscript {
 struct RegularExpr {
     int coefA;
     int coefB;
-    SgSymbol* varSymbol;
 };
 
 // DefUseStmtsPair represents pair of DEF and USE statements for private variable
@@ -57,7 +57,7 @@ static void fillDirectArrayRefs(SgExpression* exp, SgSymbol* arraySym, vector<Sg
     fillDirectArrayRefs(exp->rhs(), arraySym, refs);
 }
 
-// getDirectArrayRefs returns all direct arraySym references in stmt,
+// getDirectArrayRefs returns all direct arraySym references in compound stmt,
 // except VAR_DECL statements
 static vector<SgArrayRefExp*> getDirectArrayRefs(SgStatement* stmt, SgSymbol* arraySym)
 {
@@ -81,6 +81,22 @@ static vector<SgArrayRefExp*> getDirectArrayRefs(SgStatement* stmt, SgSymbol* ar
     return arrayRefs;
 }
 
+// getDirectArrayRefs returns all direct arraySym references in single stmt,
+// except VAR_DECL statements
+static vector<SgArrayRefExp*> getDirectArrayRefsFromSingleStmt(SgStatement* stmt, SgSymbol* arraySym)
+{
+    vector<SgArrayRefExp*> arrayRefs;
+    if (stmt == nullptr)
+        return arrayRefs;
+
+    if (stmt->variant() != VAR_DECL && stmt->variant() != VAR_DECL_90) // skip var declaration stmt
+        for (int i = 0; i < 3; ++i)
+            fillDirectArrayRefs(stmt->expr(i), arraySym, arrayRefs);
+
+
+    return arrayRefs;
+}
+
 static bool isArrayRefInVector(SgArrayRefExp* ref, const vector<SgArrayRefExp*>& arrayRefs)
 {
     for (SgArrayRefExp* arrayRef : arrayRefs)
@@ -92,62 +108,20 @@ static bool isArrayRefInVector(SgArrayRefExp* ref, const vector<SgArrayRefExp*>&
 
 // checkAndFillRegularExpr checks if expr is regular and fills regularExpr struct
 // with info about expr
-static bool checkAndFillRegularExpr(SgExpression* expr, RegularExpr& regularExpr)
+static bool checkAndFillRegularExpr(SgExpression* expr, RegularExpr& regularExpr, SgSymbol* iterationVar)
 {
-    regularExpr.coefA = 0;
+    pair<int, int> retCoefs;
-    regularExpr.coefB = 0;
+    getCoefsOfSubscript(retCoefs, expr, iterationVar);
-    regularExpr.varSymbol = nullptr;
 
-    if (expr->variant() == INT_VAL) // expr is like ( coefB )
+    regularExpr.coefA = retCoefs.first;
-    {
+    regularExpr.coefB = retCoefs.second;
-        regularExpr.coefB = expr->valueInteger();
-        return true;
-    }
 
-    if (expr->variant() == VAR_REF) // expr is like ( I )
+    if (retCoefs.first != 0 || retCoefs.second != 0)
-    {
-        regularExpr.coefA = 1;
-        regularExpr.varSymbol = expr->symbol();
         return true;
-    }
 
-    // is expr like ( coefA * I ):
+    // check if expr is like ( 0 ), because we cannot separate zero const int expr from incorrect expr:
-    if (expr->variant() == MULT_OP)
+    if (expr->variant() == INT_VAL)
-    {
-        if (expr->lhs()->variant() == INT_VAL && expr->rhs()->variant() == VAR_REF)
-        {
-            regularExpr.coefA = expr->lhs()->valueInteger();
-            regularExpr.varSymbol = expr->rhs()->symbol();
         return true;
-        }
-    }
-
-    if ((expr->variant() == ADD_OP || expr->variant() == SUBT_OP) && expr->rhs()->variant() == INT_VAL)
-    {
-        if (expr->variant() == ADD_OP)
-            regularExpr.coefB = expr->rhs()->valueInteger();
-        else // expr->variant() == SUBT_OP
-            regularExpr.coefB = (-1) * expr->rhs()->valueInteger();
-
-        if (expr->lhs()->variant() == MULT_OP)  // is expr like ( coefA * I + coefB )
-        {
-            if (expr->lhs()->lhs()->variant() == INT_VAL && expr->lhs()->rhs()->variant() == VAR_REF)
-            {
-                regularExpr.coefA = expr->lhs()->lhs()->valueInteger();
-                regularExpr.varSymbol = expr->lhs()->rhs()->symbol();
-                return true;
-            }
-        }
-        else  // is expr like ( I + coefB ):
-        {
-            if (expr->lhs()->variant() == VAR_REF)
-            {
-                regularExpr.coefA = 1;
-                regularExpr.varSymbol = expr->lhs()->symbol();
-                return true;
-            }
-        }
-    }
 
     return false;
 }
@@ -155,7 +129,7 @@ static bool checkAndFillRegularExpr(SgExpression* expr, RegularExpr& regularExpr
 // getShortFixedSubscriptsVector returns vector of fixed INT_VAL subscripts of arrayRef
 static vector<int> getShortFixedSubscriptsVector(SgArrayRefExp* arrayRef,
                                                  const vector<bool>& fixedDimensionsMask,
-                                                 Regime regime)
+                                                 Regime regime, vector<SgSymbol*> iterationVars)
 {
     if (regime == Regime::DEFLT)
     {
@@ -170,11 +144,14 @@ static vector<int> getShortFixedSubscriptsVector(SgArrayRefExp* arrayRef,
     {
         vector<int> subscriptsVector;
         SgExprListExp* indexExprList = (SgExprListExp*)arrayRef->lhs();
+        if (iterationVars.size() < indexExprList->length())
+            return vector<int>{};
+
         for (int i = 0; i < indexExprList->length(); ++i)
         {
             SgExpression* indexExpr = indexExprList->elem(i);
             RegularExpr regularExpr;
-            if (!checkAndFillRegularExpr(indexExpr, regularExpr))
+            if (!checkAndFillRegularExpr(indexExpr, regularExpr, iterationVars[i]))
                 return vector<int>{};
 
             subscriptsVector.push_back(regularExpr.coefA);
@@ -187,17 +164,39 @@ static vector<int> getShortFixedSubscriptsVector(SgArrayRefExp* arrayRef,
     return vector<int>{};
 }
 
+static vector<int> getShortFixedSubscriptsVector(SgArrayRefExp* arrayRef, const PrivateToRemove& varToRemove)
+{
+    vector<SgSymbol*> iterationVars;
+    if (varToRemove.regime == Regime::REGULAR_INDEXES)
+    {
+        auto vars = varToRemove.arrayRefToIterationVarsMap.find(arrayRef);
+        if (vars != varToRemove.arrayRefToIterationVarsMap.end())
+            iterationVars = vars->second;
+    }
+    return getShortFixedSubscriptsVector(arrayRef, varToRemove.fixedDimensions,
+                                         varToRemove.regime, iterationVars);
+}
+
 // removeDuplicateArrayRefs returns unique array refereces in fixed dimensions
 static vector<SgArrayRefExp*> removeDuplicateArrayRefs(const vector<SgArrayRefExp*>& arrayRefs,
                                                        const vector<bool>& fixedDimensionsMask,
-                                                       Regime regime)
+                                                       Regime regime,
+                                                       const map<SgArrayRefExp*, vector<SgSymbol*>>& arrayRefToIterVarsMap)
 {
     map<vector<int>, SgArrayRefExp*> uniqueRefs;
-    for (SgArrayRefExp* ref : arrayRefs)
+    for (SgArrayRefExp* arrayRef : arrayRefs)
     {
-        vector<int> subscripts = getShortFixedSubscriptsVector(ref, fixedDimensionsMask, regime);
+        vector<SgSymbol*> iterationVars;
+        if (regime == Regime::REGULAR_INDEXES)
+        {
+            auto vars = arrayRefToIterVarsMap.find(arrayRef);
+            if (vars != arrayRefToIterVarsMap.end())
+                iterationVars = vars->second;
+        }
+
+        vector<int> subscripts = getShortFixedSubscriptsVector(arrayRef, fixedDimensionsMask, regime, iterationVars);
         if (uniqueRefs.find(subscripts) == uniqueRefs.end())
-            uniqueRefs.insert(make_pair(subscripts, ref));
+            uniqueRefs.insert(make_pair(subscripts, arrayRef));
     }
 
     vector<SgArrayRefExp*> result;
@@ -469,9 +468,7 @@ static SgExpression* substituteExpressions(SgExpression* exp,
     if (exp->variant() == ARRAY_REF)
     {
         const auto& refToExp = refToExpMap.find(exp->unparse());
-        if (refToExp == refToExpMap.end())
+        if (refToExp != refToExpMap.end())
-            return exp;
-
             return refToExp->second;
     }
     
@@ -553,7 +550,7 @@ static void fillReadShortFixedSubscripts(SgExpression* exp, const PrivateToRemov
     {
         if (isEqSymbols(exp->symbol(), var.varSymbol))
         {
-            auto subscripts = getShortFixedSubscriptsVector((SgArrayRefExp*)exp, var.fixedDimensions, var.regime);
+            auto subscripts = getShortFixedSubscriptsVector((SgArrayRefExp*)exp, var);
             fixedSubscripts.insert(subscripts);
             return;
         }
@@ -597,8 +594,7 @@ static void removeExcessiveDefs(const PrivateToRemove& var)
         if (st->expr(0)->symbol() == nullptr || !isEqSymbols(st->expr(0)->symbol(), var.varSymbol))
             continue;
 
-        auto subscripts = getShortFixedSubscriptsVector((SgArrayRefExp*) st->expr(0), var.fixedDimensions,
+        auto subscripts = getShortFixedSubscriptsVector((SgArrayRefExp*) st->expr(0), var);
-                                                        var.regime);
         if (usedFixedSubscripts.find(subscripts) == usedFixedSubscripts.end())
             stmtsToRemove.push_back(st);
     }
@@ -699,8 +695,7 @@ static set<vector<int>> removeArray(string filename, const PrivateToRemove& arra
         SgStatement* useStmt = defUsePair.second;
 
         SgArrayRefExp* defRef = (SgArrayRefExp*)defStmt->lhs();
-        vector<int> defFixedSubscripts = getShortFixedSubscriptsVector(defRef, fixedDimensions,
+        vector<int> defFixedSubscripts = getShortFixedSubscriptsVector(defRef, arrayToRemove);
-                                                                       arrayToRemove.regime);
 
         int startIndex = 0;
         if (useStmt->variant() == ASSIGN_STAT)
@@ -715,8 +710,7 @@ static set<vector<int>> removeArray(string filename, const PrivateToRemove& arra
 
             for (SgArrayRefExp* useRef : arrayUseRefs)
             {
-                vector<int> useFixedSubscripts = getShortFixedSubscriptsVector(useRef, fixedDimensions,
+                vector<int> useFixedSubscripts = getShortFixedSubscriptsVector(useRef, arrayToRemove);
-                                                                               arrayToRemove.regime);
                 if (defFixedSubscripts != useFixedSubscripts)
                     continue; // because useRef and defRef can be different in subscripts of fixed dimensions
 
@@ -767,10 +761,11 @@ void removePrivates(SgFile* file, vector<Messages>& messages, int& countOfTransf
         }
         else
         {
-            varRefs = removeDuplicateArrayRefs(varRefs, fixedDimensions, varToRemove.regime);
+            varRefs = removeDuplicateArrayRefs(varRefs, fixedDimensions, varToRemove.regime,                               
+                                               varToRemove.arrayRefToIterationVarsMap);
             for (auto& varRef : varRefs)
             {
-                vector<int> subscripts = getShortFixedSubscriptsVector(varRef, fixedDimensions, varToRemove.regime);
+                vector<int> subscripts = getShortFixedSubscriptsVector(varRef, varToRemove);
                 if (removedDimensions.find(subscripts) != removedDimensions.end())
                 {
                     varName = getDimensionVarName(varToRemove.varSymbol, subscripts,
@@ -811,10 +806,9 @@ struct Context {
     SgForStmt* loopStmt;
     SgSymbol* arraySymbol;
     int dimensionsNum;
-    // string arrayName; // TODO: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> arraySym <20><> arrayName
     vector<SgArrayRefExp*> explicitArrayRefs;
-    //vector<pair<SgArrayRefExp*, RegularExpr>> regularIndexRefs;
     vector<bool> fixedDimensionsMask;
+    map<SgArrayRefExp*, vector<SgSymbol*>> arrayRefToIterationVarsMap;
 };
 
  // ReducedArrayVars represents mapping of array reference to reduced scalar var:
@@ -879,6 +873,33 @@ static vector<InsertedStatement>::const_iterator findInsertedStmt(const vector<I
     return insertedStmts.end();
 }
 
+static vector<int> getShortFixedSubscriptsVector(Context* ctx, SgArrayRefExp* arrayRef)
+{
+    vector<SgSymbol*> iterationVars;
+    if (ctx->regime == Regime::REGULAR_INDEXES)
+    {
+        auto vars = ctx->arrayRefToIterationVarsMap.find(arrayRef);
+        if (vars != ctx->arrayRefToIterationVarsMap.end())
+            iterationVars = vars->second;
+    }
+
+    return getShortFixedSubscriptsVector(arrayRef, ctx->fixedDimensionsMask, ctx->regime, iterationVars);
+}
+
+// fillIterationVariables fill vars set with iteration variables of all loops
+// from stmt to outerLoopStmt
+static void fillIterationVars(SgStatement* stmt, SgStatement* outerLoopStmt, vector<SgSymbol*>& vars)
+{
+    if (stmt == nullptr)
+        return;
+
+    if (stmt->variant() == FOR_NODE)
+        vars.push_back(((SgForStmt*)stmt)->doName());
+
+    if (stmt->id() != outerLoopStmt->id())
+        fillIterationVars(stmt->controlParent(), outerLoopStmt, vars);
+}
+
 // matchesFixedDimensionsMask checks if all array references have INT_VAL value in fixed dimension
 static bool checkFixedDimensionsMaskMatching(Context* ctx)
 {
@@ -894,13 +915,14 @@ static bool checkFixedDimensionsMaskMatching(Context* ctx)
 // and VAR_REF in non-fixed dimensions
 static bool checkDefStmtRefsMatchesMask(Context* ctx)
 {
-    // TODO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> VAR_REF - <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
-    // <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> a * i + b, <20><> i <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
     for (SgStatement* st = ctx->loopStmt->lexNext(); st != ctx->loopStmt->lastNodeOfStmt(); st = st->lexNext())
     {
         if (st->variant() != ASSIGN_STAT)
             continue;
 
+        vector<SgSymbol*> iterationVars;
+        fillIterationVars(st, ctx->loopStmt, iterationVars);
+
         if (isEqSymbols(st->expr(0)->symbol(), ctx->arraySymbol)) // DEF statement
         {
             SgArrayRefExp* ref = (SgArrayRefExp*)st->expr(0);
@@ -908,8 +930,19 @@ static bool checkDefStmtRefsMatchesMask(Context* ctx)
             {   
                 if (ctx->fixedDimensionsMask[i] && ref->subscript(i)->variant() == INT_VAL)
                     continue;
+
                 if (!ctx->fixedDimensionsMask[i] && ref->subscript(i)->variant() == VAR_REF)
+                {
+                    bool isIterationVar = false;
+                    for (auto iterationvVar : iterationVars)
+                        if (isEqSymbols(ref->subscript(i)->symbol(), iterationvVar))
+                            isIterationVar = true;
+                    
+                    if (!isIterationVar)
+                        return false;
+
                     continue;
+                }
                 
                 return false;
             }
@@ -951,44 +984,40 @@ static string sunparseFixedDimensionsVector(const vector<bool>& fixedDimensions)
     return result;
 }
 
-// fillIterationVariables fill vars set with iteration variables of all loops
-// from stmt to outerLoopStmt
-static void fillIterationVars(SgStatement* stmt, SgStatement* outerLoopStmt, set<string>& vars)
-{
-    if (stmt == nullptr)
-        return;
-
-    if (stmt->variant() == FOR_NODE)
-        vars.insert(((SgForStmt*)stmt)->doName()->identifier());
-
-    if (stmt->id() != outerLoopStmt->id())
-        fillIterationVars(stmt->controlParent(), outerLoopStmt, vars);
-}
-
 static bool checkRegularIndexRefs(Context* ctx)
 {
-    for (auto arrayRef : ctx->explicitArrayRefs)
-    {
-        SgExprListExp* indexExprList = (SgExprListExp*)arrayRef->lhs();
-        for (int i = 0; i < ctx->dimensionsNum; ++i)
-        {
-            SgExpression* indexExpr = indexExprList->elem(i);
-            RegularExpr regularExpr;
-            if (!checkAndFillRegularExpr(indexExpr, regularExpr))
-                return false;
-
-            //ctx->regularIndexRefs.push_back(make_pair(arrayRef, regularExpr));
-        }        
-    }
-
     vector<SgArrayRefExp*> newArrayRefsVector;
     for (SgStatement* st = ctx->loopStmt->lexNext(); st != ctx->loopStmt->lastNodeOfStmt(); st = st->lexNext())
     {
-        if (st->variant() != ASSIGN_STAT || !isEqSymbols(st->expr(0)->symbol(), ctx->arraySymbol))
+        vector<SgSymbol*> iterationVars;
+        fillIterationVars(st, ctx->loopStmt, iterationVars);
+
+        vector<SgArrayRefExp*> arrayRefs = getDirectArrayRefsFromSingleStmt(st, ctx->arraySymbol);
+        for (auto arrayRef : arrayRefs)
+        {
+            if (!isArrayRefInVector(arrayRef, ctx->explicitArrayRefs))
                 continue;
 
-        if (isSymbolInExpression(ctx->arraySymbol, st->expr(1)))
+            SgExprListExp* indexExprList = (SgExprListExp*)arrayRef->lhs();
+            if (iterationVars.size() < indexExprList->length())
                 return false;
+
+            for (int i = 0; i < indexExprList->length(); ++i)
+            {
+                SgExpression* indexExpr = indexExprList->elem(i);
+                RegularExpr regularExpr;
+                if (!checkAndFillRegularExpr(indexExpr, regularExpr, iterationVars[i]))
+                    return false;
+            }
+
+            if (st->variant() == ASSIGN_STAT && isEqSymbols(st->expr(0)->symbol(), ctx->arraySymbol))
+                for (auto iterationVar : iterationVars)
+                    if (isSymbolInExpression(iterationVar, st->expr(1)))
+                        return false;
+
+            iterationVars.resize(indexExprList->length());
+            ctx->arrayRefToIterationVarsMap.insert(make_pair(arrayRef, iterationVars));
+        }
     }
 
     return true;
@@ -1287,12 +1316,12 @@ static ReducedArrayVarsMap getReducedArrayVars(Context* ctx)
 
     SgType* type = ctx->explicitArrayRefs[0]->type();
     SgStatement* scope = ctx->loopStmt->getScopeForDeclare();
-    for (SgArrayRefExp* ref : ctx->explicitArrayRefs)
+    for (SgArrayRefExp* arrayRef : ctx->explicitArrayRefs)
     {
-        vector<int> subscripts = getShortFixedSubscriptsVector(ref, ctx->fixedDimensionsMask, ctx->regime);
+        vector<int> subscripts = getShortFixedSubscriptsVector(ctx, arrayRef);
         if (reducedArrayVars.find(subscripts) == nullptr)
         {
-            string name = getReducedArrayVarName(ref->symbol(), subscripts);
+            string name = getReducedArrayVarName(arrayRef->symbol(), subscripts);
 
             int nameNumber = checkSymbNameAndCorrect(name + "__", 0);
             if (nameNumber != 0)
@@ -1321,7 +1350,7 @@ static set<string> getVarsToDependOn(SgForStmt* loopStmt, SgSymbol* var)
 static InsertedStatement getDefStmtForReducedArray(Context* ctx, SgArrayRefExp* arrayRef, 
                                                    const ReducedArrayVarsMap& reducedArrayVars)
 {
-    vector<int> subscriptVector = getShortFixedSubscriptsVector(arrayRef, ctx->fixedDimensionsMask, ctx->regime);
+    vector<int> subscriptVector = getShortFixedSubscriptsVector(ctx, arrayRef);
     SgSymbol* reducedVar = reducedArrayVars.find(subscriptVector);
     if (reducedVar == nullptr)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -1339,7 +1368,7 @@ static InsertedStatement getUseStmtForReducedArray(Context* ctx, SgArrayRefExp*
                                                    const ReducedArrayVarsMap& reducedArrayVars,
                                                    SgSymbol* receiverVar)
 {
-    vector<int> subscriptVector = getShortFixedSubscriptsVector(arrayRef, ctx->fixedDimensionsMask, ctx->regime);
+    vector<int> subscriptVector = getShortFixedSubscriptsVector(ctx, arrayRef);
     SgSymbol* reducedVar = reducedArrayVars.find(subscriptVector);
     if (reducedVar == nullptr)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -1371,7 +1400,8 @@ static vector<InsertedStatement> insertReducedArrayVarStmts(Context* ctx,
             {
                 vector<SgArrayRefExp*> arrayRefs;
                 fillDirectArrayRefs(st->expr(i), ctx->arraySymbol, arrayRefs);
-                arrayRefs = removeDuplicateArrayRefs(arrayRefs, ctx->fixedDimensionsMask, ctx->regime);
+                arrayRefs = removeDuplicateArrayRefs(arrayRefs, ctx->fixedDimensionsMask, ctx->regime,
+                                                     ctx->arrayRefToIterationVarsMap);
                 if (!arrayRefs.empty())
                     isUseStmt = true;
 
@@ -1696,7 +1726,7 @@ static bool checkDefUsePair(Context* ctx, DefUseStmtsPair defUse, const CFG_Type
 
     vector<pair<string, vector<FixedSubscript>>> dependOnVars;
     SgArrayRefExp* defRef = (SgArrayRefExp*)defUse.first->expr(0);
-    vector<SgArrayRefExp*> arrayUseRefs = getDirectArrayRefs(defUse.second, ctx->arraySymbol);
+    vector<SgArrayRefExp*> arrayUseRefs = getDirectArrayRefsFromSingleStmt(defUse.second, ctx->arraySymbol);
     for (auto useRef : arrayUseRefs)
     {
         map<SgSymbol*, SgExpression*> varToExpMap = getVarToExpMap(defRef, useRef, ctx->fixedDimensionsMask);
@@ -1706,7 +1736,7 @@ static bool checkDefUsePair(Context* ctx, DefUseStmtsPair defUse, const CFG_Type
         fillFixedSubscriptsVectorsOfAllVars(expToSubst, dependOnVars);
     }
 
-    set<string> iterationVars{};
+    vector<SgSymbol*> iterationVars{};
     fillIterationVars(defUse.second, ctx->loopStmt, iterationVars);
 
     auto defInsAndBlock = getInstructionAndBlockByStatement(CFGraph, defUse.first);
@@ -1718,7 +1748,17 @@ static bool checkDefUsePair(Context* ctx, DefUseStmtsPair defUse, const CFG_Type
         if (var.second.size() == 0) // check scalar vars
         {
             // iteration var doesn't obstruct the removing:
-            if (iterationVars.find(var.first) != iterationVars.end())
+            bool isIterationVar = false;
+            for (auto iterationVar : iterationVars)
+            {
+                if (iterationVar->identifier() == var.first)
+                {
+                    isIterationVar = true;
+                    break;
+                }
+            }
+
+            if (isIterationVar)
                 continue;
 
             auto defArg = findVarInRDSet(defRD_In, var.first);
@@ -1879,6 +1919,7 @@ void removePrivateAnalyze(Context *ctx)
         newPrivateToRemove.regime = ctx->regime;
         newPrivateToRemove.defUseStmtsPairs.swap(resultDefUsePairs);
         newPrivateToRemove.fixedDimensions.swap(ctx->fixedDimensionsMask);
+        newPrivateToRemove.arrayRefToIterationVarsMap = ctx->arrayRefToIterationVarsMap;
 
         privatesToRemoveGlobal.push_back(newPrivateToRemove);
     }

sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.h

@@ -17,6 +17,7 @@ struct PrivateToRemove {
     Regime regime;
     std::vector<std::pair<SgAssignStmt*, SgStatement*>> defUseStmtsPairs;
     std::vector<bool> fixedDimensions;
+    std::map<SgArrayRefExp*, std::vector<SgSymbol*>> arrayRefToIterationVarsMap;
 };
 
 // removePrivates removes all privates from vector privatesToRemoveGloval

sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp

@@ -2920,6 +2920,7 @@ private:
             ret = pipe(pipes, 1024 * 1024 * 20, O_BINARY); // 20 MB
 #else            
             ret = pipe(pipes) == -1;
+            fcntl(*pipes, F_SETPIPE_SZ, 1024 * 1024 * 20);
 #endif
             fd_blocked = (errno == EINTR || errno == EBUSY);
             if (fd_blocked)

sapfor/experts/Sapfor_2017/_src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2254"
+#define VERSION_SPF "2255"