svf-lib 1.0.1253 → 1.0.1254

package/SVF-osx/include/CFL/CFLAlias.h

@@ -30,14 +30,7 @@
 #ifndef INCLUDE_CFL_CFLALIAS_H_
 #define INCLUDE_CFL_CFLALIAS_H_
 
-#include "CFL/CFLSolver.h"
-#include "CFL/CFGNormalizer.h"
-#include "CFL/GrammarBuilder.h"
-#include "CFL/CFLGraphBuilder.h"
-#include "CFL/CFLGramGraphChecker.h"
-#include "MemoryModel/PointerAnalysis.h"
-#include "Graphs/ConsG.h"
-#include "Util/Options.h"
+#include "CFL/CFLBase.h"
 #include "CFL/CFLStat.h"
 
 namespace SVF
@@ -45,25 +38,27 @@ namespace SVF
 
 class CFLStat;
 
-class CFLAlias : public BVDataPTAImpl
+class CFLAlias : public CFLBase
 {
 
 public:
     typedef OrderedMap<CallSite, NodeID> CallSite2DummyValPN;
 
-    CFLAlias(SVFIR* ir) : BVDataPTAImpl(ir, PointerAnalysis::CFLFICI_WPA), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
+    CFLAlias(SVFIR* ir) : CFLBase(ir, PointerAnalysis::CFLFICI_WPA)
     {
     }
 
-    /// Destructor
-    virtual ~CFLAlias()
-    {
-        delete solver;
-    }
+    /// Initialize the grammar, graph, solver
+    virtual void initialize();
+
+    /// Print grammar and graph
+    virtual void finalize();
 
     /// Start Analysis here (main part of pointer analysis).
     virtual void analyze();
 
+    virtual void countSumEdges();
+
     /// Interface exposed to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* v1, const Value* v2)
     {
@@ -107,7 +102,6 @@ public:
 
     /// Need Original one for virtual table
 
-
     /// Add copy edge on constraint graph
     virtual inline bool addCopyEdge(NodeID src, NodeID dst)
     {
@@ -142,39 +136,8 @@ public:
 
     void heapAllocatorViaIndCall(CallSite cs);
 
-    /// Get CFL graph
-    CFLGraph* getCFLGraph()
-    {
-        return graph;
-    }
-
-    /// Statistics
-    //@{
-    static u32_t numOfProcessedAddr;   /// Number of processed Addr edge
-    static u32_t numOfProcessedCopy;   /// Number of processed Copy edge
-    static u32_t numOfProcessedGep;    /// Number of processed Gep edge
-    static u32_t numOfProcessedLoad;   /// Number of processed Load edge
-    static u32_t numOfProcessedStore;  /// Number of processed Store edge
-    static u32_t numOfSfrs;
-    static u32_t numOfFieldExpand;
-
-    static u32_t numOfSCCDetection;
-    static double timeOfSCCDetection;
-    static double timeOfSCCMerges;
-    static double timeOfCollapse;
-    static u32_t AveragePointsToSetSize;
-    static u32_t MaxPointsToSetSize;
-    static double timeOfProcessCopyGep;
-    static double timeOfProcessLoadStore;
-    static double timeOfUpdateCallGraph;
-    //@}
-
 private:
     CallSite2DummyValPN callsite2DummyValPN;        ///< Map an instruction to a dummy obj which created at an indirect callsite, which invokes a heap allocator
-    SVFIR* svfir;
-    CFLGraph* graph;
-    CFLGrammar* grammar;
-    CFLSolver *solver;
 };
 
 } // End namespace SVF

package/SVF-osx/include/CFL/CFLBase.h

@@ -0,0 +1,111 @@
+//===----- CFLBase.h -- CFL Analysis Client Base--------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013->  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * CFLAlias.h
+ *
+ *  Created on: Oct 12, 2022
+ *      Author: Pei Xu
+ */
+
+#ifndef INCLUDE_CFL_CFLBASE_H_
+#define INCLUDE_CFL_CFLBASE_H_
+
+#include "CFL/CFLSolver.h"
+#include "CFL/CFGNormalizer.h"
+#include "CFL/GrammarBuilder.h"
+#include "CFL/CFLGraphBuilder.h"
+#include "CFL/CFLGramGraphChecker.h"
+#include "MemoryModel/PointerAnalysis.h"
+#include "Graphs/ConsG.h"
+#include "Util/Options.h"
+#include "Util/SVFBasicTypes.h"
+
+namespace SVF
+{
+
+class CFLStat;
+
+class CFLBase : public BVDataPTAImpl
+{
+
+public:
+    CFLBase(SVFIR* ir, PointerAnalysis::PTATY pty) : BVDataPTAImpl(ir, pty), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
+    {
+    }
+
+    /// Destructor
+    virtual ~CFLBase()
+    {
+        delete solver;
+    }
+
+    /// Initialize the grammar, graph, solver
+    virtual void initialize() = 0;
+
+    /// Print grammar and graph
+    virtual void finalize() = 0;
+
+    /// Start Analysis here (main part of pointer analysis).
+    virtual void analyze() = 0;
+
+    /// Get CFL graph
+    CFLGraph* getCFLGraph()
+    {
+        return graph;
+    }
+
+    virtual void countSumEdges() = 0;
+
+    /// Statistics
+    //@{
+    static u32_t numOfProcessedAddr;   /// Number of processed Addr edge
+    static u32_t numOfProcessedCopy;   /// Number of processed Copy edge
+    static u32_t numOfProcessedGep;    /// Number of processed Gep edge
+    static u32_t numOfProcessedLoad;   /// Number of processed Load edge
+    static u32_t numOfProcessedStore;  /// Number of processed Store edge
+    static u32_t numOfSfrs;
+    static u32_t numOfFieldExpand;
+
+    static u32_t numOfSCCDetection;
+    static double timeOfSCCDetection;
+    static double timeOfSCCMerges;
+    static double timeOfCollapse;
+    static u32_t AveragePointsToSetSize;
+    static u32_t MaxPointsToSetSize;
+    static double timeOfProcessCopyGep;
+    static double timeOfProcessLoadStore;
+    static double timeOfUpdateCallGraph;
+    static double timeOfSolving;
+    static double numOfSumEdges;
+    //@}
+
+protected:
+    SVFIR* svfir;
+    CFLGraph* graph;
+    CFLGrammar* grammar;
+    CFLSolver *solver;
+};
+
+} // End namespace SVF
+
+#endif /* INCLUDE_CFL_CFLBASE_H_*/

package/SVF-osx/include/CFL/CFLStat.h

@@ -33,11 +33,13 @@
 
 #include "Util/PTAStat.h"
 #include "CFL/CFLAlias.h"
+#include "CFL/CFLVF.h"
 
 namespace SVF
 {
 
 class CFLAlias;
+class CFLVF;
 class SVFIR;
 class ConstraintGraph;
 
@@ -48,7 +50,7 @@ class CFLStat : public PTAStat
 {
 
 private:
-    CFLAlias* pta;
+    CFLBase* pta;
 
 public:
     static const char* CollapseTime;
@@ -65,7 +67,7 @@ public:
     /// CFL Stat
     u32_t _NumofCFLGraphNode;
 
-    CFLStat(CFLAlias* p);
+    CFLStat(CFLBase* p);
 
     virtual ~CFLStat()
     {

package/SVF-osx/include/CFL/CFLVF.h

@@ -30,44 +30,34 @@
 #ifndef INCLUDE_CFL_CFLVF_H_
 #define INCLUDE_CFL_CFLVF_H_
 
-#include "CFL/CFLSolver.h"
-#include "CFL/CFGNormalizer.h"
-#include "CFL/GrammarBuilder.h"
-#include "CFL/CFLGraphBuilder.h"
-#include "CFL/CFLGramGraphChecker.h"
-#include "MemoryModel/PointerAnalysis.h"
-#include "Graphs/ConsG.h"
-#include "Util/Options.h"
+
+#include "CFL/CFLBase.h"
+#include "CFL/CFLStat.h"
 #include "SABER/SaberSVFGBuilder.h"
+#include "WPA/Andersen.h"
 
 namespace SVF
 {
-
-class CFLVF : public BVDataPTAImpl
+class CFLVF : public CFLBase
 {
 
 public:
-    typedef OrderedMap<CallSite, NodeID> CallSite2DummyValPN;
-
-    CFLVF(SVFIR* ir) : BVDataPTAImpl(ir, PointerAnalysis::CFLFSCS_WPA, false), svfir(ir), graph(nullptr), grammar(nullptr), solver(nullptr)
+    CFLVF(SVFIR* ir) : CFLBase(ir, PointerAnalysis::CFLFSCS_WPA)
     {
     }
 
-    /// Destructor
-    virtual ~CFLVF()
-    {
-        delete solver;
-    }
+    /// Initialize the grammar, graph, solver
+    virtual void initialize();
+
+    /// Print grammar and graph
+    virtual void finalize();
 
     /// Start Analysis here (main part of pointer analysis).
     virtual void analyze();
 
+    virtual void countSumEdges();
+
 private:
-    CallSite2DummyValPN callsite2DummyValPN;        ///< Map an instruction to a dummy obj which created at an indirect callsite, which invokes a heap allocator
-    SVFIR* svfir;
-    CFLGraph* graph;
-    CFLGrammar* grammar;
-    CFLSolver *solver;
     SaberSVFGBuilder memSSA;
     SVFG* svfg;
 };

package/SVF-osx/include/Graphs/CFLGraph.h

@@ -109,6 +109,11 @@ public:
 
     void view();
 
+    inline const CFLEdgeSet& getCFLEdges() const
+    {
+        return cflEdgeSet;
+    }
+
 private:
     CFLEdgeSet cflEdgeSet;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1253",
+  "version": "1.0.1254",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {