svf-lib 1.0.2446 → 1.0.2450

package/.github/workflows/publish-svf-lib.yml

@@ -3,24 +3,31 @@ name: svf-build
 # Triggers the workflow on push or pull request events
 on: [push, pull_request]
 
+permissions:
+  contents: read
+  id-token: write 
+
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: npm-publish
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           registry-url: https://registry.npmjs.org/
-
+        
       - name: publish-svf-lib
+        env:
+          NODE_AUTH_TOKEN: ""
+          NPM_CONFIG_USERCONFIG: ""
         run: |
+          npm i -g npm@latest
           if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get update ; fi
           cat package.json
-          npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}
+          npm publish --access public
 
   trigger-svf-python:
     if: github.event_name == 'push'  # Only run on push events

package/SVF-linux-aarch64/include/Graphs/BasicBlockG.h

@@ -74,6 +74,7 @@ class SVFBasicBlock : public GenericBasicBlockNodeTy
     friend class FunObjVar;
     friend class ICFGBuilder;
     friend class ICFG;
+    friend class GraphDBClient;
 
 public:
     typedef std::vector<const ICFGNode*>::const_iterator const_iterator;
@@ -98,6 +99,17 @@ protected:
 
     /// @}
 
+    // Getters of predecessor and successor basic blocks, used for writing bb to DB
+    const std::vector<const SVFBasicBlock*> getSuccBBs() const
+    {
+        return succBBs;
+    }
+
+    const std::vector<const SVFBasicBlock*> getPredBBs() const
+    {
+        return predBBs;
+    }
+
 public:
     /// Constructor without name
     SVFBasicBlock(NodeID id, const FunObjVar* f): GenericBasicBlockNodeTy(id, BasicBlockKd), fun(f)
@@ -289,24 +301,26 @@ public:
 typedef GenericGraph<SVFBasicBlock, BasicBlockEdge> GenericBasicBlockGraphTy;
 class BasicBlockGraph: public GenericBasicBlockGraphTy
 {
-private:
-    NodeID id{0};
 public:
+    NodeID id{0};
     /// Constructor
-    BasicBlockGraph()
+    BasicBlockGraph(): GenericBasicBlockGraphTy()
     {
 
     }
 
+
     SVFBasicBlock* addBasicBlock(const std::string& bbname)
     {
         id++;
         SVFBasicBlock* bb = new SVFBasicBlock(id, nullptr);
-        addGNode(id, bb);
         bb->setName(bbname);
+        addBasicBlock(bb);
         return bb;
     }
 
+    void addBasicBlock(SVFBasicBlock* bb);
+
 };
 }
 

package/SVF-linux-aarch64/include/Graphs/CHG.h

@@ -105,6 +105,7 @@ private:
 typedef GenericNode<CHNode, CHEdge> GenericCHNodeTy;
 class CHNode: public GenericCHNodeTy
 {
+    friend class GraphDBClient;
 
 public:
     typedef enum
@@ -222,6 +223,16 @@ private:
      * virtualFunctionVectors = {{Af1, Af2, ...}, {Bg1, Bg2, ...}}
      */
     std::vector<FuncVector> virtualFunctionVectors;
+
+protected:
+    inline size_t getFlags() const
+    {
+        return flags;
+    }
+    inline void setFlags(size_t f)
+    {
+        flags = f;
+    }
 };
 
 /// class hierarchy graph
@@ -229,6 +240,7 @@ typedef GenericGraph<CHNode, CHEdge> GenericCHGraphTy;
 class CHGraph: public CommonCHGraph, public GenericCHGraphTy
 {
     friend class CHGBuilder;
+    friend class GraphDBClient;
 
 public:
     typedef Set<const CHNode*> CHNodeSetTy;

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

@@ -224,6 +224,7 @@ public:
     {
         return node->getNodeKind() == CallNodeKd;
     }
+
     //@}
 };
 
@@ -233,6 +234,8 @@ public:
 typedef GenericGraph<CallGraphNode, CallGraphEdge> GenericPTACallGraphTy;
 class CallGraph : public GenericPTACallGraphTy
 {
+    friend class GraphDBClient;
+
 
 public:
     typedef CallGraphEdge::CallGraphEdgeSet CallGraphEdgeSet;
@@ -281,13 +284,14 @@ protected:
         if(it == csToIdMap.end())
         {
             CallSiteID id = totalCallSiteNum++;
-            csToIdMap.insert(std::make_pair(newCS, id));
-            idToCSMap.insert(std::make_pair(id, newCS));
+            addCallSite(cs,callee,id, newCS);
             return id;
         }
         return it->second;
     }
 
+    CallSiteID addCallSite(const CallICFGNode* cs, const FunObjVar* callee, const CallSiteID csid, std::pair<const CallICFGNode*, const FunObjVar*> newCS);
+
     /// Add call graph edge
     inline void addEdge(CallGraphEdge* edge)
     {
@@ -295,6 +299,14 @@ protected:
         edge->getSrcNode()->addOutgoingEdge(edge);
     }
 
