svf-lib 1.0.2115 → 1.0.2116

package/SVF-osx/Release-build/include/Graphs/CDG.h

@@ -371,7 +371,7 @@ struct DOTGraphTraits<SVF::CDG *> : public DOTGraphTraits<SVF::PAG *>
             SVF::PAG::SVFStmtList &edges = SVF::PAG::getPAG()->getPTASVFStmtList(bNode);
             if (edges.empty())
             {
-                rawstr << bNode->getInst()->toString() << " \t";
+                rawstr << (bNode)->toString() << " \t";
             }
             else
             {

package/SVF-osx/Release-build/include/Graphs/CHG.h

@@ -61,7 +61,7 @@ public:
     virtual const VFunSet &getCSVFsBasedonCHA(const CallICFGNode* cs) = 0;
     virtual bool csHasVtblsBasedonCHA(const CallICFGNode* cs) = 0;
     virtual const VTableSet &getCSVtblsBasedonCHA(const CallICFGNode* cs) = 0;
-    virtual void getVFnsFromVtbls(const SVFCallInst* cs, const VTableSet& vtbls,
+    virtual void getVFnsFromVtbls(const CallICFGNode* cs, const VTableSet& vtbls,
                                   VFunSet& virtualFunctions) = 0;
 
     CHGKind getKind(void) const
@@ -240,9 +240,10 @@ public:
     typedef Set<const CHNode*> CHNodeSetTy;
     typedef FIFOWorkList<const CHNode*> WorkList;
     typedef Map<std::string, CHNodeSetTy> NameToCHNodesMap;
-    typedef Map<const SVFInstruction*, CHNodeSetTy> CallSiteToCHNodesMap;
-    typedef Map<const SVFInstruction*, VTableSet> CallSiteToVTableSetMap;
-    typedef Map<const SVFInstruction*, VFunSet> CallSiteToVFunSetMap;
+
+    typedef Map<const ICFGNode*, CHNodeSetTy> CallNodeToCHNodesMap;
+    typedef Map<const ICFGNode*, VTableSet> CallNodeToVTableSetMap;
+    typedef Map<const ICFGNode*, VFunSet> CallNodeToVFunSetMap;
 
     typedef enum
     {
@@ -260,7 +261,7 @@ public:
                  const std::string baseClassName,
                  CHEdge::CHEDGETYPE edgeType);
     CHNode *getNode(const std::string name) const;
-    void getVFnsFromVtbls(const SVFCallInst* cs, const VTableSet &vtbls, VFunSet &virtualFunctions) override;
+    void getVFnsFromVtbls(const CallICFGNode* cs, const VTableSet &vtbls, VFunSet &virtualFunctions) override;
     void dump(const std::string& filename);
     void view();
     void printCH();
@@ -325,11 +326,12 @@ private:
     NameToCHNodesMap classNameToAncestorsMap;
     NameToCHNodesMap classNameToInstAndDescsMap;
     NameToCHNodesMap templateNameToInstancesMap;
-    CallSiteToCHNodesMap csToClassesMap;
+    CallNodeToCHNodesMap callNodeToClassesMap;
 
     Map<const SVFFunction*, u32_t> virtualFunctionToIDMap;
-    CallSiteToVTableSetMap csToCHAVtblsMap;
-    CallSiteToVFunSetMap csToCHAVFnsMap;
+
+    CallNodeToVTableSetMap callNodeToCHAVtblsMap;
+    CallNodeToVFunSetMap callNodeToCHAVFnsMap;
 };
 
 } // End namespace SVF

package/SVF-osx/Release-build/include/Graphs/GenericGraph.h

@@ -251,7 +251,7 @@ public:
 
 
 
-    SVFBaseNode(NodeID i, GNodeK k): id(i), nodeKind(k)
+    SVFBaseNode(NodeID i, GNodeK k, SVFType* ty = nullptr): id(i),nodeKind(k), type(ty)
     {
 
     }
@@ -268,9 +268,30 @@ public:
         return nodeKind;
     }
 
