fix algorythm

src/CFGraph/CFGraph.cpp

@@ -1162,6 +1162,7 @@ map<FuncInfo*, vector<BBlock*>> buildCFG(const map<string, CommonBlock*>& common
     if (SgFile::switchToFile(oldFile) == -1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
+    if (!settings.withUnreachable) 
         for (auto& [func, blocks] : result)
             removedUnreachableBlocks(blocks);
 

src/CFGraph/CFGraph.h

@@ -105,23 +105,52 @@ namespace SAPFOR
 
     struct CFG_Settings
     {
+        enum setting { CFG_atLeastOneIterInLoop = 1, 
+                       CFG_withRD = 2, 
+                       CFG_withRegisters = 3,  
+                       CFG_withSPF = 4, 
+                       CFG_withDVM = 5, 
+                       CFG_withCallsInBlocks = 6, 
+                       CFG_withCallFrom = 7, 
+                       CFG_withDominators = 8, 
+                       CFG_withUnreachable = 9 };
+
         bool atLeastOneIterInLoop = false;
-        bool withRD = true;
+        bool withRD =               false;
         bool withRegisters =        false;
         bool withSPF =              false;
         bool withDVM =              false;
         bool withCallsInBlocks =    false; // separate each F_CALL to own BasicBlock
-        bool withCallFrom = true;
+        bool withCallFrom =         false;
-        bool withDominators = true;
+        bool withDominators =       false;
+        bool withUnreachable =      false;
 
-        explicit CFG_Settings(int) { }
+        explicit CFG_Settings(const std::set<setting> &settings = { CFG_withRD, CFG_withCallFrom, CFG_withDominators })
-
+        {
-        explicit CFG_Settings(bool atLeastOneIterInLoop = false, bool withRD = true, bool withRegisters = false, 
+            for (auto& set : settings)
-                              bool withDVM = false, bool withSPF = false, bool withCallsInBlocks = false, 
+            {
-                              bool withCallFrom = true, bool withDominators = true) :
+                if (set == CFG_atLeastOneIterInLoop)
-            atLeastOneIterInLoop(atLeastOneIterInLoop), withRD(withRD), withRegisters(withRegisters), withDVM(withDVM), withSPF(withSPF), 
+                    atLeastOneIterInLoop = true;
-            withCallsInBlocks(withCallsInBlocks), withCallFrom(withCallFrom), withDominators(withDominators)
+                else if (set == CFG_withRD)
-        { }
+                    withRD = true;
+                else if (set == CFG_withRegisters)
+                    withRegisters = true;
+                else if (set == CFG_withSPF)
+                    withSPF = true;
+                else if (set == CFG_withDVM)
+                    withDVM = true;
+                else if (set == CFG_withCallsInBlocks)
+                    withCallsInBlocks = true;
+                else if (set == CFG_withCallFrom)
+                    withCallFrom = true;
+                else if (set == CFG_withDominators)
+                    withDominators = true;
+                else if (set == CFG_withUnreachable)
+                    withUnreachable = true;
+                else
+                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+            }
+        }
     };
 }
 

src/CFGraph/private_variables_analysis.cpp

@@ -200,20 +200,46 @@ static void fillOutForFunc(const FuncInfo* func, const vector<SAPFOR::BasicBlock
     outForFunc[func->funcName] = { defined, common_defined };
 }
 
+static bool isInstructionSpfParameter(SAPFOR::Instruction* instr)
+{
+    SgStatement* st = instr->getOperator();
+
+    // check if this operator is SPF(ANALYSIS(PARAMETER( )))
+    if (st && st->variant() == ASSIGN_STAT)
+    {
+        if (st->lineNumber() < 0 && st->numberOfAttributes())
+        {
+            for (int i = 0; i < st->numberOfAttributes(); ++i)
+            {
+                SgAttribute* attr = st->getAttribute(i);
+                SgStatement* attributeStatement = (SgStatement*)(attr->getAttributeData());
+                int type = st->attributeType(i);
+
+                if (type == SPF_PARAMETER_OP)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+
 static void getDefsFromBlock(SAPFOR::BasicBlock* block, set<SAPFOR::Argument*>& res,
                              const vector<pair<const Variable*, CommonBlock*>>& commonVars,
                              const FuncInfo* func)
 {
     vector<SAPFOR::Argument*> lastParamRef;
 
-    for (auto ir_block : block->getInstructions())
+    for (const auto &ir_block : block->getInstructions())
     {
         SAPFOR::Instruction* instr = ir_block->getInstruction();
+        if (isInstructionSpfParameter(instr))
+            continue;
+
         SAPFOR::CFG_OP instr_operation = instr->getOperation();
         if (instr_operation == SAPFOR::CFG_OP::PARAM)
         {
             SAPFOR::Argument* arg = instr->getArg1();
-            if(arg->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
+            if (arg->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
                 addPlaceWithDef(commonVars, func, arg, instr);
 
             lastParamRef.push_back(arg);
@@ -236,11 +262,19 @@ static void getDefsFromBlock(SAPFOR::BasicBlock* block, set<SAPFOR::Argument*>&
     int last_instr_num = block->getInstructions().back()->getNumber();
 
     for (const auto& def : block->getRD_Out())
+    {
         for (int place : def.second)
+        {
             if (place >= first_instr_num && place <= last_instr_num && def.first->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
             {
+                SAPFOR::Instruction* instr = block->getInstructions()[place - first_instr_num]->getInstruction();
+                if (isInstructionSpfParameter(instr))
+                    continue;
+
                 res.insert(def.first);
-                addPlaceWithDef(commonVars, func, def.first, block->getInstructions()[place - first_instr_num]->getInstruction());
+                addPlaceWithDef(commonVars, func, def.first, instr);
+            }
+        }
     }
 }
 
@@ -266,7 +300,7 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
     SAPFOR::BasicBlock* head_block = NULL;
 
     int loop_start = loop->lineNum, loop_end = loop->lineNumAfterLoop;
-    for (auto bb : blocks)
+    for (const auto &bb : blocks)
     {
         if (!bb || (bb->getInstructions().size() == 0))
             continue;
@@ -287,6 +321,12 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
         }
     }
 
+    if (currentLoop.empty()) // can't find loop IR - loop unreachable!
+    {
+        __spf_print(1, "Unreachable loop on %s:%d\n", current_file->filename(), loop_operator->lineNumber());
+        return currentLoop;
+    }
+
     if (!head_block)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
     
@@ -348,7 +388,7 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
         getDefsFromBlock(*loop_it, changeValueOnExit, commonVars, func);
 
 
-    for (auto bb : currentLoop)
+    for (const auto &bb : currentLoop)
     {
         //fill LiveWhenLoopEnds
         bool has_next_outside_body = false;

src/DirectiveProcessing/insert_directive.cpp

@@ -853,12 +853,21 @@ static pair<string, string> getModuleRename(const set<SgStatement*>& allocatable
         return make_pair("", "");
 }
 
+static void doRename(string& str, const pair<string, string>& renamePair)
+{
+    auto it = str.find(renamePair.first);
+    if (it != string::npos)
+        if (str[it + renamePair.first.size()] == '(' && str[it - 1] == ' ')
+            str = str.replace(it, renamePair.first.size(), renamePair.second);
+}
+
 static pair<DIST::Array*, string>
 getNewDirective(const string &fullArrayName, 
                 const vector<string> &distrRules,
                 const vector<string> &alignRules,
                 const DataDirective &dataDir,
-                const set<SgStatement*>& allocatableStmts)
+                const set<SgStatement*>& allocatableStmts,
+                const pair<string, int>& position_decl)
 {
     string out = "";
     DIST::Array* outA = NULL;
@@ -877,7 +886,8 @@ getNewDirective(const string &fullArrayName,
 
     for (int i = 0; i < dataDir.alignRules.size(); ++i)
     {
-        if (dataDir.alignRules[i].alignArray->GetName() == fullArrayName)
+        auto alignArray = dataDir.alignRules[i].alignArray;
+        if (alignArray->GetName() == fullArrayName)
         {
             string rule = alignRules[i];
             if (allocatableStmts.size())
@@ -889,21 +899,21 @@ getNewDirective(const string &fullArrayName,
                     it = rule.find("ALIGN", it + 7);
                 }
                 
-                auto renamePair = getModuleRename(allocatableStmts, dataDir.alignRules[i].alignArray);
+                auto renamePair = getModuleRename(allocatableStmts, alignArray);
-                if (renamePair.first != "")
+                doRename(rule, renamePair);
-                {
-                    it = rule.find(renamePair.first);
-                    if (it != string::npos)
-                        if (rule[it + renamePair.first.size()] == '(' && rule[it - 1] == ' ')
-                            rule = rule.replace(it, renamePair.first.size(), renamePair.second);
             }
+            else if (alignArray->GetLocation().first == DIST::l_COMMON)
+            {
+                auto symb = alignArray->GetDeclSymbol(position_decl);
+                if (symb->identifier() != alignArray->GetShortName())
+                    doRename(rule, make_pair(alignArray->GetShortName(), symb->identifier()));
             }
 
             out += "!DVM$ " + rule + "\n";
             if (!out_free_form)
                 out = splitDirective(out);
 
-            return make_pair(dataDir.alignRules[i].alignArray, out);
+            return make_pair(alignArray, out);
         }
     }
     
@@ -1743,7 +1753,7 @@ void insertDistributionToFile(SgFile *file, const char *fin_name, const DataDire
                             if (allocatableStmtsCopy.size())
                                 allocatableStmts = filterAllocateStats(file, allocatableStmtsCopy, currSymb->identifier());
    
-                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, allocatableStmts);
+                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, allocatableStmts, make_pair(st->fileName(), st->lineNumber()));
 
                             string toInsert = dirWithArray.second;
                             if (toInsert != "")
@@ -1975,20 +1985,27 @@ void insertDistributionToFile(SgFile *file, const char *fin_name, const DataDire
                 set<string> toInsertArrays;
                 for (auto &array : dynamicArraysLocal)
                 {
+                    string name = array->GetShortName();
+                    if (array->GetLocation().first == DIST::l_COMMON)
+                    {
+                        auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
+                        name = symb->identifier();
+                    }
+
                     if (extractDir)
                     {
-                        if (dynamicArraysAdded.find(array->GetShortName()) != dynamicArraysAdded.end())
+                        if (dynamicArraysAdded.find(name) != dynamicArraysAdded.end())
                         {
-                            dynamicArraysAdded.erase(array->GetShortName());
+                            dynamicArraysAdded.erase(name);
-                            toInsertArrays.insert(array->GetShortName());
+                            toInsertArrays.insert(name);
                         }
                     }
                     else
                     {
-                        if (dynamicArraysAdded.find(array->GetShortName()) == dynamicArraysAdded.end())
+                        if (dynamicArraysAdded.find(name) == dynamicArraysAdded.end())
                         {
-                            dynamicArraysAdded.insert(array->GetShortName());
+                            dynamicArraysAdded.insert(name);
-                            toInsertArrays.insert(array->GetShortName());
+                            toInsertArrays.insert(name);
                         }
                     }
                 }
@@ -2145,7 +2162,14 @@ void insertShadowSpecToFile(SgFile *file, const char *fin_name, const set<string
 
                     if (needToGen)
                     {
-                        string shadowSpecInsert = "!DVM$ SHADOW " + array->GetShortName() + "(";
+                        string name = array->GetShortName();
+                        if (array->GetLocation().first == DIST::l_COMMON)
+                        {
+                            auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
+                            name = symb->identifier();
+                        }
+
+                        string shadowSpecInsert = "!DVM$ SHADOW " + name + "(";
                         for (int k = 0; k < currSpec.size(); ++k)
                         {
                             char buf[256];
@@ -2157,7 +2181,7 @@ void insertShadowSpecToFile(SgFile *file, const char *fin_name, const set<string
                         shadowSpecInsert += ")\n";
 
                         shadowsSpecsString.push_back(shadowSpecInsert);
-                        pair<SgExpression*, SgExpression*> newSpec = genShadowSpec(file, make_pair(array->GetShortName(), currSpec));
+                        pair<SgExpression*, SgExpression*> newSpec = genShadowSpec(file, make_pair(name, currSpec));
                         if (newSpec.first == NULL || newSpec.second == NULL)
                             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
                         shadowsSpecs.push_back(newSpec);

src/DirectiveProcessing/shadow.cpp

@@ -26,6 +26,7 @@ using std::string;
 using std::vector;
 using std::pair;
 using std::make_pair;
+using SAPFOR::CFG_Settings;
 
 extern int debSh;
 
@@ -1672,9 +1673,12 @@ void GroupShadow(const map<string, vector<FuncInfo*>>& allFuncs,
         
             SgStatement* func = currF->funcPointer->GetOriginal();
 
-            auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, true, false, true, false), commonBlocks, allFuncs);
+            const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withDVM, 
+                                                 CFG_Settings::CFG_withCallsInBlocks, CFG_Settings::CFG_withUnreachable });
+            auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs);
             if (cfg.size() != 1)
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
             auto& blocks = cfg.begin()->second;
 
             //create reaching blocks

src/Distribution/Array.h

@@ -336,9 +336,24 @@ namespace Distribution
             if (pos != STRING::npos)
             {
                 name.erase(pos, shortName.size());
-                shortName = newName;
                 name += newName;
             }
+            else if (locationPos.first == l_COMMON) // name of array in common may be different
+            {
+                pos = name.rfind("_");
+                if (pos != STRING::npos)
+                {
+                    name.erase(pos + 1, shortName.size());
+                    name += newName;
+                }
+                else
+                {
+#if __SPF
+                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+#endif
+                }
+            }
+            shortName = newName;
             GenUniqKey();
         }
 
@@ -542,6 +557,44 @@ namespace Distribution
             return NULL; 
         }
 
+        Symbol* GetDeclSymbol(const PAIR<STRING, int>& position_decl) const
+        {
+            if (!IsArray() || locationPos.first != l_COMMON)
+                return declSymbol;
+
+            auto it = declPlacesSymbol.find(position_decl);
+            if (it != declPlacesSymbol.end())
+                return it->second;
+            else // find nearest
+            {
+                MAP<PAIR<STRING, int>, Symbol*> currFile;
+                for (auto& [position, symb] : declPlacesSymbol)
+                {
+                    if (position.first == position_decl.first)
+                        currFile[position] = symb;
+                }
+
+                PAIR<int, Symbol*> nearest = { (int)0, NULL };
+                const int needed_pos = position_decl.second;
+
+                for (auto& [position, symb] : currFile)
+                {
+                    if (nearest.second == NULL)
+                        nearest = { abs(position.second - needed_pos), symb };
+
+                    if (abs(position.second - needed_pos) < nearest.first)
+                        nearest = { abs(position.second - needed_pos), symb };
+                }
+
+                if (nearest.second)
+                    return nearest.second;
+#if __SPF
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+#endif
+            }
+            return NULL;
+        }
+
         Symbol* GetDeclSymbol() const { return declSymbol; }
         void SetDeclSymbol(Symbol *s) { declSymbol = s; }
 

src/Predictor/PredictScheme.cpp

@@ -33,6 +33,7 @@ using std::set;
 using std::ofstream;
 using std::pair;
 using std::tuple;
+using SAPFOR::CFG_Settings;
 
 using json = nlohmann::json;
 
@@ -507,7 +508,8 @@ static void parallelDir(const map<DIST::Array*, int>& byPos, SgExpression* spec,
     if (currF == NULL)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, true, false, false, true), commonBlocks, allFuncInfo);
+    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withSPF, CFG_Settings::CFG_withDominators });
+    auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncInfo);
     //TODO IP analysis
         
     unsigned countOfAccess = 0;

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <map>
 #include <unordered_set>
 #include <unordered_map>
@@ -16,6 +17,8 @@
 
 using namespace std;
 
+static unordered_set<Region*> collapsed;
+
 static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
 {
     ArrayAccessingIndexes resultContainer;
@@ -49,41 +52,81 @@ static void Collapse(Region* region)
     if (region->getBasickBlocks().empty())
         return;
 
-    for (auto& [arrayName, arrayRanges] : region->getHeader()->array_out)
+    bool firstRegion = true;
+    for (Region* basickBlock : region->getBasickBlocks())
     {
-        for (Region* byBlock : region->getBasickBlocks())
+        if (basickBlock->getNextRegions().empty())
         {
-            AccessingSet intersection = byBlock->array_def[arrayName].Intersect(arrayRanges);
+            if (firstRegion)
-            region->array_def[arrayName] = region->array_def[arrayName].Union(intersection);
+            {
+                region->array_def = basickBlock->array_out;
+                firstRegion = false;
+            }
+            else
+            {
+                unordered_set<string> toErease;
+                for (auto& [arrayName, arrayRanges] : region->array_def)
+                {
+                    if (basickBlock->array_out.find(arrayName) != basickBlock->array_out.end())
+                        arrayRanges = arrayRanges.Intersect(basickBlock->array_out[arrayName]);
+                    else
+                    {
+                        arrayRanges = AccessingSet();
+                        toErease.insert(arrayName);
+                    }
+                }
+                for (string arrayName : toErease)
+                    region->array_def.erase(arrayName);
+            }
         }
     }
 
+    RegionInstruction instruction;
+    instruction.def = move(region->array_def);
+
+
     for (auto& byBlock : region->getBasickBlocks())
     {
-        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
+        for (auto& instruction : byBlock->instructions)
         {
-            AccessingSet diff = byBlock->array_use[arrayName].Diff(byBlock->array_in[arrayName]);
+            for (auto& [arrayName, _] : instruction.use)
+            {
+                AccessingSet diff = instruction.use[arrayName].Diff(instruction.in[arrayName]);
                 region->array_use[arrayName] = region->array_use[arrayName].Union(diff);
             }
         }
+    }
 
-    ArrayAccessingIndexes useUnion;
+    ArrayAccessingIndexes useUnionB;
     for (auto& byBlock : region->getBasickBlocks())
-        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
+        for (auto& instruction : byBlock->instructions)
-            useUnion[arrayName] = useUnion[arrayName].Union(byBlock->array_use[arrayName]);
+            for (auto& [arrayName, _] : instruction.use)
+                useUnionB[arrayName] = useUnionB[arrayName].Union(instruction.use[arrayName]);
 
-    region->array_priv = region->array_use;
+    for (auto& [arrayName, _] : useUnionB)
+        region->array_priv[arrayName] = useUnionB[arrayName].Diff(region->array_use[arrayName]);
+
+    instruction.use = move(region->array_use);
 
     for (Region* prevBlock : region->getHeader()->getPrevRegions())
+    {
         prevBlock->replaceInNextRegions(region, region->getHeader());
+        region->addPrevRegion(prevBlock);
+    }
 
     for (Region* nextBlock : region->getHeader()->getNextRegions())
+    {
         nextBlock->replaceInPrevRegions(region, region->getHeader());
+        region->addNextRegion(nextBlock);
+    }
+    region->instructions.push_back(instruction);
+
 }
 
 static void SolveDataFlowIteratively(Region* DFG)
 {
-    unordered_set<Region*> worklist(DFG->getBasickBlocks());
+    auto blocks = DFG->getBasickBlocks();
+    std::unordered_set<Region*> worklist(blocks.begin(), blocks.end());
     do
     {
         Region* b = *worklist.begin();
@@ -101,7 +144,7 @@ static void SolveDataFlowIteratively(Region* DFG)
                 if (prevBlock->array_out.empty())
                 {
                     newIn.clear();
-                    continue;
+                    break;
                 }
 
                 for (const auto& [arrayName, accessSet] : prevBlock->array_out)
@@ -137,21 +180,153 @@ static void SolveDataFlowIteratively(Region* DFG)
             b->array_out = newOut;
         else
             worklist.erase(b);
+    } while (!worklist.empty());
+}
+
+static void SolveForBasickBlock(Region* block)
+{
+    ArrayAccessingIndexes newIn;
+    bool flagFirst = true;
+    for (Region* prevBlock : block->getPrevRegions())
+    {
+        if (flagFirst)
+        {
+            newIn = prevBlock->array_out;
+            flagFirst = false;
+        }
+        else
+        {
+            if (prevBlock->array_out.empty())
+            {
+                newIn.clear();
+                break;
+            }
+
+            for (const auto& [arrayName, accessSet] : prevBlock->array_out)
+            {
+                if (newIn.find(arrayName) != newIn.end())
+                    newIn[arrayName] = newIn[arrayName].Intersect(accessSet);
+                else
+                    newIn[arrayName] = AccessingSet();
+            }
+        }
+    }
+
+    if (block->instructions.empty())
+        block->instructions.push_back(RegionInstruction());
+
+    block->instructions[0].in = move(newIn);
+
+    for (int i = 0; i < block->instructions.size(); i++)
+    {
+        auto& instruction = block->instructions[i];
+
+        if (i > 0)
+            instruction.in = block->instructions[i - 1].out;
+
+        ArrayAccessingIndexes newOut;
+        if (instruction.def.empty())
+            newOut = instruction.in;
+        else if (instruction.in.empty())
+            newOut = instruction.def;
+        else
+        {
+            for (auto& [arrayName, accessSet] : instruction.def)
+            {
+                if (instruction.in.find(arrayName) != instruction.in.end())
+                    newOut[arrayName] = instruction.def[arrayName].Union(instruction.in[arrayName]);
+                else
+                    newOut[arrayName] = accessSet;
+            }
+            for (auto& [arrayName, accessSet] : instruction.in)
+            {
+                if (newOut.find(arrayName) == newOut.end())
+                {
+                    newOut[arrayName] = accessSet;
+                }
+            }
+        }
+
+        instruction.out = move(newOut);
+    }
+    if (!block->instructions.empty())
+        block->array_out = block->instructions.back().out;
+}
+
+static void SolveDataFlowTopologically(Region* DFG)
+{
+    for (Region* b : DFG->getBasickBlocks())
+    {
+        collapsed.insert(b);
+        SolveForBasickBlock(b);
     }
-    while (!worklist.empty());
 }
 
 static void SolveDataFlow(Region* DFG)
 {
     if (!DFG)
         return;
-
-    SolveDataFlowIteratively(DFG);
     for (Region* subRegion : DFG->getSubRegions())
+    {
         SolveDataFlow(subRegion);
+        DFG->addBasickBlocks(subRegion);
+    }
+    vector<Region*>& blocks = DFG->getBasickBlocks();
+    auto pos = remove_if(blocks.begin(), blocks.end(), [](Region* r) { return collapsed.find(r) != collapsed.end(); });
+    blocks.erase(pos, blocks.end());
+    TopologySort(DFG->getBasickBlocks(), DFG->getHeader());
+    SolveDataFlowTopologically(DFG);
     Collapse(DFG);
 }
 
+static bool getArrayDeclaredDimensions(SgArrayRefExp* arrayRef, vector<uint64_t>& declaredDims)
+{
+    declaredDims.clear();
+    if (!arrayRef || !arrayRef->symbol() || !isSgArrayType(arrayRef->symbol()->type()))
+        return false;
+    SgArrayType* arrayType = (SgArrayType*)arrayRef->symbol()->type();
+    int dimCount = arrayType->dimension();
+    for (int i = 0; i < dimCount; i++)
+    {
+        SgExpression* sizeExpr = arrayType->sizeInDim(i);
+        SgConstantSymb* constValSymb = isSgConstantSymb(sizeExpr->symbol());
+        string strDimLength;
+        if (sizeExpr && sizeExpr->variant() == INT_VAL)
+            strDimLength = sizeExpr->unparse();
+        else if (constValSymb)
+            strDimLength = constValSymb->constantValue()->unparse();
+        else
+            return false;
+
+        if (strDimLength == "0")
+            return false;
+        declaredDims.push_back((uint64_t)stoi(strDimLength));
+    }
+    return true;
+}
+
+static bool CheckDimensionLength(const AccessingSet& array)
+{
+    if (array.GetElements().empty())
+        return false;
+    size_t dimCount = array.GetElements()[0].size();
+    SgArrayRefExp* arrayRef = array.GetElements()[0][0].array;
+    if (!arrayRef)
+        return false;
+    vector<uint64_t> declaredDims(dimCount);
+    if (!getArrayDeclaredDimensions(arrayRef, declaredDims))
+        return false;
+    vector<ArrayDimension> testArray(dimCount);
+    for (size_t i = 0; i < dimCount; i++)
+    {
+        testArray[i] = { 1, 1, declaredDims[i], nullptr };
+    }
+    AccessingSet diff = AccessingSet({ testArray }).Diff(array);
+
+    return diff.GetElements().empty();
+}
+
+
 static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
 {
     SgStatement* spfStat = new SgStatement(SPF_ANALYSIS_DIR);
@@ -161,6 +336,8 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
     set<SgSymbol*> arraysToInsert;
     for (const auto& [_, accessingSet] : privates)
     {
+        if (!CheckDimensionLength(accessingSet))
+            continue;
         for (const auto& arrayElement : accessingSet.GetElements())
         {
             if (arrayElement.empty())
@@ -188,14 +365,14 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
         toAdd->setLhs(new SgVarRefExp(elem));
     }
 
-    if (arraysToInsert.size() == 0)
+    if (arraysToInsert.size() != 0)
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    {
-
         loop->loop->insertStmtBefore(*spfStat, *loop->loop->controlParent());
         insertedPrivates.insert(spfStat);
+    }
 }
 
-void FindPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, set<SgStatement*> &insertedPrivates)
+void FindPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, set<SgStatement*>& insertedPrivates)
 {
     map<LoopGraph*, ArrayAccessingIndexes> result;
     for (const auto& [fileName, loops] : loopGraph)
@@ -210,7 +387,7 @@ void FindPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*
             while (search_func && (!isSgProgHedrStmt(search_func)))
                 search_func = search_func->controlParent();
 
-            for (const auto& [funcInfo, blocks]: FullIR)
+            for (const auto& [funcInfo, blocks] : FullIR)
             {
                 if (funcInfo->fileName == fileName && funcInfo->funcPointer->GetOriginal() == search_func)
                 {

src/PrivateAnalyzer/range_structures.cpp

@@ -47,7 +47,7 @@ static ArrayDimension* DimensionIntersection(const ArrayDimension& dim1, const A
 
     uint64_t start3 = dim1.start + x0 * dim1.step;
     uint64_t step3 = c * dim1.step;
-    ArrayDimension* result = new(ArrayDimension){ start3, step3, tMax + 1 , dim1.array};
+    ArrayDimension* result = new(ArrayDimension){ start3, step3, tMax + 1 , dim1.array };
     return result;
 }
 
@@ -61,7 +61,7 @@ static vector<ArrayDimension> DimensionDifference(const ArrayDimension& dim1, co
     vector<ArrayDimension> result;
     /* add the part before intersection */
     if (dim1.start < intersection->start)
-        result.push_back({ dim1.start, dim1.step, (intersection->start - dim1.start) / dim1.step, dim1.array});
+        result.push_back({ dim1.start, dim1.step, (intersection->start - dim1.start) / dim1.step, dim1.array });
 
     /* add the parts between intersection steps */
     if (intersection->step > dim1.step)
@@ -70,7 +70,7 @@ static vector<ArrayDimension> DimensionDifference(const ArrayDimension& dim1, co
         uint64_t interValue = intersection->start;
         for (int64_t i = start; interValue <= intersection->start + intersection->step * (intersection->tripCount - 1); i++)
         {
-            result.push_back({interValue + dim1.step, dim1.step, intersection->step / dim1.step, dim1.array});
+            result.push_back({ interValue + dim1.step, dim1.step, intersection->step / dim1.step, dim1.array });
             interValue += intersection->step;
         }
     }
@@ -132,8 +132,10 @@ static vector<ArrayDimension> ElementsIntersection(const vector<ArrayDimension>&
 static vector<vector<ArrayDimension>> ElementsDifference(const vector<ArrayDimension>& firstElement,
     const vector<ArrayDimension>& secondElement)
 {
-    if (firstElement.empty() || secondElement.empty())
+    if (firstElement.empty())
         return {};
+    if (secondElement.empty())
+        return { firstElement };
 
     vector<ArrayDimension> intersection = ElementsIntersection(firstElement, secondElement);
     vector<vector<ArrayDimension>> result;
@@ -188,7 +190,7 @@ bool AccessingSet::ContainsElement(const vector<ArrayDimension>& element) const
 {
     vector<vector<ArrayDimension>> tails;
     FindUncovered(element, tails);
-    return !tails.empty();
+    return tails.empty();
 }
 
 void AccessingSet::FindCoveredBy(const vector<ArrayDimension>& element, vector<vector<ArrayDimension>>& result) const
@@ -252,13 +254,15 @@ AccessingSet AccessingSet::Diff(const AccessingSet& secondSet) const
         return *this;
 
     AccessingSet intersection = this->Intersect(secondSet);
-    AccessingSet uncovered = *this;
+    vector<vector<ArrayDimension>> uncovered;
-    vector<vector<ArrayDimension>> result;
+    for (const auto& element : allElements)
-    for (const auto& element : intersection.GetElements())
     {
         vector<vector<ArrayDimension>> current_uncovered;
-        uncovered.FindUncovered(element, current_uncovered);
+        intersection.FindUncovered(element, current_uncovered);
-        uncovered = AccessingSet(current_uncovered);
+        uncovered.insert(uncovered.end(),
+            std::move_iterator(current_uncovered.begin()),
+            std::move_iterator(current_uncovered.end())
+        );
     }
     return uncovered;
 }

src/PrivateAnalyzer/region.cpp

@@ -1,14 +1,16 @@
-#include<vector>
+#include <algorithm>
-#include<map>
+#include <vector>
-#include<unordered_set>
+#include <map>
-#include<unordered_map>
+#include <unordered_set>
-#include<string>
+#include <unordered_map>
+#include <string>
 #include <numeric>
 #include <iostream>
 
 #include "range_structures.h"
 #include "region.h"
 
+#include "..\Transformations\ExpressionSubstitution\expr_transform.h"
 #include "SgUtils.h"
 
 using namespace std;
@@ -93,7 +95,7 @@ static string FindIndexName(int pos, SAPFOR::BasicBlock* block, map<string, Loop
     return "";
 }
 
-static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use) {
+static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use, Region* region) {
     auto instructions = block->getInstructions();
     map<string, LoopGraph*> loopForIndex;
     BuildLoopIndex(loopForIndex, loop);
@@ -123,7 +125,11 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                     }
 
                     if (point.size() == dimCount)
-                        def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({point});
+                    {
+                        def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
+                        RegionInstruction regionInstruction;
+                        regionInstruction.def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
+                    }
                 }
             }
         }
@@ -148,13 +154,27 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
             auto* ref = isSgArrayRefExp(instruction->getInstruction()->getExpression());
             int fillCount = 0;
 
-            while (!index_vars.empty() && !refPos.empty())
+            vector<pair<int, int>> coeffsForDims;
+            int subs = ref->numberOfSubscripts();
+            for (int i = 0; ref && i < ref->numberOfSubscripts(); ++i)
+            {
+                const vector<int*>& coeffs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
+                if (coeffs.size() == 1)
+                {
+                    const pair<int, int> coef(coeffs[0][0], coeffs[0][1]);
+                    coeffsForDims.push_back(coef);
+                }
+
+            }
+            coeffsForDims = { coeffsForDims.rbegin(), coeffsForDims.rend() };
+
+            while (!index_vars.empty() && !refPos.empty() && !coeffsForDims.empty())
             {
                 auto var = index_vars.back();
                 int currentVarPos = refPos.back();
                 ArrayDimension current_dim;
                 if (var->getType() == SAPFOR::CFG_ARG_TYPE::CONST)
-                    current_dim = { stoul(var->getValue()), 1, 1, ref};
+                    current_dim = { stoul(var->getValue()), 1, 1, ref };
                 else
                 {
                     string name, full_name = var->getValue();
@@ -180,7 +200,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                             return -1;
                     }
 
-                    uint64_t start = currentLoop->startVal;
+                    uint64_t start = coeffsForDims.back().second * currentLoop->startVal + coeffsForDims.back().first;
                     uint64_t step = currentLoop->stepVal;
                     uint64_t iters = currentLoop->calculatedCountOfIters;
                     current_dim = { start, step, iters, ref };
@@ -193,14 +213,29 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                 }
                 index_vars.pop_back();
                 refPos.pop_back();
+                coeffsForDims.pop_back();
             }
 
             if (fillCount == accessPoint.size())
             {
+                RegionInstruction instruction;
                 if (operation == SAPFOR::CFG_OP::STORE)
+                {
                     def[array_name].Insert(accessPoint);
+                    instruction.def[array_name] = { { accessPoint } };
+                }
                 else
+                {
+                    instruction.use[array_name] = { { accessPoint } };
+                    if (def.find(array_name) == def.end())
                         use[array_name].Insert(accessPoint);
+                    else
+                    {
+                        AccessingSet element({ accessPoint });
+                        use[array_name] = use[array_name].Union(element.Diff(def[array_name]));
+                    }
+                }
+                region->instructions.push_back(instruction);
             }
         }
     }
@@ -208,6 +243,41 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
 
 }
 
+static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const unordered_set<SAPFOR::BasicBlock*>& blockSet, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+{
+    for (SAPFOR::BasicBlock* block : blockSet)
+    {
+        bool isCycleBlock = false;
+        for (SAPFOR::BasicBlock* prevBlock : block->getPrev())
+            isCycleBlock = isCycleBlock || (blockSet.find(prevBlock) != blockSet.end());
+
+        if (isCycleBlock)
+        {
+            bbToRegion[block]->removeNextRegion(bbToRegion[header]);
+            bbToRegion[header]->removePrevRegion(bbToRegion[block]);
+        }
+    }
+}
+
+static void DFS(Region* block, vector<Region*>& result, unordered_set<Region*> cycleBlocks)
+{
+    for (Region* nextBlock : block->getNextRegions())
+    {
+        if (cycleBlocks.find(nextBlock) != cycleBlocks.end())
+            DFS(nextBlock, result, cycleBlocks);
+    }
+    result.push_back(block);
+}
+
+void TopologySort(std::vector<Region*>& basikBlocks, Region* header)
+{
+    vector<Region*> result;
+    unordered_set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
+    DFS(header, result, cycleBlocks);
+    reverse(result.begin(), result.end());
+    basikBlocks = result;
+}
+
 static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const unordered_set<SAPFOR::BasicBlock*>& blockSet)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
@@ -222,10 +292,11 @@ static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegi
     }
 }
 
