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

Проход удаления приватных переменных: исправление бага из bugreport_1703086913 #28

Merged
Alexander_KS merged 2 commits from private_removing into master 2024-03-14 07:29:07 +00:00
Conversation 1 Commits 2 Files Changed 3 +9 -5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e9e1db084 - Show all commits

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

@@ -1474,7 +1474,8 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
set<int> RD_defArgs = RD_forUseArg->second; // make copy set<int> RD_defArgs = RD_forUseArg->second; // make copy
// delete recursive definition from RD def args: // delete recursive and uninit definition from RD def args:
set<int> tmpRD_defArgs;
for (int defArgNum : RD_defArgs) for (int defArgNum : RD_defArgs)
{ {
if (defArgNum == SAPFOR::CFG_VAL::UNINIT) if (defArgNum == SAPFOR::CFG_VAL::UNINIT)
@@ -1487,11 +1488,11 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
SgStatement* defStmt = defInsAndBlock.first->getOperator(); SgStatement* defStmt = defInsAndBlock.first->getOperator();
auto defInsertedStmt = findInsertedStmt(insertedStmts, defStmt); auto defInsertedStmt = findInsertedStmt(insertedStmts, defStmt);
if (useInsertedStmt.relatedToStmt == defInsertedStmt->relatedToStmt) if (useInsertedStmt.relatedToStmt == defInsertedStmt->relatedToStmt)
{ continue;
RD_defArgs.erase(defArgNum);
break; tmpRD_defArgs.insert(defArgNum);
}
} }
RD_defArgs.swap(tmpRD_defArgs);
if (RD_defArgs.size() == 0) // argument is not initialized if (RD_defArgs.size() == 0) // argument is not initialized
{ {
@@ -1551,6 +1552,9 @@ static vector<DefUseStmtsPair> buildDefUsePairs(Context* ctx, const CFG_Type& CF
else else
{ {
auto defInsAndBlock = getInstructionAndBlockByNumber(CFGraph, *RD_defArgs.begin()); auto defInsAndBlock = getInstructionAndBlockByNumber(CFGraph, *RD_defArgs.begin());
if (defInsAndBlock.first == nullptr)
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
defStmt = defInsAndBlock.first->getOperator(); defStmt = defInsAndBlock.first->getOperator();
} }