+    virtual const SVFType* getType() const
+    {
+        return type;
+    }
+
+    inline virtual void setSourceLoc(const std::string& sourceCodeInfo)
+    {
+        sourceLoc = sourceCodeInfo;
+    }
+
+    virtual const std::string getSourceLoc() const
+    {
+        return sourceLoc;
+    }
+
+    virtual const std::string toString() const;
+
+
 protected:
     NodeID id;		///< Node ID
     GNodeK nodeKind;	///< Node kind
+    const SVFType* type; ///< SVF type
+
+    std::string sourceLoc;  ///< Source code information of this value
 
     /// Helper functions to check node kinds
     //{@ Check node kind

package/SVF-osx/Release-build/include/Graphs/ICFGNode.h

@@ -122,7 +122,7 @@ public:
 
     virtual const std::string toString() const;
 
-    virtual const std::string getSourceLoc() const = 0;
+
 
     void dump() const;
 
@@ -142,6 +142,8 @@ public:
         return isICFGNodeKinds(node->getNodeKind());
     }
 
+
+
 protected:
     const SVFFunction* fun;
     const SVFBasicBlock* bb;
@@ -179,9 +181,9 @@ public:
     }
     //@}
 
-    virtual const std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    const std::string getSourceLoc() const override
     {
         return "Global ICFGNode";
     }
@@ -195,21 +197,16 @@ class IntraICFGNode : public ICFGNode
     friend class SVFIRWriter;
     friend class SVFIRReader;
 private:
-    const SVFInstruction *inst;
+    bool isRet;
 
     /// Constructor to create empty IntraICFGNode (for SVFIRReader/deserialization)
-    IntraICFGNode(NodeID id) : ICFGNode(id, IntraBlock), inst(nullptr) {}
+    IntraICFGNode(NodeID id) : ICFGNode(id, IntraBlock), isRet(false) {}
 
 public:
-    IntraICFGNode(NodeID id, const SVFInstruction *i) : ICFGNode(id, IntraBlock), inst(i)
+    IntraICFGNode(NodeID id, const SVFBasicBlock* b, bool isReturn) : ICFGNode(id, IntraBlock), isRet(isReturn)
     {
-        fun = inst->getFunction();
-        bb = inst->getParent();
-    }
-
-    inline const SVFInstruction *getInst() const
-    {
-        return inst;
+        fun = b->getFunction();
+        bb = b;
     }
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -230,11 +227,11 @@ public:
     }
     //@}
 
-    const std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    inline bool isRetInst() const
     {
-        return inst->getSourceLoc();
+        return isRet;
     }
 };
 
@@ -270,7 +267,6 @@ public:
     }
 
     //@}
-    virtual const std::string getSourceLoc() const = 0;
 };
 
 
@@ -296,7 +292,7 @@ public:
     FunEntryICFGNode(NodeID id, const SVFFunction* f);
 
     /// Return function
-    inline const SVFFunction* getFun() const
+    inline const SVFFunction* getFun() const override
     {
         return fun;
     }
@@ -341,9 +337,9 @@ public:
     }
     //@}
 
-    const virtual std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    const std::string getSourceLoc() const override
     {
         return "function entry: " + fun->getSourceLoc();
     }
@@ -367,7 +363,7 @@ public:
     FunExitICFGNode(NodeID id, const SVFFunction* f);
 
     /// Return function
-    inline const SVFFunction* getFun() const
+    inline const SVFFunction* getFun() const override
     {
         return fun;
     }
@@ -412,9 +408,9 @@ public:
     }
     //@}
 
-    virtual const std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    const std::string getSourceLoc() const override
     {
         return "function ret: " + fun->getSourceLoc();
     }
@@ -430,7 +426,8 @@ class CallICFGNode : public InterICFGNode
 
 public:
     typedef std::vector<const SVFVar *> ActualParmNodeVec;
-private:
+
+protected:
     const SVFInstruction* cs;
     const RetICFGNode* ret;
     ActualParmNodeVec APNodes;
@@ -439,17 +436,12 @@ private:
     CallICFGNode(NodeID id) : InterICFGNode(id, FunCallBlock), cs{}, ret{} {}
 
 public:
-    CallICFGNode(NodeID id, const SVFInstruction* c)
+    CallICFGNode(NodeID id, const SVFInstruction* c, const SVFType* ty)
         : InterICFGNode(id, FunCallBlock), cs(c), ret(nullptr)
     {
         fun = cs->getFunction();
         bb = cs->getParent();
-    }
-
-    /// Return callsite
-    inline const SVFInstruction* getCallSite() const
-    {
-        return cs;
+        type = ty;
     }
 
     /// Return callsite
@@ -468,13 +460,13 @@ public:
     /// Return callsite
     inline const SVFFunction* getCaller() const
     {
-        return cs->getFunction();
+        return getFun();
     }
 
     /// Return Basic Block
     inline const SVFBasicBlock* getParent() const
     {
-        return cs->getParent();
+        return getBB();
     }
 
     /// Return true if this is an indirect call
@@ -496,35 +488,23 @@ public:
     }
     /// Parameter operations
     //@{
-    const SVFValue* getArgument(u32_t ArgNo) const
-    {
-        return SVFUtil::cast<SVFCallInst>(cs)->getArgOperand(ArgNo);
-    }
-
-    const SVFVar* getArgumentVar(u32_t ArgNo) const
+    const SVFVar* getArgument(u32_t ArgNo) const
     {
         return getActualParms()[ArgNo];
     }
 
-    const SVFType* getType() const
-    {
-        return SVFUtil::cast<SVFCallInst>(cs)->getType();
-    }
     u32_t arg_size() const
     {
-        return SVFUtil::cast<SVFCallInst>(cs)->arg_size();
+        return APNodes.size();
     }
     bool arg_empty() const
     {
-        return SVFUtil::cast<SVFCallInst>(cs)->arg_empty();
-    }
-    const SVFValue* getArgOperand(u32_t i) const
-    {
-        return SVFUtil::cast<SVFCallInst>(cs)->getArgOperand(i);
+        return APNodes.empty();
     }
+
     u32_t getNumArgOperands() const
     {
-        return SVFUtil::cast<SVFCallInst>(cs)->arg_size();
+        return arg_size();
     }
     const SVFFunction* getCalledFunction() const
     {
@@ -587,11 +567,11 @@ public:
     }
     //@}
 
-    virtual const std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    const std::string getSourceLoc() const override
     {
-        return "CallICFGNode: " + cs->getSourceLoc();
+        return "CallICFGNode: " + ICFGNode::getSourceLoc();
     }
 };
 
@@ -621,12 +601,7 @@ public:
     {
         fun = cs->getFunction();
         bb = cs->getParent();
-    }
-
-    /// Return callsite
-    inline const SVFInstruction* getCallSite() const
-    {
-        return cs;
+        type = callBlockNode->getType();
     }
 
     inline const CallICFGNode* getCallICFGNode() const
@@ -672,11 +647,11 @@ public:
     }
     //@}
 
-    virtual const std::string toString() const;
+    const std::string toString() const override;
 
-    virtual const std::string getSourceLoc() const
+    const std::string getSourceLoc() const override
     {
-        return "RetICFGNode: " + cs->getSourceLoc();
+        return "RetICFGNode: " + ICFGNode::getSourceLoc();
     }
 };
 

package/SVF-osx/Release-build/include/MSSA/MSSAMuChi.h

@@ -246,7 +246,7 @@ public:
     /// Return basic block
     inline const SVFBasicBlock* getBasicBlock() const
     {
-        return callsite->getCallSite()->getParent();
+        return callsite->getBB();
     }
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -537,7 +537,7 @@ public:
     /// Return basic block
     inline const SVFBasicBlock* getBasicBlock() const
     {
-        return callsite->getCallSite()->getParent();
+        return callsite->getBB();
     }
 
     /// Return callsite

package/SVF-osx/Release-build/include/MTA/LockAnalysis.h

@@ -349,7 +349,7 @@ private:
     bool isAliasedLocks(const ICFGNode* i1, const ICFGNode* i2)
     {
         /// todo: must alias
-        return tct->getPTA()->alias(getLockVal(i1), getLockVal(i2));
+        return tct->getPTA()->alias(getLockVal(i1)->getId(), getLockVal(i2)->getId());
     }
 
     /// Mark thread flags for cxtStmt
