svf-lib 1.0.2511 → 1.0.2513

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

@@ -209,6 +209,22 @@ public:
     LoadVFGNode(NodeID id, const LoadStmt* edge): StmtVFGNode(id, edge,Load)
     {
 
+    }
+    inline const ValVar* getSrcNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getSrcNode());
+    }
+    inline const ValVar* getDstNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getDstNode());
+    }
+    inline const ValVar* getRHSVar() const
+    {
+        return getSrcNode();
+    }
+    inline const ValVar* getLHSVar() const
+    {
+        return getDstNode();
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -254,6 +270,22 @@ public:
     StoreVFGNode(NodeID id,const StoreStmt* edge): StmtVFGNode(id,edge,Store)
     {
 
+    }
+    inline const ValVar* getSrcNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getSrcNode());
+    }
+    inline const ValVar* getDstNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getDstNode());
+    }
+    inline const ValVar* getRHSVar() const
+    {
+        return getSrcNode();
+    }
+    inline const ValVar* getLHSVar() const
+    {
+        return getDstNode();
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -299,6 +331,22 @@ public:
     CopyVFGNode(NodeID id,const CopyStmt* copy): StmtVFGNode(id,copy,Copy)
     {
 
+    }
+    inline const ValVar* getSrcNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getSrcNode());
+    }
+    inline const ValVar* getDstNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getDstNode());
+    }
+    inline const ValVar* getRHSVar() const
+    {
+        return getSrcNode();
+    }
+    inline const ValVar* getLHSVar() const
+    {
+        return getDstNode();
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -337,9 +385,9 @@ public:
 class CmpVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const SVFVar*> OPVers;
+    typedef Map<u32_t,const ValVar*> OPVers;
 protected:
-    const SVFVar* res;
+    const ValVar* res;
     OPVers opVers;
 
 private:
@@ -349,7 +397,7 @@ private:
 
 public:
     /// Constructor
-    CmpVFGNode(NodeID id,const SVFVar* r): VFGNode(id,Cmp), res(r) { }
+    CmpVFGNode(NodeID id,const ValVar* r): VFGNode(id,Cmp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const CmpVFGNode *)
@@ -371,17 +419,17 @@ public:
     //@}
     /// Operands at a BinaryNode
     //@{
-    inline const SVFVar* getOpVer(u32_t pos) const
+    inline const ValVar* getOpVer(u32_t pos) const
     {
         OPVers::const_iterator it = opVers.find(pos);
         assert(it!=opVers.end() && "version is nullptr, did not rename?");
         return it->second;
     }
-    inline void setOpVer(u32_t pos, const SVFVar* node)
+    inline void setOpVer(u32_t pos, const ValVar* node)
     {
         opVers[pos] = node;
     }
-    inline const SVFVar* getRes() const
+    inline const ValVar* getRes() const
     {
         return res;
     }
@@ -414,9 +462,9 @@ public:
 class BinaryOPVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const SVFVar*> OPVers;
+    typedef Map<u32_t,const ValVar*> OPVers;
 protected:
-    const SVFVar* res;
+    const ValVar* res;
     OPVers opVers;
 
 private:
@@ -426,7 +474,7 @@ private:
 
 public:
     /// Constructor
-    BinaryOPVFGNode(NodeID id,const SVFVar* r): VFGNode(id,BinaryOp), res(r) { }
+    BinaryOPVFGNode(NodeID id,const ValVar* r): VFGNode(id,BinaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const BinaryOPVFGNode *)
@@ -448,17 +496,17 @@ public:
     //@}
     /// Operands at a BinaryNode
     //@{
-    inline const SVFVar* getOpVer(u32_t pos) const
+    inline const ValVar* getOpVer(u32_t pos) const
     {
         OPVers::const_iterator it = opVers.find(pos);
         assert(it!=opVers.end() && "version is nullptr, did not rename?");
         return it->second;
     }
-    inline void setOpVer(u32_t pos, const SVFVar* node)
+    inline void setOpVer(u32_t pos, const ValVar* node)
     {
         opVers[pos] = node;
     }
-    inline const SVFVar* getRes() const
+    inline const ValVar* getRes() const
     {
         return res;
     }
@@ -488,9 +536,9 @@ public:
 class UnaryOPVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const SVFVar*> OPVers;
+    typedef Map<u32_t,const ValVar*> OPVers;
 protected:
-    const SVFVar* res;
+    const ValVar* res;
     OPVers opVers;
 
 private:
@@ -500,7 +548,7 @@ private:
 
 public:
     /// Constructor
-    UnaryOPVFGNode(NodeID id, const SVFVar *r) : VFGNode(id, UnaryOp), res(r) { }
+    UnaryOPVFGNode(NodeID id, const ValVar *r) : VFGNode(id, UnaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const UnaryOPVFGNode *)
@@ -522,21 +570,21 @@ public:
     //@}
     /// Operands at a UnaryNode
     //@{
-    inline const SVFVar* getOpVer(u32_t pos) const
+    inline const ValVar* getOpVer(u32_t pos) const
     {
         OPVers::const_iterator it = opVers.find(pos);
         assert(it!=opVers.end() && "version is nullptr, did not rename?");
         return it->second;
     }
-    inline void setOpVer(u32_t pos, const SVFVar* node)
+    inline void setOpVer(u32_t pos, const ValVar* node)
     {
         opVers[pos] = node;
     }
-    inline const SVFVar* getRes() const
+    inline const ValVar* getRes() const
     {
         return res;
     }
-    inline const SVFVar* getOpVar() const
+    inline const ValVar* getOpVar() const
     {
         assert(getOpVerNum()==1 && "UnaryNode can only have one operand!");
         return getOpVer(0);
@@ -634,6 +682,22 @@ public:
     GepVFGNode(NodeID id,const GepStmt* edge): StmtVFGNode(id,edge,Gep)
     {
 
+    }
+    inline const ValVar* getSrcNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getSrcNode());
+    }
+    inline const ValVar* getDstNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getDstNode());
+    }
+    inline const ValVar* getRHSVar() const
+    {
+        return getSrcNode();
+    }
+    inline const ValVar* getLHSVar() const
+    {
+        return getDstNode();
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -671,14 +735,14 @@ class PHIVFGNode : public VFGNode
 {
 
 public:
-    typedef Map<u32_t,const SVFVar*> OPVers;
+    typedef Map<u32_t,const ValVar*> OPVers;
 protected:
-    const SVFVar* res;
+    const ValVar* res;
     OPVers opVers;
 
 public:
     /// Constructor
-    PHIVFGNode(NodeID id, const SVFVar* r,VFGNodeK k = TPhi);
+    PHIVFGNode(NodeID id, const ValVar* r,VFGNodeK k = TPhi);
 
     /// Whether this phi node is of pointer type (used for pointer analysis).
     inline bool isPTANode() const
@@ -688,17 +752,17 @@ public:
 
     /// Operands at a llvm PHINode
     //@{
-    inline const SVFVar* getOpVer(u32_t pos) const
+    inline const ValVar* getOpVer(u32_t pos) const
     {
         OPVers::const_iterator it = opVers.find(pos);
         assert(it!=opVers.end() && "version is nullptr, did not rename?");
         return it->second;
     }
-    inline void setOpVer(u32_t pos, const SVFVar* node)
+    inline void setOpVer(u32_t pos, const ValVar* node)
     {
         opVers[pos] = node;
     }
-    inline const SVFVar* getRes() const
+    inline const ValVar* getRes() const
     {
         return res;
     }
@@ -756,7 +820,7 @@ private:
     OPIncomingBBs opIncomingBBs;
 public:
     /// Constructor
-    IntraPHIVFGNode(NodeID id, const SVFVar* r): PHIVFGNode(id, r, TIntraPhi)
+    IntraPHIVFGNode(NodeID id, const ValVar* r): PHIVFGNode(id, r, TIntraPhi)
     {
     }
 
@@ -766,7 +830,7 @@ public:
         assert(it!=opIncomingBBs.end() && "version is nullptr, did not rename?");
         return it->second;
     }
-    inline void setOpVerAndBB(u32_t pos, const SVFVar* node, const ICFGNode* bb)
+    inline void setOpVerAndBB(u32_t pos, const ValVar* node, const ICFGNode* bb)
     {
         opVers[pos] = node;
         opIncomingBBs[pos] = bb;
@@ -812,6 +876,22 @@ public:
     AddrVFGNode(NodeID id, const AddrStmt* edge): StmtVFGNode(id, edge,Addr)
     {
 
+    }
+    inline const ObjVar* getSrcNode() const
+    {
+        return SVFUtil::cast<ObjVar>(StmtVFGNode::getSrcNode());
+    }
+    inline const ValVar* getDstNode() const
+    {
+        return SVFUtil::cast<ValVar>(StmtVFGNode::getDstNode());
+    }
+    inline const ValVar* getLHSVar() const
+    {
+        return getDstNode();
+    }
+    inline const ObjVar* getRHSVar() const
+    {
+        return getSrcNode();
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -847,11 +927,11 @@ class ArgumentVFGNode : public VFGNode
 {
 
 protected:
-    const SVFVar* param;
+    const ValVar* param;
 
 public:
     /// Constructor
-    ArgumentVFGNode(NodeID id, const SVFVar* p, VFGNodeK k): VFGNode(id,k), param(p)
+    ArgumentVFGNode(NodeID id, const ValVar* p, VFGNodeK k): VFGNode(id,k), param(p)
     {
     }
 
@@ -894,7 +974,7 @@ private:
     const CallICFGNode* cs;
 public:
     /// Constructor
-    ActualParmVFGNode(NodeID id, const SVFVar* n, const CallICFGNode* c) :
+    ActualParmVFGNode(NodeID id, const ValVar* n, const CallICFGNode* c) :
         ArgumentVFGNode(id, n, AParm), cs(c)
     {
     }
@@ -906,7 +986,7 @@ public:
     }
 
     /// Return parameter
-    inline const SVFVar* getParam() const
+    inline const ValVar* getParam() const
     {
         return param;
     }
@@ -952,13 +1032,13 @@ private:
 
 public:
     /// Constructor
-    FormalParmVFGNode(NodeID id, const SVFVar* n, const FunObjVar* f):
+    FormalParmVFGNode(NodeID id, const ValVar* n, const FunObjVar* f):
         ArgumentVFGNode(id, n, FParm),  fun(f)
     {
     }
 
     /// Return parameter
-    inline const SVFVar* getParam() const
+    inline const ValVar* getParam() const
     {
         return param;
     }
@@ -1028,7 +1108,7 @@ private:
 
 public:
     /// Constructor
-    ActualRetVFGNode(NodeID id, const SVFVar* n, const CallICFGNode* c) :
+    ActualRetVFGNode(NodeID id, const ValVar* n, const CallICFGNode* c) :
         ArgumentVFGNode(id, n, ARet), cs(c)
     {
     }
@@ -1043,7 +1123,7 @@ public:
         return cs->getCaller();
     }
     /// Receive parameter at callsite
-    inline const SVFVar* getRev() const
+    inline const ValVar* getRev() const
     {
         return param;
     }
@@ -1091,10 +1171,10 @@ private:
 
 public:
     /// Constructor
-    FormalRetVFGNode(NodeID id, const SVFVar* n, const FunObjVar* f);
+    FormalRetVFGNode(NodeID id, const ValVar* n, const FunObjVar* f);
 
     /// Return value at callee
-    inline const SVFVar* getRet() const
+    inline const ValVar* getRet() const
     {
         return param;
     }

package/SVF-osx/include/MemoryModel/AccessPath.h

@@ -41,6 +41,7 @@ namespace SVF
 {
 
 class SVFVar;
+class ValVar;
 
 
 /*
@@ -58,7 +59,7 @@ public:
         NonOverlap, Overlap, Subset, Superset, Same
     };
 
-    typedef std::pair<const SVFVar*, const SVFType*> IdxOperandPair;
+    typedef std::pair<const ValVar*, const SVFType*> IdxOperandPair;
     typedef std::vector<IdxOperandPair> IdxOperandPairs;
 
     /// Constructor
@@ -144,7 +145,7 @@ public:
     u32_t getElementNum(const SVFType* type) const;
 
 
-    bool addOffsetVarAndGepTypePair(const SVFVar* var, const SVFType* gepIterType);
+    bool addOffsetVarAndGepTypePair(const ValVar* var, const SVFType* gepIterType);
 
     /// Return TRUE if this is a constant location set.
     bool isConstantOffset() const;
@@ -156,13 +157,13 @@ public:
     }
 
     /// Return byte offset from the beginning of the structure to the field where it is located for struct type
-    u32_t getStructFieldOffset(const SVFVar* idxOperandVar, const SVFStructType* idxOperandType) const;
+    u32_t getStructFieldOffset(const ValVar* idxOperandVar, const SVFStructType* idxOperandType) const;
 
     /// Dump location set
     std::string dump() const;
 
 protected:
-    inline void addIdxOperandPair(std::pair<const SVFVar*, const SVFType*> pair)
+    inline void addIdxOperandPair(std::pair<const ValVar*, const SVFType*> pair)
     {
         idxOperandPairs.push_back(pair);
     }

package/SVF-osx/include/SABER/SaberSVFGBuilder.h

@@ -60,7 +60,7 @@ public:
     }
 
     /// Add ActualParmVFGNode
-    inline void addActualParmVFGNode(const SVFVar* svfVar, const CallICFGNode* cs)
+    inline void addActualParmVFGNode(const ValVar* svfVar, const CallICFGNode* cs)
     {
         svfg->addActualParmVFGNode(svfVar, cs);
     }

package/SVF-osx/include/SVFIR/SVFIR.h

@@ -55,12 +55,12 @@ public:
     typedef Map<NodeID,CallSiteSet> FunPtrToCallSitesMap;
     typedef Map<NodeID,NodeBS> MemObjToFieldsMap;
     typedef std::vector<const SVFStmt*> SVFStmtList;
-    typedef std::vector<const SVFVar*> SVFVarList;
+    typedef std::vector<const ValVar*> ValVarList;
     typedef Map<const SVFVar*,PhiStmt*> PHINodeMap;
-    typedef Map<const FunObjVar*,SVFVarList> FunToArgsListMap;
-    typedef Map<const CallICFGNode*,SVFVarList> CSToArgsListMap;
-    typedef Map<const RetICFGNode*,const SVFVar*> CSToRetMap;
-    typedef Map<const FunObjVar*,const SVFVar*> FunToRetMap;
+    typedef Map<const FunObjVar*,ValVarList> FunToArgsListMap;
+    typedef Map<const CallICFGNode*,ValVarList> CSToArgsListMap;
+    typedef Map<const RetICFGNode*,const ValVar*> CSToRetMap;
+    typedef Map<const FunObjVar*,const ValVar*> FunToRetMap;
     typedef Map<const FunObjVar*,SVFStmtSet> FunToPAGEdgeSetMap;
     typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
@@ -132,6 +132,16 @@ public:
     {
         return getGNode(id);
     }
+    inline const ValVar* getValVar(NodeID id) const
+    {
+        if(const SVFVar* var = getSVFVar(id))
+            return SVFUtil::dyn_cast<ValVar>(var);
+        else
+        {
+            assert(false && "the Node is not a ValVar");
+            return nullptr;
+        }
+    }
     inline const ObjVar* getObjVar(NodeID id) const
     {
         if(const SVFVar* var = getSVFVar(id))
@@ -355,7 +365,7 @@ public:
         return funArgsListMap;
     }
     /// Get function arguments list
-    inline const SVFVarList& getFunArgsList(const FunObjVar*  func) const
+    inline const ValVarList& getFunArgsList(const FunObjVar*  func) const
     {
         FunToArgsListMap::const_iterator it = funArgsListMap.find(func);
         assert(it != funArgsListMap.end() && "this function doesn't have arguments");
@@ -372,7 +382,7 @@ public:
         return callSiteArgsListMap;
     }
     /// Get callsite argument list
-    inline const SVFVarList& getCallSiteArgsList(const CallICFGNode* cs) const
+    inline const ValVarList& getCallSiteArgsList(const CallICFGNode* cs) const
     {
         CSToArgsListMap::const_iterator it = callSiteArgsListMap.find(cs);
         assert(it != callSiteArgsListMap.end() && "this call site doesn't have arguments");
@@ -384,7 +394,7 @@ public:
         return callSiteRetMap;
     }
     /// Get callsite return
-    inline const SVFVar* getCallSiteRet(const RetICFGNode* cs) const
+    inline const ValVar* getCallSiteRet(const RetICFGNode* cs) const
     {
         CSToRetMap::const_iterator it = callSiteRetMap.find(cs);
         assert(it != callSiteRetMap.end() && "this call site doesn't have return");
@@ -400,7 +410,7 @@ public:
         return funRetMap;
     }
     /// Get function return list
-    inline const SVFVar* getFunRet(const FunObjVar*  func) const
+    inline const ValVar* getFunRet(const FunObjVar*  func) const
     {
         FunToRetMap::const_iterator it = funRetMap.find(func);
         assert(it != funRetMap.end() && "this function doesn't have return");
@@ -595,25 +605,25 @@ private:
     /// Get/set method for function/callsite arguments and returns
     //@{
     /// Add function arguments
-    inline void addFunArgs(const FunObjVar* fun, const SVFVar* arg)
+    inline void addFunArgs(const FunObjVar* fun, const ValVar* arg)
     {
         FunEntryICFGNode* funEntryBlockNode = icfg->getFunEntryICFGNode(fun);
         addFunArgs(funEntryBlockNode, fun, arg);
     }
 
-    inline void addFunArgs(FunEntryICFGNode* funEntryBlockNode, const FunObjVar* fun, const SVFVar* arg)
+    inline void addFunArgs(FunEntryICFGNode* funEntryBlockNode, const FunObjVar* fun, const ValVar* arg)
     {
         funEntryBlockNode->addFormalParms(arg);
         funArgsListMap[fun].push_back(arg);
     }
     /// Add function returns
-    inline void addFunRet(const FunObjVar* fun, const SVFVar* ret)
+    inline void addFunRet(const FunObjVar* fun, const ValVar* ret)
     {
         FunExitICFGNode* funExitBlockNode = icfg->getFunExitICFGNode(fun);
         addFunRet(funExitBlockNode, fun, ret);
     }
 
-    inline void addFunRet(FunExitICFGNode* funExitBlockNode, const FunObjVar* fun, const SVFVar* ret)
+    inline void addFunRet(FunExitICFGNode* funExitBlockNode, const FunObjVar* fun, const ValVar* ret)
     {
         funExitBlockNode->addFormalRet(ret);
         funRetMap[fun] = ret;
@@ -625,7 +635,7 @@ private:
         callSiteArgsListMap[callBlockNode].push_back(arg);
     }
     /// Add callsite returns
-    inline void addCallSiteRets(RetICFGNode* retBlockNode,const SVFVar* arg)
+    inline void addCallSiteRets(RetICFGNode* retBlockNode,const ValVar* arg)
     {
         retBlockNode->addActualRet(arg);
         callSiteRetMap[retBlockNode]= arg;