svf-lib 1.0.2372 → 1.0.2374

package/SVF-linux-x86_64/include/Graphs/CallGraph.h

@@ -357,7 +357,7 @@ public:
     /// Get call graph node
     //@{
 
-    const CallGraphNode* getCallGraphNode(const std::string& name);
+    const CallGraphNode* getCallGraphNode(const std::string& name) const;
 
     inline CallGraphNode* getCallGraphNode(NodeID id) const
     {

package/SVF-linux-x86_64/include/SVFIR/SVFIR.h

@@ -96,7 +96,7 @@ private:
     ICFG* icfg; // ICFG
     CommonCHGraph* chgraph; // class hierarchy graph
     CallSiteSet callSiteSet; /// all the callsites of a program
-    CallGraph* callGraph; /// call graph
+    CallGraph* callGraph; /// Callgraph with direct calls only; no change allowed after init and use callgraph in PointerAnalysis for indirect calls)
 
     static std::unique_ptr<SVFIR> pag;	///< Singleton pattern here to enable instance of SVFIR can only be created once.
     static std::string pagReadFromTxt;
@@ -176,12 +176,8 @@ public:
         return chgraph;
     }
 
-    /// Set/Get CG
-    inline void setCallGraph(CallGraph* c)
-    {
-        callGraph = c;
-    }
-    inline CallGraph* getCallGraph()
+    /// Get CG
+    inline const CallGraph* getCallGraph()
     {
         assert(callGraph && "empty CallGraph! Build SVF IR first!");
         return callGraph;

package/SVF-osx/include/AE/Svfexe/AbstractInterpretation.h

@@ -164,15 +164,14 @@ public:
      */
     AbstractState& getAbsStateFromTrace(const ICFGNode* node)
     {
-        const ICFGNode* repNode = icfg->getRepNode(node);
-        if (abstractTrace.count(repNode) == 0)
+        if (abstractTrace.count(node) == 0)
         {
             assert(false && "No preAbsTrace for this node");
             abort();
         }
         else
         {
-            return abstractTrace[repNode];
+            return abstractTrace[node];
         }
     }
 
@@ -303,8 +302,7 @@ private:
 
     bool hasAbsStateFromTrace(const ICFGNode* node)
     {
-        const ICFGNode* repNode = icfg->getRepNode(node);
-        return abstractTrace.count(repNode) != 0;
+        return abstractTrace.count(node) != 0;
     }
 
     AbsExtAPI* getUtils()

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

@@ -71,10 +71,6 @@ private:
     GlobalICFGNode* globalBlockNode; ///< unique basic block for all globals
     ICFGNodeToSVFLoopVec icfgNodeToSVFLoopVec; ///< map ICFG node to the SVF loops where it resides
 
-    Map<const ICFGNode*, std::vector<const ICFGNode*>> _subNodes; ///<map a node(1st node of basicblock) to its subnodes
-    Map<const ICFGNode*, const ICFGNode*> _repNode; ///<map a subnode to its representative node(1st node of basicblock)
-
-
 public:
     /// Constructor
     ICFG();
@@ -219,8 +215,6 @@ protected:
     virtual inline void addICFGNode(ICFGNode* node)
     {
         addGNode(node->getId(),node);
-        _repNode[node] = node;
-        _subNodes[node].push_back(node);
     }
 
 public:
@@ -237,42 +231,9 @@ public:
     {
         return globalBlockNode;
     }
-
-    const std::vector<const ICFGNode*>& getSubNodes(const ICFGNode* node) const
-    {
-        return _subNodes.at(node);
-    }
-
-    const ICFGNode* getRepNode(const ICFGNode* node) const
-    {
-        return _repNode.at(node);
-    }
-
-
-    void updateSubAndRep(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        addSubNode(rep, sub);
-        updateRepNode(rep, sub);
-    }
     //@}
 
 private:
-    /// when ICFG is simplified, SubNode would merge repNode, then update the map
-    void addSubNode(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        std::vector<const ICFGNode*>& subNodes = _subNodes[sub];
-        if(std::find(subNodes.begin(), subNodes.end(), rep) == subNodes.end())
-        {
-            subNodes.push_back(rep);
-        }
-    }
-
-    /// when ICFG is simplified, some node would be removed, this map records the removed node to its rep node
-    void updateRepNode(const ICFGNode* rep, const ICFGNode* sub)
-    {
-        _repNode[rep] = sub;
-    }
-
     /// Add ICFG edge, only used by addIntraEdge, addCallEdge, addRetEdge etc.
     inline bool addICFGEdge(ICFGEdge* edge)
     {

package/package.json

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