fix some compiler warnings

src/ArrayConstantPropagation/propagation.cpp

@@ -10,7 +10,6 @@
 using namespace std;
 
 static SgStatement* declPlace = NULL;
-static unordered_set<SgStatement*> changed;;
 
 static bool CheckConstIndexes(SgExpression* exp)
 {
@@ -37,13 +36,13 @@ static bool CheckConstIndexes(SgExpression* exp)
 
 static SgExpression* CreateVar(int& variableNumber, SgType* type)
 {
-    string varName = "tmp_prop_var";
+    string varName = "__tmp_prop_var";
     string name = varName + std::to_string(variableNumber) + "__";
     variableNumber++;
 
     SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), *type, *declPlace->controlParent());
 
-    const string commonBlockName = "propagation_common__";
+    const string commonBlockName = "__propagation_common__";
 
     SgStatement* funcStart = declPlace->controlParent();
     SgStatement* commonStat = NULL;
@@ -170,7 +169,8 @@ static SgExpression* CreateVar(int& variableNumber, SgType* type)
 
         commonList->setLhs(varList);
     }
-    return  new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
+
+    return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
 }
 
 static void TransformRightPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber) 
@@ -227,8 +227,6 @@ static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<
 {
     if (exp->symbol()->type()->variant() == T_STRING)
         return;
-    if (changed.find(st) != changed.end())
-        return;
     string expUnparsed = exp->unparse();
     if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
     {
@@ -236,62 +234,12 @@ static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<
     }
     SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, arrayToVariable[expUnparsed]->copyPtr(), st->expr(1)->copyPtr(), NULL);
 
-   newStatement->setFileId(st->getFileId());
+    newStatement->setFileId(st->getFileId());
     newStatement->setProject(st->getProject()); 
 
     newStatement->setlineNumber(getNextNegativeLineNumber());
     newStatement->setLocalLineNumber(st->lineNumber());
     st->insertStmtBefore(*newStatement, *st->controlParent());