-static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, const unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     Region* region = new Region;
     auto [header, blockSet] = GetBasicBlocksForLoop(loop, Blocks);
+    RemoveHeaderConnection(header, blockSet, bbToRegion);
     if (bbToRegion.find(header) != bbToRegion.end())
         region->setHeader(bbToRegion.at(header));
     else
@@ -244,6 +315,7 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
             continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
+    TopologySort(region->getBasickBlocks(), region->getHeader());
     return region;
 }
 
@@ -254,12 +326,13 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
     for (auto poiner : blockSet)
     {
         bbToRegion[poiner] = new Region(*poiner);
-        this->basickBlocks.insert(bbToRegion[poiner]);
+        this->basickBlocks.push_back(bbToRegion[poiner]);
-        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use);
+        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use, bbToRegion[poiner]);
 
     }
     this->header = bbToRegion[header];
     SetConnections(bbToRegion, blockSet);
+    RemoveHeaderConnection(header, blockSet, bbToRegion);
     //create subRegions
     for (LoopGraph* childLoop : loop->children)
     {
@@ -267,4 +340,5 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
             continue;
         subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
+    TopologySort(basickBlocks, this->header);
 }

src/PrivateAnalyzer/region.h

@@ -8,6 +8,11 @@
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
 
+struct RegionInstruction
+{
+    ArrayAccessingIndexes def, use, in, out;
+};
+
 class Region : public SAPFOR::BasicBlock {
 public:
     Region() { header = nullptr; }
@@ -20,13 +25,25 @@ public:
 
     void setHeader(Region* region) { header = region; }
 
-    std::unordered_set<Region*>& getBasickBlocks() { return basickBlocks; }
+    std::vector<Region*>& getBasickBlocks() { return basickBlocks; }
 
-    void addBasickBlocks(Region* region) { basickBlocks.insert(region); }
+    void addBasickBlocks(Region* region) { basickBlocks.push_back(region); }
 
     const std::unordered_set<Region*>& getPrevRegions() { return prevRegions; }
 
-    std::unordered_set<Region*> getNextRegions() { return nextRegions; }
+    std::unordered_set<Region*>& getNextRegions() { return nextRegions; }
+
+    void removeNextRegion(Region* region)
+    {
+        if (nextRegions.find(region) != nextRegions.end())
+            nextRegions.erase(region);
+    }
+
+    void removePrevRegion(Region* region)
+    {
+        if (prevRegions.find(region) != prevRegions.end())
+            prevRegions.erase(region);
+    }
 
     void addPrevRegion(Region* region) { prevRegions.insert(region); }
 
@@ -48,13 +65,18 @@ public:
 
     void addSubRegions(Region* region) { subRegions.insert(region); }
 
+    std::vector<RegionInstruction> instructions;
+
     ArrayAccessingIndexes array_def, array_use, array_out, array_in, array_priv;
 
 private:
-    std::unordered_set<Region*> subRegions, basickBlocks;
+    std::vector<Region*> basickBlocks;
+    std::unordered_set<Region*> subRegions;
     /*next Region which is BB for current BB Region*/
     std::unordered_set<Region*> nextRegions;
     /*prev Regions which is BBs for current BB Region*/
     std::unordered_set<Region*> prevRegions;
     Region* header;
 };
+
+void TopologySort(std::vector<Region*>& basikBlocks, Region* header);

src/Sapfor.cpp

@@ -1893,7 +1893,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         findParameters(parametersOfProject, fullIR, declaredArrays);
     else if (curr_regime == BUILD_IR)
     {
-        auto CFG_forFile = buildCFG(commonBlocks, allFuncInfo_IR, SAPFOR::CFG_Settings(0));
+        auto CFG_forFile = buildCFG(commonBlocks, allFuncInfo_IR, SAPFOR::CFG_Settings());
         for (auto& byFunc : CFG_forFile)
             fullIR[byFunc.first].insert(fullIR[byFunc.first].end(), byFunc.second.begin(), byFunc.second.end());
 
@@ -2524,8 +2524,8 @@ int main(int argc, char **argv)
                     out_free_form = 1;
                     out_line_unlimit = 1;
                 }
-                else if (string(curr_arg) == "-sh")
+                /*else if (string(curr_arg) == "-sh")
-                    staticShadowAnalysis = 1;
+                    staticShadowAnalysis = 1;*/
                 else if (string(curr_arg) == "-shWidth")
                 {
                     i++;

src/SapforData.h

@@ -19,7 +19,7 @@
 extern std::map<std::string, std::string> shortFileNames;
 static int activeState = 0;
 
-int staticShadowAnalysis = 0;
+int staticShadowAnalysis = 1;
 int staticPrivateAnalysis = 0;
 int keepDvmDirectives = 0;
 int keepFiles = 0;

src/Transformations/DeadCodeRemoving/dead_code.cpp

@@ -12,6 +12,7 @@ using std::map;
 using std::string;
 using std::vector;
 using std::set;
+using  SAPFOR::CFG_Settings;
 
 using std::remove_if;
 
@@ -424,7 +425,8 @@ int removeDeadCode(SgStatement* func,
         if (intervalDelEnd->lineNumber() < prog->lineNumber() || intervalDelEnd->lineNumber() > prog->lastNodeOfStmt()->lineNumber())
             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, false, false, false, false), commonBlocks, allFuncs);
