fix issue 1139

svf/include/WPA/Andersen.h

@@ -69,6 +69,10 @@ class AndersenBase:  public WPAConstraintSolver, public BVDataPTAImpl
     /// Andersen analysis
     virtual void analyze() override;
 
+    virtual void analyzeAndWrite(const std::string& filename);
+
+    virtual void solveConstraints();
+
     /// Initialize analysis
     virtual void initialize() override;
 

svf/include/WPA/FlowSensitive.h

@@ -86,6 +86,16 @@ class FlowSensitive : public WPASVFGFSSolver, public BVDataPTAImpl
         return fspta.get();
     }
 
+    static FlowSensitive* createFSWPA(SVFIR* _pag, const std::string& filename)
+    {
+        if (fspta == nullptr)
+        {
+            fspta = std::unique_ptr<FlowSensitive>(new FlowSensitive(_pag));
+            fspta->analyzeAndWrite(filename);
+        }
+        return fspta.get();
+    }
+
     /// Release flow-sensitive pointer analysis
     static void releaseFSWPA()
     {
@@ -101,6 +111,10 @@ class FlowSensitive : public WPASVFGFSSolver, public BVDataPTAImpl
     /// Flow sensitive analysis
     void analyze() override;
 
+    virtual void analyzeAndWrite(const std::string& filename);
+
+    virtual void solveConstraints();
+
     /// Initialize analysis
     void initialize() override;
 

svf/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -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)
@@ -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;
     }
 
+
 }
 
 /*!

svf/lib/WPA/Andersen.cpp

@@ -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());
@@ -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());
@@ -157,6 +159,30 @@ void AndersenBase::analyze()
         finalize();
 }
 
+
+void AndersenBase::analyzeAndWrite(const std::string& filename)
+{
+    /// Initialization for the Solver
+    initialize();
+
+    bool readResultsFromFile = false;
+
+    if (filename.empty())
+        this->writeObjVarToFile(filename);
+
+    if(!readResultsFromFile)
+        solveConstraints();
+
+    if (filename.empty())
+    {
+        this->writeToFile(filename);
+    }
+
+    if (!readResultsFromFile)
+        // Finalize the analysis
+        finalize();
+}
+
 void AndersenBase::cleanConsCG(NodeID id)
 {
     consCG->resetSubs(consCG->getRep(id));

svf/lib/WPA/FlowSensitive.cpp

@@ -74,18 +74,8 @@ void FlowSensitive::initialize()
     setGraph(svfg);
     //AndersenWaveDiff::releaseAndersenWaveDiff();
 }
-
-/*!
- * Start analysis
- */
-void FlowSensitive::analyze()
+void FlowSensitive::solveConstraints()
 {
-    bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::FsTimeLimit());
-
-    /// Initialization for the Solver
-    initialize();
-
-    double start = stat->getClk(true);
     /// Start solving constraints
     DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Start Solving Constraints\n"));
 
@@ -104,6 +94,46 @@ void FlowSensitive::analyze()
     while (updateCallGraph(getIndirectCallsites()));
 
     DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Finish Solving Constraints\n"));
+}
+
+/*!
+ * Start analysis
+ */
+void FlowSensitive::analyzeAndWrite(const std::string& filename)
+{
+    bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::FsTimeLimit());
+
+    /// Initialization for the Solver
+    initialize();
+
+    double start = stat->getClk(true);
+    writeObjVarToFile(filename);
+    solveConstraints();
+
+    // Reset the time-up alarm; analysis is done.
+    SVFUtil::stopAnalysisLimitTimer(limitTimerSet);
+
+    writeToFile(filename);
+
+    double end = stat->getClk(true);
+    solveTime += (end - start) / TIMEINTERVAL;
+
+    /// finalize the analysis
+    finalize();
+}
+
+/*!
+ * Start analysis
+ */
+void FlowSensitive::analyze()
+{
+    bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::FsTimeLimit());
+
+    /// Initialization for the Solver
+    initialize();
+
+    double start = stat->getClk(true);
+    solveConstraints();
 
     // Reset the time-up alarm; analysis is done.
     SVFUtil::stopAnalysisLimitTimer(limitTimerSet);