-    changed.insert(st);
-}
-
-static void TransformBorder(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber)
-{
-    SgStatement* firstStatement = declPlace->lexPrev();
-    st = st->lexPrev();
-    string array = exp->unparse();
-    arrayToVariable[array] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
-    while (st != firstStatement)
-    {
-        if (st->variant() == ASSIGN_STAT && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
-        {
-            if (st->expr(1))
-            {
-                TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
-            }
-            if (st->expr(0) && st->expr(0)->variant() == ARRAY_REF && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
-            {
-                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
-            }
-        }
-        st = st->lexPrev();
-    }
-}
-
-static void CheckVariable(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber)
-{
-    SgStatement* firstStatement = declPlace->lexPrev();
-    st = st->lexPrev();
-    string varName = exp->unparse();
-    while (st != firstStatement)
-    {
-        if (st->variant() == ASSIGN_STAT && st->expr(0)->symbol() == exp->symbol())
-        {
-            TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
-        }
-        if (st->variant() == ASSIGN_STAT && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
-        {
-            if (st->expr(1))
-            {
-                TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
-            }
-            if (st->expr(0) && st->expr(0)->variant() == ARRAY_REF && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
-            {
-                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
-            }
-        }
-        st = st->lexPrev();
-    }
 }
 
 void ArrayConstantPropagation(SgProject& project) 
@@ -314,29 +262,40 @@ void ArrayConstantPropagation(SgProject& project)
 
             for (; st != lastNode; st = st->lexNext())
             {
-                if (st->variant() == FOR_NODE)
+                if (st->variant() == ASSIGN_STAT)
+                {
+                    if (st->expr(1))
+                    {
+                        TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+                    }
+                    if (st->expr(0) && st->expr(0)->variant() == ARRAY_REF && CheckConstIndexes(st->expr(0)->lhs()))
+                    {
+                        TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+                    }
+                }
+                else if (st->variant() == FOR_NODE)
                 {
                     SgExpression* lowerBound = st->expr(0)->lhs();
                     SgExpression* upperBound = st->expr(0)->rhs();
                     string lowerBoundUnparsed = lowerBound->unparse(), upperBoundUnparsed = upperBound->unparse();
                     if (upperBound->variant() == ARRAY_REF && upperBound->symbol()->type()->baseType() && CheckConstIndexes(upperBound->lhs()))
                     {
-                        TransformBorder(st, upperBound, arrayToVariable, variableNumber);
+                        if (arrayToVariable.find(upperBoundUnparsed) == arrayToVariable.end())
+                        {
+                            arrayToVariable[upperBoundUnparsed] = CreateVar(variableNumber, upperBound->symbol()->type()->baseType());
+                        }
                         st->expr(0)->setRhs(arrayToVariable[upperBoundUnparsed]->copyPtr());
                     }
-                    else if (upperBound->variant() == VAR_REF)
-                        CheckVariable(st, upperBound, arrayToVariable, variableNumber);
-
                     if (lowerBound->variant() == ARRAY_REF && lowerBound->symbol()->type()->baseType() && CheckConstIndexes(lowerBound->lhs()))
                     {
-                        TransformBorder(st, lowerBound, arrayToVariable, variableNumber);
+                        if (arrayToVariable.find(lowerBoundUnparsed) == arrayToVariable.end())
+                        {
+                            arrayToVariable[lowerBoundUnparsed] = CreateVar(variableNumber, lowerBound->symbol()->type()->baseType());
+                        }
                         st->expr(0)->setLhs(arrayToVariable[lowerBoundUnparsed]->copyPtr());
                     }
-                    else if (lowerBound->variant() == VAR_REF)
-                        CheckVariable(st, lowerBound, arrayToVariable, variableNumber);
                 }
             }
-            cout << file->functions(i)->unparse() << endl;
         }
     }
 }

src/CFGraph/private_variables_analysis.cpp

@@ -321,12 +321,6 @@ 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__);
     

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <map>
 #include <unordered_set>
 #include <unordered_map>
@@ -17,8 +16,6 @@
 
 using namespace std;
 
-static unordered_set<Region*> collapsed;
-
 static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
 {
     ArrayAccessingIndexes resultContainer;
@@ -52,81 +49,41 @@ static void Collapse(Region* region)
     if (region->getBasickBlocks().empty())
         return;
 
-    bool firstRegion = true;
-    for (Region* basickBlock : region->getBasickBlocks())
+    for (auto& [arrayName, arrayRanges] : region->getHeader()->array_out)
     {
-        if (basickBlock->getNextRegions().empty())
+        for (Region* byBlock : region->getBasickBlocks())
         {
-            if (firstRegion)
-            {
-                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);
-            }
+            AccessingSet intersection = byBlock->array_def[arrayName].Intersect(arrayRanges);
+            region->array_def[arrayName] = region->array_def[arrayName].Union(intersection);
         }
     }
 
-    RegionInstruction instruction;
-    instruction.def = move(region->array_def);
-    
-
-    for (auto& byBlock : region->getBasickBlocks())
+    for (auto& byBlock : region->getBasickBlocks()) 
     {
-        for (auto& instruction : byBlock->instructions)
+        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
         {
-            for (auto& [arrayName, _] : instruction.use)
-            {
-                AccessingSet diff = instruction.use[arrayName].Diff(instruction.in[arrayName]);
-                region->array_use[arrayName] = region->array_use[arrayName].Union(diff);
-            }
+            AccessingSet diff = byBlock->array_use[arrayName].Diff(byBlock->array_in[arrayName]);
+            region->array_use[arrayName] = region->array_use[arrayName].Union(diff);
         }
     }
 
-    ArrayAccessingIndexes useUnionB;
+    ArrayAccessingIndexes useUnion;
     for (auto& byBlock : region->getBasickBlocks())