+    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop });
+    auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs);
 
     if(cfg.size() != 1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);

src/Transformations/GlobalVariables/fix_common_blocks.cpp

@@ -18,69 +18,66 @@ using std::tuple;
 
 /// main function:
 // renew unions for all common blocks in the file
-static void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBlocks,
+//void BuildNewCommDecls
-    map<string, deque<CommConstraint>>& newCommonDecls, map<string, map<string, deque<CommConstraint>>>& commDecls,
-    set<string>& badCommon, map<string, set<string>>& notUsedVars, vector<SgStatement*>& programUnits);
 
 // get names of variables and array elements, which were referenced in programm unit
-static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames);
+//set<string> getUses
-static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used);
+//void getUsesFromExpr
 
 // splits arrays into elements and replaces not used vars with empty constraints
-static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars);
+//bool splitType
+ 
 // create constraits set
-static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars);
+//deque<CommConstraint> makeConstraints
+ 
 // build union
-static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints);
+//bool buildConstraintsUnion
-static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints);
+//bool docheckUnequalConstraints
-static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints);
+//bool check
 
 /// small help functions:
-static string getParentName(const string& name);
+//string getParentName
-static bool equalDims(const CommConstraint& a, const CommConstraint& b);
+//bool equalDims
-static bool equalConstraints(const CommConstraint& a, const CommConstraint& b);
+//bool equalConstraints
-static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem);
+//void addElem
-//////
 
 // change names of variables in 'constraints'