@@ -466,7 +466,7 @@ private:
         return tct->isExtCall(inst);
     }
     /// Get lock value
-    inline const SVFValue* getLockVal(const ICFGNode* call)
+    inline const SVFVar* getLockVal(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getLockVal(call);
     }

package/SVF-osx/Release-build/include/MTA/MHP.h

@@ -381,7 +381,7 @@ private:
     /// Whether it is a matched fork join pair
     bool isAliasedForkJoin(const CallICFGNode* forkSite, const CallICFGNode* joinSite)
     {
-        return tct->getPTA()->alias(getForkedThread(forkSite), getJoinedThread(joinSite)) && isSameSCEV(forkSite,joinSite);
+        return tct->getPTA()->alias(getForkedThread(forkSite)->getId(), getJoinedThread(joinSite)->getId()) && isSameSCEV(forkSite,joinSite);
     }
     /// Mark thread flags for cxtStmt
     //@{
@@ -473,12 +473,12 @@ private:
         return join && getTCG()->getThreadAPI()->isTDJoin(join);
     }
     /// Get forked thread
-    inline const SVFValue* getForkedThread(const CallICFGNode* call)
+    inline const SVFVar* getForkedThread(const CallICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getForkedThread(call);
     }
     /// Get joined thread
-    inline const SVFValue* getJoinedThread(const CallICFGNode* call)
+    inline const SVFVar* getJoinedThread(const CallICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getJoinedThread(call);
     }

package/SVF-osx/Release-build/include/SVF-LLVM/CHGBuilder.h

@@ -33,6 +33,8 @@
 namespace SVF
 {
 
+class LLVMModuleSet;
+
 class CHGBuilder
 {
 
@@ -67,6 +69,9 @@ public:
     void buildCSToCHAVtblsAndVfnsMap();
     const CHNodeSetTy& getCSClasses(const CallBase* cs);
     void addFuncToFuncVector(CHNode::FuncVector &v, const Function *f);
+
+private:
+    LLVMModuleSet* llvmModuleSet();
 };
 
 } // End namespace SVF

package/SVF-osx/Release-build/include/SVF-LLVM/DCHG.h

@@ -93,7 +93,7 @@ public:
 
     ~DCHNode() { }
 
-    const DIType *getType(void) const
+    const DIType * getDIType(void) const
     {
         return diType;
     }
@@ -275,7 +275,7 @@ public:
     }
 
     virtual const VTableSet &getCSVtblsBasedonCHA(const CallICFGNode* cs) override;
-    virtual void getVFnsFromVtbls(const SVFCallInst* cs, const VTableSet &vtbls, VFunSet &virtualFunctions) override;
+    virtual void getVFnsFromVtbls(const CallICFGNode* cs, const VTableSet &vtbls, VFunSet &virtualFunctions) override;
 
     /// Returns true if a is a transitive base of b. firstField determines
     /// whether to consider first-field edges.

package/SVF-osx/Release-build/include/SVF-LLVM/LLVMModule.h

@@ -60,6 +60,7 @@ public:
     typedef Map<const Constant*, SVFConstant*> LLVMConst2SVFConstMap;
     typedef Map<const Value*, SVFOtherValue*> LLVMValue2SVFOtherValueMap;
     typedef Map<const SVFValue*, const Value*> SVFValue2LLVMValueMap;
+    typedef Map<const SVFBaseNode*, const Value*> SVFBaseNode2LLVMValueMap;
     typedef Map<const Type*, SVFType*> LLVMType2SVFTypeMap;
     typedef Map<const Type*, StInfo*> Type2TypeInfoMap;
     typedef Map<std::string, std::vector<std::string>> Fun2AnnoMap;
@@ -97,6 +98,7 @@ private:
     Type2TypeInfoMap Type2TypeInfo;
     ObjTypeInference* typeInference;
 
+    SVFBaseNode2LLVMValueMap SVFBaseNode2LLVMValue;
     CSToCallNodeMapTy CSToCallNodeMap; ///< map a callsite to its CallICFGNode
     CSToRetNodeMapTy CSToRetNodeMap; ///< map a callsite to its RetICFGNode
     InstToBlockNodeMapTy InstToBlockNodeMap; ///< map a basic block to its ICFGNode
@@ -216,6 +218,13 @@ public:
         return it->second;
     }
 
+    const Value* getLLVMValue(const SVFBaseNode* value) const
+    {
+        SVFBaseNode2LLVMValueMap ::const_iterator it = SVFBaseNode2LLVMValue.find(value);
+        assert(it!=SVFBaseNode2LLVMValue.end() && "can't find corresponding llvm value!");
+        return it->second;
+    }
+
     inline SVFFunction* getSVFFunction(const Function* fun) const
     {
         LLVMFun2SVFFunMap::const_iterator it = LLVMFunc2SVFFunc.find(fun);
@@ -378,6 +387,7 @@ private:
     void initSVFBasicBlock(const Function* func);
     void initDomTree(SVFFunction* func, const Function* f);
     void setValueAttr(const Value* val, SVFValue* value);
+    void setValueAttr(const Value* val, SVFBaseNode* svfBaseNode);
     void buildFunToFunMap();
     void buildGlobalDefToRepMap();
     /// Invoke llvm passes to modify module

package/SVF-osx/Release-build/include/Util/SVFUtil.h

@@ -184,13 +184,6 @@ bool isCallSite(const ICFGNode* inst);
 
 bool isRetInstNode(const ICFGNode* node);
 
-/// Whether an instruction is a callsite in the application code, excluding llvm intrinsic calls
-inline bool isNonInstricCallSite(const SVFInstruction* inst)
-{
-    if(isIntrinsicInst(inst))
-        return false;
-    return isCallSite(inst);
-}
 
 /// Whether an instruction is a callsite in the application code, excluding llvm intrinsic calls
 inline bool isNonInstricCallSite(const ICFGNode* inst)
@@ -378,7 +371,7 @@ inline bool isArgOfUncalledFunction(const SVFValue* svfval)
 
 /// Return thread fork function
 //@{
-inline const SVFValue* getForkedFun(const CallICFGNode *inst)
+inline const SVFVar* getForkedFun(const CallICFGNode *inst)
 {
     return ThreadAPI::getThreadAPI()->getForkedFun(inst);
 }

package/SVF-osx/Release-build/include/Util/ThreadAPI.h

@@ -124,12 +124,12 @@ public:
     //@{
     /// Return the first argument of the call,
     /// Note that, it is the pthread_t pointer
-    const SVFValue* getForkedThread(const CallICFGNode *inst) const;
+    const SVFVar* getForkedThread(const CallICFGNode *inst) const;
     /// Return the third argument of the call,
     /// Note that, it could be function type or a void* pointer
-    const SVFValue* getForkedFun(const CallICFGNode *inst) const;
+    const SVFVar* getForkedFun(const CallICFGNode *inst) const;
 
-    /// Return the actual param of forksite
+    /// Return the forth argument of the call,
     /// Note that, it is the sole argument of start routine ( a void* pointer )
     const SVFVar* getActualParmAtForkSite(const CallICFGNode *inst) const;
 
@@ -153,10 +153,10 @@ public:
     //@{
     /// Return the first argument of the call,
     /// Note that, it is the pthread_t pointer
-    const SVFValue* getJoinedThread(const CallICFGNode *inst) const;
+    const SVFVar* getJoinedThread(const CallICFGNode *inst) const;
     /// Return the send argument of the call,
     /// Note that, it is the pthread_t pointer
-    const SVFValue* getRetParmAtJoinedSite(const CallICFGNode *inst) const;
+    const SVFVar* getRetParmAtJoinedSite(const CallICFGNode *inst) const;
     //@}
 
 
@@ -178,7 +178,7 @@ public:
     /// Return lock value
     //@{
     /// First argument of pthread_mutex_lock/pthread_mutex_unlock
-    const SVFValue* getLockVal(const ICFGNode *inst) const;
+    const SVFVar* getLockVal(const ICFGNode *inst) const;
     //@}
 
     /// Return true if this call waits for a barrier

package/package.json

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