-        for (auto& instruction : byBlock->instructions)
-            for (auto& [arrayName, _] : instruction.use)
-                useUnionB[arrayName] = useUnionB[arrayName].Union(instruction.use[arrayName]);
+        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
+            useUnion[arrayName] = useUnion[arrayName].Union(byBlock->array_use[arrayName]);
 
-    for (auto& [arrayName, _] : useUnionB)
-        region->array_priv[arrayName] = useUnionB[arrayName].Diff(region->array_use[arrayName]);
-
-    instruction.use = move(region->array_use);
+    region->array_priv = region->array_use;
     
-    for (Region* prevBlock : region->getHeader()->getPrevRegions())
-    {
+    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) 
 {
-    auto blocks = DFG->getBasickBlocks();
-    std::unordered_set<Region*> worklist(blocks.begin(), blocks.end());
+    unordered_set<Region*> worklist(DFG->getBasickBlocks());
     do
     {
         Region* b = *worklist.begin();
@@ -144,7 +101,7 @@ static void SolveDataFlowIteratively(Region* DFG)
                 if (prevBlock->array_out.empty())
                 {
                     newIn.clear();
-                    break;
+                    continue;
                 }
 
                 for (const auto& [arrayName, accessSet] : prevBlock->array_out)
@@ -184,150 +141,17 @@ static void SolveDataFlowIteratively(Region* DFG)
     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);
-    }
-}
-
 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);
@@ -337,8 +161,6 @@ 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())
@@ -366,11 +188,11 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
         toAdd->setLhs(new SgVarRefExp(elem));
     }
     
-    if (arraysToInsert.size() != 0)
-    {
-        loop->loop->insertStmtBefore(*spfStat, *loop->loop->controlParent());
-        insertedPrivates.insert(spfStat);
-    }
+    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)

src/PrivateAnalyzer/range_structures.cpp

@@ -132,10 +132,8 @@ static vector<ArrayDimension> ElementsIntersection(const vector<ArrayDimension>&
 static vector<vector<ArrayDimension>> ElementsDifference(const vector<ArrayDimension>& firstElement,
     const vector<ArrayDimension>& secondElement)
 {
-    if (firstElement.empty())
+    if (firstElement.empty() || secondElement.empty())
         return {};
-    if (secondElement.empty())
-        return { firstElement };
     
     vector<ArrayDimension> intersection = ElementsIntersection(firstElement, secondElement);
     vector<vector<ArrayDimension>> result;
@@ -190,7 +188,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
@@ -254,15 +252,13 @@ AccessingSet AccessingSet::Diff(const AccessingSet& secondSet) const
         return *this;
 
     AccessingSet intersection = this->Intersect(secondSet);
-    vector<vector<ArrayDimension>> uncovered;
-    for (const auto& element : allElements)
+    AccessingSet uncovered = *this;
+    vector<vector<ArrayDimension>> result;
+    for (const auto& element : intersection.GetElements())
     {
         vector<vector<ArrayDimension>> current_uncovered;
-        intersection.FindUncovered(element, current_uncovered);
-        uncovered.insert(uncovered.end(),
-            std::move_iterator(current_uncovered.begin()),
-            std::move_iterator(current_uncovered.end())
-        );
+        uncovered.FindUncovered(element, current_uncovered);
+        uncovered = AccessingSet(current_uncovered);
     }
     return uncovered;
 }

src/PrivateAnalyzer/region.cpp

@@ -1,16 +1,14 @@
-#include <algorithm>
-#include <vector>
-#include <map>
-#include <unordered_set>
-#include <unordered_map>
-#include <string>
+#include<vector>
+#include<map>
+#include<unordered_set>
+#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;
@@ -95,7 +93,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, ArrayAccessingIndexes& all_use, Region* region) {
+static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use) {
     auto instructions = block->getInstructions();
     map<string, LoopGraph*> loopForIndex;
     BuildLoopIndex(loopForIndex, loop);
@@ -125,11 +123,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                     }
 
                     if (point.size() == dimCount)