-static void fixNames(deque<CommConstraint>& constraints, const string& commName);
+//void fixNames
 
 ////// step2: transformation
-
 /// main function
 // peform transformation on every program unit in the file
-static void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
+//void fixFunctions
-    map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars);
 
 // get pairs of names (namesOldToNew) for renaming
-static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew);
+//bool getNamesOldToNew
 
 // create new symbols for new variables in new common declaration (constraints)
-static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
+//void makeCommVarSymbs
-    map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl);
+
 // delete from program unit all references to names in commVarNames
-static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames);
+//void deleteOldVars
 
 // calls fixExpression for each statement, replaces names in data statement
-static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew);
+//void renameVariables
+
 // replacing variables or array elements in expression expr if their names are in namesOldToNew
-static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew);
+//SgExpression* fixExpression
 
 // make new exprList exprssion for new declaration decl with symbols from newSymbs
-static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
+//SgExpression* makeExprListForCommon
-    SgFile* file, SgStatement* firstSt);
+
 // replace old common declarations with new ones
-static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs);
+//void rewriteCommon
 
 /// help functions:
-static SgExpression* makeIdxFromStr(const string& str);
+//SgExpression* makeIdxFromStr(const string& str);
+
 // make new expression of array element
-static SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs);
+//SgExpression* newArrElemExpr
-static bool variablePositionComp(const Variable* lhs, const Variable* rhs);
+//bool variablePositionComp
 //////
 
