Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issue #1139 #1153

Closed
wants to merge 3 commits into from
Closed

fix issue #1139 #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77a42b4
fix read and write err
Jul 15, 2023
b47a66f
Merge branch 'SVF-tools:master' into update-from-master-0615-WIP
JasonZhongZexin Jul 16, 2023
567cb9a
fix write and read err
Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions svf/include/WPA/Andersen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ class AndersenBase: public WPAConstraintSolver, public BVDataPTAImpl

NodeBS redundantGepNodes;

void solveConstraints();

/// Statistics
//@{
static u32_t numOfProcessedAddr; /// Number of processed Addr edge
Expand Down
4 changes: 2 additions & 2 deletions svf/lib/MemoryModel/PointerAnalysisImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void BVDataPTAImpl::writeObjVarToFile(const string& filename)
outs() << " error opening file for writing!\n";
return;
}

// Write BaseNodes insensitivity to file
NodeBS NodeIDs;
for (auto it = pag->begin(), ie = pag->end(); it != ie; ++it)
Expand All @@ -185,14 +185,14 @@ void BVDataPTAImpl::writeObjVarToFile(const string& filename)

f << "------\n";

// Job finish and close file
f.close();
if (f.good())
{
outs() << "\n";
return;
}


}

/*!
Expand Down
44 changes: 23 additions & 21 deletions svf/lib/WPA/Andersen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,28 +97,9 @@ void AndersenBase::finalize()
BVDataPTAImpl::finalize();
}

/*!
* Andersen analysis
*/
void AndersenBase::analyze()
void AndersenBase::solveConstraints()
{
/// Initialization for the Solver
initialize();

bool readResultsFromFile = false;
if(!Options::ReadAnder().empty())
{
readResultsFromFile = this->readFromFile(Options::ReadAnder());
// Finalize the analysis
PointerAnalysis::finalize();
}

if (!Options::WriteAnder().empty())
this->writeObjVarToFile(Options::WriteAnder());

if(!readResultsFromFile)
{
// Start solving constraints
// Start solving constraints
DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Start Solving Constraints\n"));

bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::AnderTimeLimit());
Expand All @@ -144,9 +125,30 @@ void AndersenBase::analyze()
SVFUtil::stopAnalysisLimitTimer(limitTimerSet);

DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Finish Solving Constraints\n"));
}

/*!
* Andersen analysis
*/
void AndersenBase::analyze()
{
/// Initialization for the Solver
initialize();

bool readResultsFromFile = false;
if(!Options::ReadAnder().empty())
{
readResultsFromFile = this->readFromFile(Options::ReadAnder());
// Finalize the analysis
PointerAnalysis::finalize();
}

if (!Options::WriteAnder().empty())
this->writeObjVarToFile(Options::WriteAnder());

if(!readResultsFromFile)
solveConstraints();

if (!Options::WriteAnder().empty())
{
this->writeToFile(Options::WriteAnder());
Expand Down
Loading