svf-lib 1.0.2157 → 1.0.2158

package/SVF-linux/Release-build/include/SVF-LLVM/ICFGBuilder.h

@@ -58,44 +58,17 @@ private:
 public:
     typedef FIFOWorkList<const Instruction*> WorkList;
 
-    ICFGBuilder(): icfg(new ICFG())
-    {
+    ICFGBuilder() = default;
 
-    }
     ICFG* build();
 
 private:
 
-    LLVMModuleSet* llvmModuleSet()
+    inline LLVMModuleSet* llvmModuleSet()
     {
         return LLVMModuleSet::getLLVMModuleSet();
     }
 
-    CSToRetNodeMapTy& csToRetNodeMap()
-    {
-        return llvmModuleSet()->CSToRetNodeMap;
-    }
-
-    CSToCallNodeMapTy& csToCallNodeMap()
-    {
-        return llvmModuleSet()->CSToCallNodeMap;
-    }
-
-    InstToBlockNodeMapTy& instToBlockNodeMap()
-    {
-        return llvmModuleSet()->InstToBlockNodeMap;
-    }
-
-    FunToFunEntryNodeMapTy& funToFunEntryNodeMap()
-    {
-        return llvmModuleSet()->FunToFunEntryNodeMap;
-    }
-
-    FunToFunExitNodeMapTy& funToFunExitNodeMap()
-    {
-        return llvmModuleSet()->FunToFunExitNodeMap;
-    }
-
 private:
 
     /// Create edges between ICFG nodes within a function

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

@@ -172,7 +172,8 @@ public:
         LLVMFunc2SVFFunc[func] = svfFunc;
         setValueAttr(func,svfFunc);
     }
-    void addFunctionMap(const Function* func, CallGraphNode* cgNode);
+
+    void addFunctionMap(const Function* func, CallGraphNode* svfFunc);
 
     inline void addBasicBlockMap(const BasicBlock* bb, SVFBasicBlock* svfBB)
     {
@@ -184,6 +185,22 @@ public:
         LLVMInst2SVFInst[inst] = svfInst;
         setValueAttr(inst,svfInst);
     }
+    inline void addInstructionMap(const Instruction* inst, CallICFGNode* svfInst)
+    {
+        CSToCallNodeMap[inst] = svfInst;
+        setValueAttr(inst,svfInst);
+    }
+    inline void addInstructionMap(const Instruction* inst, RetICFGNode* svfInst)
+    {
+        CSToRetNodeMap[inst] = svfInst;
+        setValueAttr(inst,svfInst);
+    }
+    inline void addInstructionMap(const Instruction* inst, IntraICFGNode* svfInst)
+    {
+        InstToBlockNodeMap[inst] = svfInst;
+        setValueAttr(inst,svfInst);
+    }
+
     inline void addArgumentMap(const Argument* arg, SVFArgument* svfArg)
     {
         LLVMArgument2SVFArgument[arg] = svfArg;
@@ -231,17 +248,17 @@ public:
         return it->second;
     }
 
-    inline SVFFunction* getSVFFunction(const Function* fun) const
+    inline CallGraphNode* getCallGraphNode(const Function* fun) const
     {
-        LLVMFun2SVFFunMap::const_iterator it = LLVMFunc2SVFFunc.find(fun);
-        assert(it!=LLVMFunc2SVFFunc.end() && "SVF Function not found!");
+        LLVMFun2CallGraphNodeMap::const_iterator it = LLVMFunc2CallGraphNode.find(fun);
+        assert(it!=LLVMFunc2CallGraphNode.end() && "SVF Function not found!");
         return it->second;
     }
 
-    inline CallGraphNode* getCallGraphNode(const Function* fun) const
+    inline SVFFunction* getSVFFunction(const Function* fun) const
     {
-        LLVMFun2CallGraphNodeMap::const_iterator it = LLVMFunc2CallGraphNode.find(fun);
-        assert(it!=LLVMFunc2CallGraphNode.end() && "CallGraph Node not found!");
+        LLVMFun2SVFFunMap::const_iterator it = LLVMFunc2SVFFunc.find(fun);
+        assert(it!=LLVMFunc2SVFFunc.end() && "SVF Function not found!");
         return it->second;
     }
 

package/SVF-linux/Release-build/include/SVFIR/SVFFileSystem.h

@@ -116,7 +116,6 @@ class SVFFunction;
 class SVFBasicBlock;
 class SVFInstruction;
 class SVFCallInst;
-class SVFVirtualCallInst;
 class SVFConstant;
 class SVFGlobalValue;
 class SVFArgument;
@@ -516,7 +515,6 @@ private:
     cJSON* contentToJson(const SVFBasicBlock* value);
     cJSON* contentToJson(const SVFInstruction* value);
     cJSON* contentToJson(const SVFCallInst* value);
-    cJSON* contentToJson(const SVFVirtualCallInst* value);
     cJSON* contentToJson(const SVFConstant* value);
     cJSON* contentToJson(const SVFGlobalValue* value);
     cJSON* contentToJson(const SVFArgument* value);
@@ -1290,7 +1288,6 @@ private:
     void fill(const cJSON*& fieldJson, SVFBasicBlock* value);
     void fill(const cJSON*& fieldJson, SVFInstruction* value);
     void fill(const cJSON*& fieldJson, SVFCallInst* value);
-    void fill(const cJSON*& fieldJson, SVFVirtualCallInst* value);
     void fill(const cJSON*& fieldJson, SVFConstant* value);
     void fill(const cJSON*& fieldJson, SVFGlobalValue* value);
     void fill(const cJSON*& fieldJson, SVFArgument* value);

package/SVF-linux/Release-build/include/SVFIR/SVFValue.h

@@ -746,66 +746,6 @@ public:
     }
 };
 
-class SVFVirtualCallInst : public SVFCallInst
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-    friend class LLVMModuleSet;
-
-private:
-    const SVFValue* vCallVtblPtr;   /// 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
-
-protected:
-    inline void setFunIdxInVtable(s32_t idx)
-    {
-        virtualFunIdx = idx;
-    }
-    inline void setFunNameOfVirtualCall(const std::string& name)
-    {
-        funNameOfVcall = name;
-    }
-    inline void setVtablePtr(const SVFValue* vptr)
-    {
-        vCallVtblPtr = vptr;
-    }
-
-public:
-    SVFVirtualCallInst(const SVFType* ty, const SVFBasicBlock* b, bool vararg,
-                       bool tm)
-        : SVFCallInst(ty, b, vararg, tm, SVFVCall), vCallVtblPtr(nullptr),
-          virtualFunIdx(-1), funNameOfVcall()
-    {
-    }
-    inline const SVFValue* getVtablePtr() const
-    {
-        assert(vCallVtblPtr && "virtual call does not have a vtblptr? set it first");
-        return vCallVtblPtr;
-    }
-    inline s32_t getFunIdxInVtable() const
-    {
-        assert(virtualFunIdx >=0 && "virtual function idx is less than 0? not set yet?");
-        return virtualFunIdx;
-    }
-    inline const std::string& getFunNameOfVirtualCall() const
-    {
-        return funNameOfVcall;
-    }
-    static inline bool classof(const SVFValue *node)
-    {
-        return node->getKind() == SVFVCall;
-    }
-    static inline bool classof(const SVFInstruction *node)
-    {
-        return node->getKind() == SVFVCall;
-    }
-    static inline bool classof(const SVFCallInst *node)
-    {
-        return node->getKind() == SVFVCall;
-    }
-};
-
 class SVFConstant : public SVFValue
 {
     friend class SVFIRWriter;

package/package.json

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