-
-
 CommConstraint::CommConstraint(const Variable* var, bool u, const string& funcName, const string& fileName)
 {
     used = u;
@@ -125,7 +122,6 @@ CommConstraint::CommConstraint(const Variable* var, bool u, const string& funcNa
     }
 }
 
-
 CommConstraint::CommConstraint(const string& name, SgType* t, bool u) : used(u), type(t), identifier(name)
 {
     typeVariant = type->variant();
@@ -139,8 +135,7 @@ CommConstraint::CommConstraint(const string& name, SgType* t, bool u, vector<Dec
     size = getSizeOfType(type);
 }
 
-
+static string getParentName(const string& name)
-string getParentName(const string& name)
 {
     size_t len = name.find("%");
     size_t posB = name.find("(");
@@ -154,8 +149,7 @@ string getParentName(const string& name)
     return name.substr(0, len);
 }
 
-
+static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used)
-void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used)
 {
     if (expr == NULL)
         return;
@@ -194,8 +188,7 @@ void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<
     getUsesFromExpr(expr->rhs(), commonVarNames, used);
 }
 
-
+static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames)
-set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames)
 {
     set<string> used;
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
@@ -212,8 +205,7 @@ set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames)
     return used;
 }
 
-
+static bool equalDims(const CommConstraint& a, const CommConstraint& b)
-bool equalDims(const CommConstraint& a, const CommConstraint& b)
 {
     const vector<pair<int, int>>& adim = a.arrayInfo->GetSizes();
     const vector<pair<int, int>>& bdim = b.arrayInfo->GetSizes();
@@ -224,11 +216,12 @@ bool equalDims(const CommConstraint& a, const CommConstraint& b)
         if (adim[i].second - adim[i].first != bdim[i].second - bdim[i].first)
             return false;
     }
+
+    return true;
 }
 
-
 // TODO: add attributes to CommConstraints, check if a and b have equal attributes
-bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
+static bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
 {
     if ((a.arrayInfo != NULL && b.arrayInfo == NULL) || ((a.arrayInfo == NULL && b.arrayInfo != NULL)))
         return false;
@@ -239,8 +232,7 @@ bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
     return true;
 }
 
-
+static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
-void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
 {
     if (elem.typeVariant == 0 && !comm.empty() && comm.back().typeVariant == 0)
         comm.back().size += elem.size;
@@ -248,9 +240,8 @@ void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
         comm.push_back(elem);
 }
 
-
 // TODO: check attributes: do not split arrays with pointer or target attributes if check_use == true
-bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
+static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
 {
     CommConstraint var = d.front();
     string name = var.identifier;
@@ -298,8 +289,7 @@ bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& name
     }
 }
 
-
+static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars)
-deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars)
 {
     deque<CommConstraint> res;
     while (!constraints.empty())
@@ -316,8 +306,7 @@ deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const
     return res;
 }
 
-
+static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints)
-bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     while (!A.empty() && !B.empty())
     {
@@ -356,8 +345,8 @@ bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstrai
     return true;
 }
 
-
+static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, 
-bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints)
+                                      pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     if (U.front().typeVariant == 0)
     {
@@ -380,8 +369,8 @@ bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>&
     return true;
 }
 
-
+static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, 
-bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
+                                  const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     deque<CommConstraint> newU;
     while (!U.empty() && !B.empty())
@@ -436,8 +425,8 @@ bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, co
     return true;
 }
 
-
+//TODO: check this: newDecl and oldDecl => do these variables need references?
-bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
+static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
 {
     bool needChange = false;
     map<string, string> rename;
@@ -502,15 +491,17 @@ bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDe
             newDecl.pop_front();
         }
     }
+
     if (!oldDecl.empty() || !newDecl.empty())
         needChange = true;
+
     if (needChange)
         namesOldToNew.insert(rename.begin(), rename.end());
+
     return needChange;
 }
 
-
+static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, const string& commName,
-void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
                              map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl)
 {
     for (const CommConstraint& var : constraints)
@@ -524,8 +515,7 @@ void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, Sg
     }
 }
 
-
+static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
-void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
 {
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
     vector<SgStatement*> stmtsToDelete;
@@ -571,12 +561,12 @@ void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
         }
         // TODO: delete common variables form attributes statements (like DIM_STAT)
     }
+
     for (SgStatement* st : stmtsToDelete)
         st->deleteStmt();
 }
 
-
+static SgExpression* makeIdxFromStr(const string& str)
-SgExpression* makeIdxFromStr(const string& str)
 {
     vector<SgExpression*> items;
     int num = 0;
@@ -591,13 +581,13 @@ SgExpression* makeIdxFromStr(const string& str)
             num = 0;
         }
     }
+
     reverse(items.begin(), items.end());
     SgExpression* exprList = makeExprList(items, false);
     return exprList;
 }
 
-
+static SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs)
-SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs)
 {
     size_t pos = newName.find('(');
     SgExpression* newExpr = new SgArrayRefExp(*newSymbs.at(newName.substr(0, pos)));
@@ -605,11 +595,11 @@ SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>
     return newExpr;
 }
 
-
+static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew)
-SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew)
 {
     if (expr == NULL)
         return NULL;
+
     if (expr->variant() == VAR_REF || expr->variant() == ARRAY_REF)
     {
         string name = expr->symbol()->identifier();
@@ -645,17 +635,18 @@ SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& ne
             }
         }
     }
+
     SgExpression* lhs = fixExpression(expr->lhs(), newSymbs, namesOldToNew);
     if (lhs != NULL)
         expr->setLhs(lhs);
+
     SgExpression* rhs = fixExpression(expr->rhs(), newSymbs, namesOldToNew);
     if (rhs != NULL)
         expr->setRhs(rhs);
     return NULL;
 }
 
-
+static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew)
-void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew)
 {
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
     for (SgStatement* curSt = firstSt; curSt != NULL && curSt != lastSt; curSt = curSt->lexNext())
@@ -703,8 +694,7 @@ void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarS
     }
 }
 
-
+static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
-SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
     SgFile* file, SgStatement* firstSt)
 {
     vector<SgExpression*> items;
@@ -738,8 +728,7 @@ SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map
     return exprList;
 }
 
-
+static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs)
-void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs)
 {
     vector<SgStatement*> commonStmtsToDelete;
     for (SgStatement* st = firstSt; st != firstSt->lastDeclaration()->lexNext(); st = st->lexNext())
@@ -790,12 +779,12 @@ void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExp
                 commonStmtsToDelete.push_back(st);
         }
     }
+
     for (SgStatement* st : commonStmtsToDelete)
         st->deleteStmt();
 }
 
-
+static void fixNames(deque<CommConstraint>& constraints, const string& commName)
-void fixNames(deque<CommConstraint>& constraints, const string& commName)
 {
     for (auto& var : constraints)
     {
@@ -810,14 +799,12 @@ void fixNames(deque<CommConstraint>& constraints, const string& commName)
     }
 }
 
-
+static bool variablePositionComp(const Variable* lhs, const Variable* rhs)
-bool variablePositionComp(const Variable* lhs, const Variable* rhs)
 {
     return lhs->getPosition() < rhs->getPosition();
 }
 
