Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'private_removing: bug fixes' (#14) from private_removing into master

Browse Source
This commit was merged in pull request #14.
This commit is contained in:
Alexander_KS
2023-11-05 17:16:25 +00:00
parent dfb5d4796b c428f365f9
commit 9e98fb4211
1 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
View File

@@ -885,7 +885,9 @@ static void checkImplicitDirectUsage(Context* ctx, SgExpression* exp, int stmtLi
{
SgFunctionCallExp* funcCallExp = (SgFunctionCallExp*)exp;
string funcName = funcCallExp->funName()->identifier();
auto funcInfo = findFunc(ctx->loopStmt->fileName(), funcName, ctx->allFuncInfo);
FuncInfo* funcInfo = findFunc(ctx->loopStmt->fileName(), funcName, ctx->allFuncInfo);
if (funcInfo != nullptr)
{
for (int i = 0; i < funcCallExp->numberOfArgs(); ++i)
{
SgExpression* funcArg = funcCallExp->arg(i);
@@ -900,6 +902,7 @@ static void checkImplicitDirectUsage(Context* ctx, SgExpression* exp, int stmtLi
}
}
}
}
checkImplicitDirectUsage(ctx, exp->lhs(), stmtLineNum, fixedSubscripts);
checkImplicitDirectUsage(ctx, exp->rhs(), stmtLineNum, fixedSubscripts);
@@ -1231,32 +1234,40 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
{
vector<DefUseStmtsPair> defUsePairs;
for (const InsertedStatement& stmt : insertedStmts)
for (const InsertedStatement& useInsertedStmt : insertedStmts)
{
if (stmt.type != TypeOfInsertedStmt::USE)
if (useInsertedStmt.type != TypeOfInsertedStmt::USE) // analysis for USE stmt
continue;
int relLineNum = stmt.relatedToStmt->lineNumber();
int useLineNum = useInsertedStmt.relatedToStmt->lineNumber();
// looking for reaching definitions for the current block:
auto useInsAndBlock = getInstructionAndBlockByStatement(CFGraph, stmt.insertedStmt);
auto useInsAndBlock = getInstructionAndBlockByStatement(CFGraph, useInsertedStmt.insertedStmt);
auto useArg = useInsAndBlock.first->getArg1();
const auto& RD_In = useInsAndBlock.second->getRD_In();
const auto& RD_forUseArg = RD_In.find(useArg);
if (RD_forUseArg == RD_In.end()) // cannot find reaching definitions for argument
{
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), relLineNum);
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
set<int> RD_defArgs = RD_forUseArg->second; // make copy
// delete recursive definition from RD def args:
for (int defArgNum : RD_defArgs)
{
if (defArgNum == SAPFOR::CFG_VAL::UNINIT)
continue;
auto defInsAndBlock = getInstructionAndBlockByNumber(CFGraph, defArgNum);
if (defInsAndBlock.first == nullptr)
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
SgStatement* defStmt = defInsAndBlock.first->getOperator();
auto defInsertedStmt = findInsertedStmt(insertedStmts, defStmt);
if (stmt.relatedToStmt == defInsertedStmt->relatedToStmt) // recursive definition
if (useInsertedStmt.relatedToStmt == defInsertedStmt->relatedToStmt)
{
RD_defArgs.erase(defArgNum);
break;
@@ -1265,13 +1276,40 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
if (RD_defArgs.size() == 0) // argument is not initialized
{
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), relLineNum);
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
if (RD_defArgs.find(SAPFOR::CFG_VAL::UNINIT) != RD_defArgs.end()) // argument is not initialized
{
bool uninitArgIsOk = false;
if (RD_defArgs.size() == 2)
{
RD_defArgs.erase(SAPFOR::CFG_VAL::UNINIT);
int defArgNum = *RD_defArgs.begin();
auto defInsAndBlock = getInstructionAndBlockByNumber(CFGraph, defArgNum);
if (defInsAndBlock.first == nullptr)
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
auto defInsertedStmt = findInsertedStmt(insertedStmts, defInsAndBlock.first->getOperator());
if (defInsertedStmt->relatedToStmt->lineNumber() < useLineNum &&
useInsAndBlock.second->getNumber() == defInsAndBlock.second->getNumber())
{
uninitArgIsOk = true; // argument isn't really uninitialized
}
}
if (!uninitArgIsOk)
{
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
}
if (RD_defArgs.size() > 1) // more than one reaching definition
{
addMessageMoreThanOneRD(ctx->messages, ctx->arraySymbol->identifier(), relLineNum);
addMessageMoreThanOneRD(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
@@ -1282,19 +1320,19 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
auto defInsertedStmt = findInsertedStmt(insertedStmts, defStmt);
if (defInsertedStmt == insertedStmts.end())
{
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), relLineNum);
addMessageCannotFindRD(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
//don't substitute def stmt into use, if def is recursive
if (defInsertedStmt->isRecursive)
{
addMessageRecursiveDependency(ctx->messages, ctx->arraySymbol->identifier(), relLineNum);
addMessageRecursiveDependency(ctx->messages, ctx->arraySymbol->identifier(), useLineNum);
continue;
}
SgAssignStmt* def = (SgAssignStmt*)defInsertedStmt->relatedToStmt;
SgAssignStmt* use = (SgAssignStmt*)stmt.relatedToStmt;
SgAssignStmt* use = (SgAssignStmt*)useInsertedStmt.relatedToStmt;
defUsePairs.push_back(make_pair(def, use));
}