-                    {
-                        def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
-                        RegionInstruction regionInstruction;
-                        regionInstruction.def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
-                    }
+                        def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({point});
                 }
             }
         }
@@ -137,7 +131,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
         {
             vector<SAPFOR::Argument*> index_vars;
             vector<int> refPos;
-            string array_name = instruction->getInstruction()->getArg1()->getValue();
+            string array_name = instruction->getInstruction()->getArg1()->getValue();            
 
             int j = i - 1;
             while (j >= 0 && instructions[j]->getInstruction()->getOperation() == SAPFOR::CFG_OP::REF)
@@ -154,27 +148,13 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
             auto* ref = isSgArrayRefExp(instruction->getInstruction()->getExpression());
             int fillCount = 0;
 
-            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())
+            while (!index_vars.empty() && !refPos.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();
@@ -200,7 +180,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                             return -1;
                     }
 
-                    uint64_t start = coeffsForDims.back().second * currentLoop->startVal + coeffsForDims.back().first;
+                    uint64_t start = currentLoop->startVal;
                     uint64_t step = currentLoop->stepVal;
                     uint64_t iters = currentLoop->calculatedCountOfIters;
                     current_dim = { start, step, iters, ref };
@@ -213,30 +193,14 @@ 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 } };
-                    all_use[array_name].Insert(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);
+                    use[array_name].Insert(accessPoint);
             }
         }
     }
@@ -244,41 +208,6 @@ 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)
@@ -293,11 +222,10 @@ static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegi
     }
 }
 
-static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, const 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
@@ -309,14 +237,13 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
     for (SAPFOR::BasicBlock* block : blockSet)
         if (bbToRegion.find(block) != bbToRegion.end())
             region->addBasickBlocks(bbToRegion.at(block));
-    
+
     for (LoopGraph* childLoop : loop->children)
     {
         if (!childLoop->isFor())
             continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    TopologySort(region->getBasickBlocks(), region->getHeader());
     return region;
 }
 
@@ -327,13 +254,12 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
     for (auto poiner : blockSet)
     {
         bbToRegion[poiner] = new Region(*poiner);
-        this->basickBlocks.push_back(bbToRegion[poiner]);
-        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use, bbToRegion[poiner]->array_all_use, bbToRegion[poiner]);
+        this->basickBlocks.insert(bbToRegion[poiner]);
+        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use);
 
     }
     this->header = bbToRegion[header];
     SetConnections(bbToRegion, blockSet);
-    RemoveHeaderConnection(header, blockSet, bbToRegion);
     //create subRegions
     for (LoopGraph* childLoop : loop->children)
     {
@@ -341,5 +267,4 @@ 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,11 +8,6 @@
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
 
-struct RegionInstruction
-{
-    ArrayAccessingIndexes def, use, in, out;
-};
-
 class Region : public SAPFOR::BasicBlock {
 public:
     Region() { header = nullptr; }
@@ -25,25 +20,13 @@ public:
 
     void setHeader(Region* region) { header = region; }
 
-    std::vector<Region*>& getBasickBlocks() { return basickBlocks; }
+    std::unordered_set<Region*>& getBasickBlocks() { return basickBlocks; }
 
-    void addBasickBlocks(Region* region) { basickBlocks.push_back(region); }
+    void addBasickBlocks(Region* region) { basickBlocks.insert(region); }
 
     const std::unordered_set<Region*>& getPrevRegions() { return prevRegions; }
 
-    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);
-    }
+    std::unordered_set<Region*> getNextRegions() { return nextRegions; }
 
     void addPrevRegion(Region* region) { prevRegions.insert(region); }
 
@@ -65,18 +48,13 @@ public:
 
     void addSubRegions(Region* region) { subRegions.insert(region); }
 
-    std::vector<RegionInstruction> instructions;
-
-    ArrayAccessingIndexes array_def, array_use, array_out, array_in, array_priv, array_all_use;
+    ArrayAccessingIndexes array_def, array_use, array_out, array_in, array_priv;
 
 private:
-    std::vector<Region*> basickBlocks;
-    std::unordered_set<Region*> subRegions;
+    std::unordered_set<Region*> subRegions, basickBlocks;
     /*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/Transformations/GlobalVariables/fix_common_blocks.cpp

@@ -18,66 +18,69 @@ using std::tuple;
 
 /// main function:
 // renew unions for all common blocks in the file
-//void BuildNewCommDecls
+static 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);
 
 // get names of variables and array elements, which were referenced in programm unit
-//set<string> getUses
-//void getUsesFromExpr
+static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames);
+static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used);
 
 // splits arrays into elements and replaces not used vars with empty constraints
-//bool splitType
- 
+static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars);
 // create constraits set
-//deque<CommConstraint> makeConstraints
- 
+static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars);
 // build union
-//bool buildConstraintsUnion
-//bool docheckUnequalConstraints
-//bool check
+static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints);
+static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints);
+static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints);
 
 /// small help functions:
-//string getParentName
-//bool equalDims
-//bool equalConstraints
-//void addElem
+static string getParentName(const string& name);
+static bool equalDims(const CommConstraint& a, const CommConstraint& b);
+static bool equalConstraints(const CommConstraint& a, const CommConstraint& b);
+static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem);
+//////
 
 // change names of variables in 'constraints'
-//void fixNames
+static void fixNames(deque<CommConstraint>& constraints, const string& commName);
 
 ////// step2: transformation
+
 /// main function
 // peform transformation on every program unit in the file
-//void fixFunctions
+static 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);
 
 // get pairs of names (namesOldToNew) for renaming
-//bool getNamesOldToNew
+static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew);
 
 // create new symbols for new variables in new common declaration (constraints)
-//void makeCommVarSymbs
-
+static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
+    map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl);
 // delete from program unit all references to names in commVarNames
-//void deleteOldVars
+static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames);
 
 // calls fixExpression for each statement, replaces names in data statement
-//void renameVariables
-
+static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew);
 // replacing variables or array elements in expression expr if their names are in namesOldToNew
-//SgExpression* fixExpression
+static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew);
 
 // make new exprList exprssion for new declaration decl with symbols from newSymbs
-//SgExpression* makeExprListForCommon
-
+static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
+    SgFile* file, SgStatement* firstSt);
 // replace old common declarations with new ones
-//void rewriteCommon
+static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs);
 
 /// help functions:
-//SgExpression* makeIdxFromStr(const string& str);
-
+static SgExpression* makeIdxFromStr(const string& str);
 // make new expression of array element
-//SgExpression* newArrElemExpr
-//bool variablePositionComp
+static SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs);
+static bool variablePositionComp(const Variable* lhs, const Variable* rhs);
 //////
 
+
+
 CommConstraint::CommConstraint(const Variable* var, bool u, const string& funcName, const string& fileName)
 {
     used = u;
@@ -122,6 +125,7 @@ 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();
@@ -135,7 +139,8 @@ 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("(");
@@ -149,7 +154,8 @@ static 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;
@@ -188,7 +194,8 @@ static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarName
     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();
@@ -205,7 +212,8 @@ static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNam
     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();
@@ -220,8 +228,9 @@ static bool equalDims(const CommConstraint& a, const CommConstraint& b)
     return true;
 }
 
+
 // TODO: add attributes to CommConstraints, check if a and b have equal attributes
-static bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
+bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
 {
     if ((a.arrayInfo != NULL && b.arrayInfo == NULL) || ((a.arrayInfo == NULL && b.arrayInfo != NULL)))
         return false;
@@ -232,7 +241,8 @@ static 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;
@@ -240,8 +250,9 @@ static 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
-static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
+bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
 {
     CommConstraint var = d.front();
     string name = var.identifier;
@@ -289,7 +300,8 @@ static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string
     }
 }
 
-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())
@@ -306,7 +318,8 @@ static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints,
     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())
     {
@@ -345,8 +358,8 @@ static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommC
     return true;
 }
 
-static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, 
-                                      pair<CommConstraint, CommConstraint>& problemConstraints)
+
+bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     if (U.front().typeVariant == 0)
     {
@@ -369,8 +382,8 @@ static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstr
     return true;
 }
 
-static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, 
-                                  const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
+
+bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     deque<CommConstraint> newU;
     while (!U.empty() && !B.empty())
@@ -425,8 +438,8 @@ static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint
     return true;
 }
 
-//TODO: check this: newDecl and oldDecl => do these variables need references?
-static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
+
+bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
 {
     bool needChange = false;
     map<string, string> rename;
@@ -491,18 +504,16 @@ static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint
             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,
-                             map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl)
+
+void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
+    map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl)
 {
     for (const CommConstraint& var : constraints)
     {
@@ -515,7 +526,8 @@ static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* f
     }
 }
 
-static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
+
+void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
 {
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
     vector<SgStatement*> stmtsToDelete;
@@ -561,12 +573,12 @@ static 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;
@@ -581,13 +593,13 @@ static 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)));
@@ -595,11 +607,11 @@ static SgExpression* newArrElemExpr(const string& newName, const map<string, SgS
     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();
@@ -635,18 +647,17 @@ static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbo
             }
         }
     }
-
     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())
@@ -694,7 +705,8 @@ static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>&
     }
 }
 
-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;
@@ -728,7 +740,8 @@ static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, co
     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())
@@ -779,12 +792,12 @@ static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& comm
                 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)
     {
@@ -799,26 +812,26 @@ static 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,
-                         map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars)
+
+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)
     {
         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;
@@ -829,11 +842,9 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
             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)
@@ -847,9 +858,10 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
     }
 }
 
-static 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)
+
+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)
 {
     string fileName = file->filename();
     SgStatement* curSt = file->firstStatement();
@@ -888,8 +900,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
                     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().getLineNum());
+                    __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);
                 if (hasChar)
                 {
                     badCommon.insert(commName);
@@ -906,7 +917,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
                     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.getVarName(), y.getVarName(), commName.c_str(), x.getFileName(), x.getLineNum(), y.getFileName(), y.getLineNum());
+                                x.varName.c_str(), y.varName.c_str(), commName.c_str(), x.fileName.c_str(), x.lineNum, y.fileName.c_str(), y.lineNum);
                 }
             }
             curSt = curSt->lastNodeOfStmt();
@@ -918,7 +929,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
 
 
 // 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
@@ -932,12 +943,10 @@ void fixCommonBlocks(const map<string, vector<FuncInfo*>>& allFuncInfo, const ma
         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,18 +16,12 @@
 
 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
@@ -48,4 +42,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/Utils/module_utils.cpp

@@ -325,7 +325,7 @@ static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
     }
 }
 
-const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
+set<SgSymbol*> getModuleSymbols(SgStatement *func)
 {
     auto it = symbolsForFunc.find(func->symbol()->identifier());
     if (it != symbolsForFunc.end())
@@ -345,7 +345,7 @@ const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
     }
 
     symbolsForFunc[func->symbol()->identifier()] = symbs;
-    return symbolsForFunc[func->symbol()->identifier()];
+    return symbs;
 }
 
 static void findSymbol(SgStatement* func, const string& varName, const string& locName,

src/Utils/module_utils.h

@@ -1,7 +1,7 @@
 #pragma once
 
 std::string correctSymbolModuleName(const std::string& origFull);
-const std::set<SgSymbol*>& getModuleSymbols(SgStatement* func);
+std::set<SgSymbol*> getModuleSymbols(SgStatement* func);
 void getModulesAndFunctions(SgFile* file, std::vector<SgStatement*>& modulesAndFunctions);
 void findModulesInFile(SgFile* file, std::vector<SgStatement*>& modules);
 std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file);

src/Utils/version.h

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