-
+static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
-void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
                          map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars)
 {
     for (SgStatement* unitSt : programUnits)
@@ -825,11 +812,13 @@ void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, d
         string funcName = unitSt->symbol()->identifier();
         if (commDecls.find(funcName) == commDecls.end())
             continue;
+
         SgStatement* firstSt = unitSt;
         map<string, SgExpression*> commListExprs;
         map<string, SgSymbol*> newVarSymbs; // new symbols for new variables
         map<string, string> namesOldToNew; // for ranaming: old name -> new name
         vector<SgSymbol*> needNewDecl;
+
         for (auto& common : commDecls[funcName])
         {
             string commName = common.first;
@@ -840,9 +829,11 @@ void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, d
             bool needChange = getNamesOldToNew(newDecl, common.second, namesOldToNew);
             if (!needChange)
                 continue;
+
             makeCommVarSymbs(newDecl, file, firstSt, commName, newVarSymbs, needNewDecl);
             commListExprs[commName] = makeExprListForCommon(newDecl, newVarSymbs, file, firstSt);
         }
+
         if (!commListExprs.empty())
         {
             for (const auto& item : commListExprs)
@@ -856,8 +847,7 @@ void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, d
     }
 }
 
-
+static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& allCommonBlocks,
-void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBlocks,
                               map<string, deque<CommConstraint>>& newCommonDecls, map<string, map<string, deque<CommConstraint>>>& commDecls,
                               set<string>& badCommon, map<string, set<string>>& notUsedVars, vector<SgStatement*>& programUnits)
 {
@@ -898,7 +888,8 @@ void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBl
                     constraints.push_back(newConstr);
                 }
                 if (hasChar && hasNotChar)  // TDOO: make proper warning message or separate such common blocks
-                    __spf_print(1, "common block '%s' ('%s':%d) contains variables of symbolic and numeric types. It is required to divide\n", commName.c_str(), fileName.c_str(), constraints.back().uses.back().lineNum);
+                    __spf_print(1, "common block '%s' ('%s':%d) contains variables of symbolic and numeric types. It is required to divide\n", 
+                                    commName.c_str(), fileName.c_str(), constraints.back().uses.back().getLineNum());
                 if (hasChar)
                 {
                     badCommon.insert(commName);
@@ -915,7 +906,7 @@ void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBl
                     for (auto x : problemConstraints.first.uses)         // TODO: make proper warning message
                         for (auto y : problemConstraints.second.uses)
                             __spf_print(1, "variables '%s' and '%s' in one storage association (common block '%s') have different types (files - %s:%d and %s:%d)\n",
-                                x.varName.c_str(), y.varName.c_str(), commName.c_str(), x.fileName.c_str(), x.lineNum, y.fileName.c_str(), y.lineNum);
+                                            x.getVarName(), y.getVarName(), commName.c_str(), x.getFileName(), x.getLineNum(), y.getFileName(), y.getLineNum());
                 }
             }
             curSt = curSt->lastNodeOfStmt();
@@ -927,7 +918,7 @@ void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBl
 
 
 // main function
-void fixCommonBlocks(const map<string, vector<FuncInfo*>> allFuncInfo, const map<string, CommonBlock*> allCommonBlocks, SgProject* project)  // TODO: separate into 2 steps?
+void fixCommonBlocks(const map<string, vector<FuncInfo*>>& allFuncInfo, const map<string, CommonBlock*>& allCommonBlocks, SgProject* project)  // TODO: separate into 2 steps?
 {
     int filesNum = project->numberOfFiles();
     map<string, map<string, map<string, deque<CommConstraint>>>> commDecls; // file_name -> function_name -> common block name -> old declaration of common block
@@ -941,10 +932,12 @@ void fixCommonBlocks(const map<string, vector<FuncInfo*>> allFuncInfo, const map
         SgFile* file = &project->file(i);
         string fileName = file->filename();
         file->switchToFile(fileName);
-        BuildNewCommDecls(file, allCommonBlocks, newCommonDecls, commDecls[fileName], badCommon, notUsedVars, programUnitsInFile[fileName]);
+        buildNewCommDecls(file, allCommonBlocks, newCommonDecls, commDecls[fileName], badCommon, notUsedVars, programUnitsInFile[fileName]);
     }
+
     for (auto& elem : newCommonDecls)
         fixNames(elem.second, elem.first);
+
     for (int i = 0; i < filesNum; i++)  // second step
     {
         SgFile* file = &project->file(i);

src/Transformations/GlobalVariables/fix_common_blocks.h

@@ -16,12 +16,18 @@
 
 struct DeclInfo // for error messages
 {
+private:
     std::string varName;
     std::string fileName;
     int lineNum;
 
+public:
     DeclInfo() : varName(""), fileName(""), lineNum(0) {};
     DeclInfo(const std::string& vn, const std::string& fn, int ln) : varName(vn), fileName(fn), lineNum(ln) {};
+
+    const char* getVarName() const { return varName.c_str(); }
+    const char* getFileName() const { return fileName.c_str(); }
+    int getLineNum() const { return lineNum; }
 };
 
 struct CommConstraint  // TODO: add variable attributes
@@ -42,4 +48,4 @@ struct CommConstraint  // TODO: add variable attributes
 };
 
 
-void fixCommonBlocks(const std::map<std::string, std::vector<FuncInfo*>> allFuncInfo, const std::map<std::string, CommonBlock*> allCommonBlocks, SgProject* project);
+void fixCommonBlocks(const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, const std::map<std::string, CommonBlock*>& allCommonBlocks, SgProject* project);

src/Transformations/LoopSplitting/loops_splitter.cpp

@@ -19,6 +19,7 @@ using std::pair;
 using std::make_pair;
 using std::wstring;
 using std::stack;
+using SAPFOR::CFG_Settings;
 
 #define PRINT_SPLITTED_FRAGMENTS 0
 
@@ -315,7 +316,7 @@ static map<SgStatement*, pair<set<SgStatement*>, set<SgStatement*>>>
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
             map<SAPFOR::Argument*, set<int>> outForCurr;
-            buildGenKillForCFG(itCFG->second, funcByName, outForFunc, gen, kill, &genForIR, &killForIR, notInitedGlobals, SAPFOR::CFG_Settings(0));
+            buildGenKillForCFG(itCFG->second, funcByName, outForFunc, gen, kill, &genForIR, &killForIR, notInitedGlobals, SAPFOR::CFG_Settings());
             
             if (outForFunc.count(byFunc))
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -1051,7 +1052,8 @@ int splitLoops(SgFile *file, vector<LoopGraph*> &loopGraphs, vector<Messages> &m
                 checkNull(listExp, convertFileName(__FILE__).c_str(), __LINE__);
                 int deep = listExp->length();
                 
-                currIR = buildCFGforCurrentFunc(loop->loop, SAPFOR::CFG_Settings(true, true), commonBlocks, allFuncInfo);
+                const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withRD, CFG_Settings::CFG_withCallFrom, CFG_Settings::CFG_withDominators });
+                currIR = buildCFGforCurrentFunc(loop->loop, settings, commonBlocks, allFuncInfo);
                 totalErr = splitLoop(loop, messages, deep, depInfoForLoopGraph);
 
                 if (totalErr > 0)

src/Transformations/PrivateArrayRemoving/private_removing.cpp

@@ -13,6 +13,7 @@ using std::set;
 using std::string;
 using std::vector;
 using std::wstring;
+using SAPFOR::CFG_Settings;
 
 using CFG_Type = map<FuncInfo*, vector<SAPFOR::BasicBlock*>>;
 using UsersDirectives = map<pair<string, int>, set<SgStatement*>>;
@@ -2207,8 +2208,8 @@ static void removePrivateAnalyze(Context *ctx)
         makeDeclaration(ctx->loopStmt, vector<SgSymbol*> {receiverVar}, nullptr)
     ));
 
-    CFG_Type CFG_ForFunc = buildCFGforCurrentFunc(ctx->loopStmt,
+    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withRD, CFG_Settings::CFG_withCallFrom, CFG_Settings::CFG_withDominators });
-                                                  SAPFOR::CFG_Settings(true, true),
+    CFG_Type CFG_ForFunc = buildCFGforCurrentFunc(ctx->loopStmt, settings,
                                                   ctx->commonBlocks, ctx->allFuncInfo);
     if (CFG_ForFunc.empty())
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);

src/Utils/PassManager.h

@@ -206,7 +206,9 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     Pass(DEF_USE_STAGE1) <= Pass(DEF_USE_STAGE2);
 