+    /// add direct call graph edge from database [only used this function when loading cgEdges from db results]
+    void addDirectCallGraphEdge(CallGraphEdge* cgEdge);
+
+    /// add call graph node from database [only used this function when loading cgNodes from db results]
+    void addCallGraphNode(CallGraphNode* cgNode);
+
+    /// Whether we have already created this call graph edge
+    CallGraphEdge* hasGraphEdge(CallGraphEdge* cgEdge) const;
 public:
     /// Constructor
     CallGraph(CGEK k = NormCallGraph);

package/SVF-linux-aarch64/include/Graphs/ICFG.h

@@ -34,6 +34,7 @@
 #include "Graphs/ICFGEdge.h"
 #include "Util/WorkList.h"
 #include "MemoryModel/SVFLoop.h"
+#include "SVFIR/SVFVariables.h"
 
 namespace SVF
 {
@@ -48,6 +49,7 @@ class ICFG : public GenericICFGTy
 {
     friend class ICFGBuilder;
     friend class ICFGSimplification;
+    friend class GraphDBClient;
 
 public:
 
@@ -198,23 +200,37 @@ protected:
     virtual inline FunEntryICFGNode* addFunEntryICFGNode(const FunObjVar* svfFunc)
     {
         FunEntryICFGNode* sNode = new FunEntryICFGNode(totalICFGNode++,svfFunc);
-        addICFGNode(sNode);
-        return FunToFunEntryNodeMap[svfFunc] = sNode;
+        return addFunEntryICFGNode(sNode);
     }
 
+    virtual inline FunEntryICFGNode* addFunEntryICFGNode(FunEntryICFGNode* funEntryICFGNode)
+    {
+        addICFGNode(funEntryICFGNode);
+        return FunToFunEntryNodeMap[funEntryICFGNode->getFun()] = funEntryICFGNode;
+    }
+
+    virtual void addGlobalICFGNode(GlobalICFGNode* globalICFGNode);
+
     virtual inline FunExitICFGNode* addFunExitICFGNode(const FunObjVar* svfFunc)
     {
-        FunExitICFGNode* sNode = new FunExitICFGNode(totalICFGNode++, svfFunc);
-        addICFGNode(sNode);
-        return FunToFunExitNodeMap[svfFunc] = sNode;
+        const SVFBasicBlock* bb = nullptr;
+        if (svfFunc->begin() != svfFunc->end())
+        {
+            bb = svfFunc->getExitBB();
+        }
+        FunExitICFGNode* sNode = new FunExitICFGNode(totalICFGNode++, svfFunc, bb);
+        return addFunExitICFGNode(sNode);
     }
 
-    /// Add a ICFG node
-    virtual inline void addICFGNode(ICFGNode* node)
+    virtual inline FunExitICFGNode* addFunExitICFGNode(FunExitICFGNode* funExitICFGNode)
     {
-        addGNode(node->getId(),node);
+        addICFGNode(funExitICFGNode);
+        return FunToFunExitNodeMap[funExitICFGNode->getFun()] = funExitICFGNode;
     }
 
+    /// Add a ICFG node
+    virtual void addICFGNode(ICFGNode* node);
+
 public:
     /// Get a basic block ICFGNode
     /// TODO:: need to fix the assertions

package/SVF-linux-aarch64/include/Graphs/ICFGEdge.h

@@ -112,6 +112,7 @@ class IntraCFGEdge : public ICFGEdge
 {
     friend class ICFG;
     friend class SVFIRBuilder;
+    friend class GraphDBClient;
 
 public:
     /// Constructor

package/SVF-linux-aarch64/include/Graphs/ICFGNode.h

@@ -140,8 +140,6 @@ public:
         return isICFGNodeKinds(node->getNodeKind());
     }
 
-
-
 protected:
     const FunObjVar* fun;
     const SVFBasicBlock* bb;
@@ -192,6 +190,8 @@ public:
  */
 class IntraICFGNode : public ICFGNode
 {
+    friend class GraphDBClient;
+
 private:
     bool isRet;
 
@@ -270,6 +270,7 @@ public:
  */
 class FunEntryICFGNode : public InterICFGNode
 {
+    friend class GraphDBClient;
 
 public:
     typedef std::vector<const SVFVar *> FormalParmNodeVec;
@@ -335,12 +336,18 @@ public:
  */
 class FunExitICFGNode : public InterICFGNode
 {
+    friend class GraphDBClient;
 
 private:
     const SVFVar *formalRet;
 
 public:
-    FunExitICFGNode(NodeID id, const FunObjVar* f);
+    FunExitICFGNode(NodeID id, const FunObjVar* f, const SVFBasicBlock* b)
+        : InterICFGNode(id, FunExitBlock), formalRet(nullptr)
+    {
+        this->fun = f;
+        this->bb = b;
+    }
 
     /// Return function
     inline const FunObjVar* getFun() const override
@@ -398,6 +405,7 @@ public:
  */
 class CallICFGNode : public InterICFGNode
 {
+    friend class GraphDBClient;
 
 public:
     typedef std::vector<const ValVar *> ActualParmNodeVec;
@@ -411,6 +419,8 @@ protected:
     SVFVar* vtabPtr;                /// virtual table pointer
     s32_t virtualFunIdx;            /// virtual function index of the virtual table(s) at a virtual call
     std::string funNameOfVcall;     /// the function name of this virtual call
+    const SVFVar* indFunPtr;
+
 
 public:
     CallICFGNode(NodeID id, const SVFBasicBlock* b, const SVFType* ty,
@@ -561,6 +571,18 @@ public:
     {
         return "CallICFGNode: " + ICFGNode::getSourceLoc();
     }
+
+    inline void setIndFunPtr(const SVFVar* indFun)
+    {
+        assert(isIndirectCall() && "not a indirect call?");
+        indFunPtr = indFun;
+    }
+
+    inline const SVFVar* getIndFunPtr() const
+    {
+        assert(isIndirectCall() && "not a indirect call?");
+        return indFunPtr;
+    }
 };
 
 
@@ -569,6 +591,14 @@ public:
  */
 class RetICFGNode : public InterICFGNode
 {
+    friend class GraphDBClient;
+
+protected:
+    /// Add call block node from database for the new RetICFGNode [only used this function when loading from db results]
+    inline void setCallBlockNode(const CallICFGNode* cb)
+    {
+        callBlockNode = cb;
+    }
 
 private:
     const SVFVar *actualRet;
@@ -578,9 +608,12 @@ public:
     RetICFGNode(NodeID id, CallICFGNode* cb) :
         InterICFGNode(id, FunRetBlock), actualRet(nullptr), callBlockNode(cb)
     {
-        fun = cb->getFun();
-        bb = cb->getBB();
-        type = cb->getType();
+        if (nullptr != cb)
+        {
+            fun = cb->getFun();
+            bb = cb->getBB();
+            type = cb->getType();
+        }
     }
 
     inline const CallICFGNode* getCallICFGNode() const

package/SVF-linux-aarch64/include/Graphs/IRGraph.h

@@ -52,6 +52,7 @@ class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 {
     friend class SVFIRBuilder;
     friend class SymbolTableBuilder;
+    friend class GraphDBClient;
 
 public:
 
@@ -129,6 +130,7 @@ protected:
     /// blocks, thus flags are needed to distinguish them
     SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind,
                             const ICFGNode* cs);
+    SVFStmt* hasEdge(SVFStmt* edge, SVFStmt::PEDGEK kind);
     /// Return MultiOpndStmt since it has more than one operands (we use operand
     /// 2 here to make the flag)
     SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind,
@@ -270,6 +272,15 @@ public:
         return svfTypes;
     }
 
+    inline const SVFType* getSVFType(u32_t id) const
+    {
+        for(const SVFType* type : svfTypes)
+        {
+            if(type->getId() == id)
+                return type;
+        }
+        return nullptr;
+    }
     inline const Set<const StInfo*>& getStInfos() const
     {
         return stInfos;
@@ -360,6 +371,7 @@ public:
 
     inline void addStInfo(StInfo* stInfo)
     {
+        stInfo->setStinfoId(stInfos.size());
         stInfos.insert(stInfo);
     }
 

package/SVF-linux-aarch64/include/MemoryModel/AccessPath.h

@@ -51,7 +51,7 @@ class SVFVar;
 */
 class AccessPath
 {
-
+    friend class GraphDBClient;
 public:
     enum LSRelation
     {
@@ -161,6 +161,12 @@ public:
     /// Dump location set
     std::string dump() const;
 
+protected:
+    inline void addIdxOperandPair(std::pair<const SVFVar*, const SVFType*> pair)
+    {
+        idxOperandPairs.push_back(pair);
+    }
+
 private:
 
     /// Check relations of two location sets

package/SVF-linux-aarch64/include/SVF-LLVM/ICFGBuilder.h

@@ -148,7 +148,7 @@ private:
     inline void addGlobalICFGNode()
     {
         icfg->globalBlockNode = new GlobalICFGNode(icfg->totalICFGNode++);
-        icfg->addICFGNode(icfg->globalBlockNode);
+        icfg->addGlobalICFGNode(icfg->globalBlockNode);
     }
 
 private:

package/SVF-linux-aarch64/include/SVF-LLVM/SVFIRBuilder.h

@@ -46,6 +46,7 @@ namespace SVF
  */
 class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
 {
+    friend class GraphDBSVFIRBuilder;
 
 private:
     SVFIR* pag;

package/SVF-linux-aarch64/include/SVFIR/ObjTypeInfo.h

@@ -42,6 +42,7 @@ namespace SVF
 class ObjTypeInfo
 {
     friend class SymbolTableBuilder;
+    friend class GraphDBClient;
 
 public:
     typedef enum
@@ -148,6 +149,10 @@ public:
     {
         flags |= mask;
     }
+    inline u32_t getFlag() const
+    {
+        return flags;
+    }
     inline bool hasFlag(MEMTYPE mask)
     {
         return (flags & mask) == mask;