-    list({ VERIFY_DVM_DIRS, PRIVATE_CALL_GRAPH_STAGE1, PRIVATE_CALL_GRAPH_STAGE2, MACRO_EXPANSION, CONVERT_ASSIGN_TO_LOOP, DEF_USE_STAGE1, DEF_USE_STAGE2, FILL_PARALLEL_REG_IR, VERIFY_COMMON, FILL_COMMON_BLOCKS, CALL_GRAPH_IR }) <= list({ SUBST_EXPR, SUBST_EXPR_RD, BUILD_IR });
+    list({ VERIFY_DVM_DIRS, VERIFY_COMMON, FILL_COMMON_BLOCKS, PRIVATE_CALL_GRAPH_STAGE1, PRIVATE_CALL_GRAPH_STAGE2, MACRO_EXPANSION, CONVERT_ASSIGN_TO_LOOP, DEF_USE_STAGE1, DEF_USE_STAGE2, FILL_PARALLEL_REG_IR, CALL_GRAPH_IR }) <= list({ SUBST_EXPR, SUBST_EXPR_RD, BUILD_IR });
+
+    Pass(VERIFY_COMMON) <= Pass(FILL_COMMON_BLOCKS);
 
     Pass(BUILD_IR) <= Pass(SUBST_EXPR) <= Pass(SUBST_EXPR_AND_UNPARSE);
 
@@ -217,7 +219,7 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     Pass(RESTORE_LOOP_FROM_ASSIGN) <= list({ SUBST_EXPR_AND_UNPARSE, SUBST_EXPR_RD_AND_UNPARSE });
 
-    Pass(GET_ALL_ARRAY_DECL) <= list({ CALL_GRAPH_IR, INSERT_NO_DISTR_FLAGS_FROM_GUI });
+    Pass(FILL_COMMON_BLOCKS) <= Pass(GET_ALL_ARRAY_DECL) <= list({ CALL_GRAPH_IR, INSERT_NO_DISTR_FLAGS_FROM_GUI });
 
     Pass(LOOP_GRAPH) <= Pass(PRIVATE_CALL_GRAPH_STAGE3) <= list(FIND_FUNC_TO_INCLUDE, PRIVATE_ANALYSIS_IR) <= list({ LOOP_ANALYZER_DATA_DIST_S0, LOOP_ANALYZER_DATA_DIST_S1, ONLY_ARRAY_GRAPH, LOOP_ANALYZER_ALIGNS });
 
@@ -227,7 +229,7 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_SPF, PREPROC_ALLOCATES, GET_ALL_ARRAY_DECL, GCOV_PARSER }) <= list({ CALL_GRAPH, MACRO_EXPANSION, DEF_USE_STAGE1 });
 
-    list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_ALLOCATES, FILL_PARALLEL_REG_IR }) <= list({ GET_ALL_ARRAY_DECL, FILL_COMMON_BLOCKS, PARSE_OMP_DIRS }) <= Pass(PREPROC_SPF);
+    list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_ALLOCATES, FILL_PARALLEL_REG_IR }) <= list({ FILL_COMMON_BLOCKS, GET_ALL_ARRAY_DECL, PARSE_OMP_DIRS }) <= Pass(PREPROC_SPF);
 
     Pass(CHECK_PAR_REG_DIR) <= Pass(FILL_PARALLEL_REG_IR);
 

src/Utils/SgUtils.cpp

@@ -934,8 +934,14 @@ void fillNonDistrArraysAsPrivate(SgStatement *st,
         {
             auto itD = declaredArrays.find(*itSet);
             if (itD != declaredArrays.end())
-                if (itD->second.first->IsNotDistribute())
+            {
-                    privatesVars.insert(itD->second.first->GetShortName());
+                const auto array = itD->second.first;
+                if (array->IsNotDistribute())
+                {
+                    auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
+                    privatesVars.insert(symb->identifier());
+                }
+            }
         }
     }
 }
@@ -954,8 +960,20 @@ DIST::Array* getArrayFromDeclarated(SgStatement *st, const string &arrayName)
         {
             auto itD = declaredArrays.find(*itSet);
             if (itD != declaredArrays.end()) 
-                if (itD->second.first->GetShortName() == arrayName)
+            {
-                    found = itD->second.first;
+                DIST::Array* array = itD->second.first;
+                if (array->GetLocation().first == DIST::l_COMMON)
+                {
+                    auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
+                    if (symb && symb->identifier() == arrayName)
+                        found = array;
+                }
+                else
+                {
+                    if (array->GetShortName() == arrayName)
+                        found = array;
+                }
+            }
         }
     }
     return found;
@@ -1264,6 +1282,32 @@ static SgExpression* isInCommon(const vector<SgExpression*> &commonBlocks, const
     return NULL;
 }
 
+//all common block in project
+extern map<string, CommonBlock*> commonBlocks;
+static string getCommonNameOnPos(const string& name, const int commonPos)
+{
+    if (commonBlocks.size() == 0)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    auto it = commonBlocks.find(name);
+    if (it == commonBlocks.end())
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    auto inPos = it->second->getGroupedVars().find(commonPos);
+    if (inPos == it->second->getGroupedVars().end())
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    set<string> namesOnPos;
+
+    for (auto& var : inPos->second)
+        namesOnPos.insert(var->getName());
+
+    if (namesOnPos.size() == 0)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    return *namesOnPos.begin();
+}
+
 static map<tuple<string, string, int>, tuple<int, string, string>> tableOfUniqNames;
 tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>> &commonBlocks, SgStatement *decl, SgSymbol *symb)
 {
@@ -1272,6 +1316,7 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
     int commonPos = 0;
 
     SgExpression *foundCommon = NULL;
+    string symbCommn = "";
 
     SgStatement *declCP = decl->controlParent();
     // find symbol in parameter list of functions
@@ -1307,6 +1352,7 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
             if (foundCommon)
             {
                 inCommon = true;
+                symbCommn = getCommonNameOnPos(common.first, commonPos);
                 break;
             }
         }
@@ -1314,7 +1360,7 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
 
     tuple<int, string, string> retVal;
     if (inCommon)
-        retVal = make_tuple(commonPos, string("common_") + getCommonName(foundCommon), string(symb->identifier()));
+        retVal = make_tuple(commonPos, string("common_") + getCommonName(foundCommon), symbCommn);
     else
         retVal = make_tuple(decl->lineNumber(), string(decl->fileName()), string(symb->identifier()));
 

src/Utils/module_utils.cpp

@@ -337,10 +337,15 @@ const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
     //if function or module in contains
     auto cp = func->controlParent();
     if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT)
+    {
         getModuleSymbols(cp, symbs);
 
+        if (func->variant() == FUNC_HEDR)
+            symbs.insert(func->symbol());
+    }
+
     symbolsForFunc[func->symbol()->identifier()] = symbs;
-    return symbs;
+    return symbolsForFunc[func->symbol()->identifier()];
 }
 
 static void findSymbol(SgStatement* func, const string& varName, const string& locName,
@@ -349,10 +354,20 @@ static void findSymbol(SgStatement* func, const string& varName, const string& l
     for (const auto& s : getModuleSymbols(func))
     {
         SgSymbol* orig = OriginalSymbol(s);
+        printf("%s == %s\n", orig->identifier(), s->identifier());
         //any suitable symbol can be used
+
+        if (orig->variant() == FUNCTION_NAME)
+        {
+            if (orig->identifier() == varName)
+                altNames[s->identifier()] = s;
+        }
+        else
+        {
             if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
                 altNames[s->identifier()] = s;
         }
+    }
 }
 
 SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
@@ -369,6 +384,7 @@ SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const stri
         return altNames.begin()->second;
     else {
         __spf_print(1, "%s (%s %s) %s\n", func->symbol()->identifier(), clearName.c_str(), varName.c_str(), locName.c_str());
+        findSymbol(func, varName, locName, altNames);
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
     }
 

src/Utils/utils.cpp

@@ -569,8 +569,8 @@ void copyIncludes(const set<string> &allIncludeFiles, const map<string, map<int,
 
             while (!feof(oldFile))
             {
-                char buf[8192];
+                char buf[16384];
-                char *res = fgets(buf, 16384, oldFile);
+                char *res = fgets(buf, sizeof(buf), oldFile);
                 if (res == NULL)
                     break;
 

src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2451"
+#define VERSION_SPF "2465"

src/VisualizerCalls/get_information.cpp

@@ -152,7 +152,7 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
             intOptions[z] = -1;
     }
 
-    staticShadowAnalysis = intOptions[STATIC_SHADOW_ANALYSIS];
+    //staticShadowAnalysis = intOptions[STATIC_SHADOW_ANALYSIS];
     staticPrivateAnalysis = intOptions[STATIC_PRIVATE_ANALYSIS];
     out_free_form = intOptions[FREE_FORM];
     if (out_free_form == 1)