svf-lib 1.0.2232 → 1.0.2234

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

@@ -57,7 +57,7 @@ public:
     typedef Map<const Function*, SVFFunction*> LLVMFun2SVFFunMap;
     typedef Map<const Function*, FunObjVar*> LLVMFun2FunObjVarMap;
     typedef Map<const BasicBlock*, SVFBasicBlock*> LLVMBB2SVFBBMap;
-    typedef Map<const Instruction*, SVFInstruction*> LLVMInst2SVFInstMap;
+    typedef Map<const Instruction*, SVFLLVMValue*> LLVMInst2SVFInstMap;
     typedef Map<const Argument*, SVFLLVMValue*> LLVMArgument2SVFArgumentMap;
     typedef Map<const Constant*, SVFLLVMValue*> LLVMConst2SVFConstMap;
     typedef Map<const Value*, SVFLLVMValue*> LLVMValue2SVFOtherValueMap;
@@ -233,7 +233,7 @@ public:
         SVFBaseNode2LLVMValue[svfBB] = bb;
     }
 
-    inline void addInstructionMap(const Instruction* inst, SVFInstruction* svfInst)
+    inline void addInstructionMap(const Instruction* inst, SVFLLVMValue* svfInst)
     {
         LLVMInst2SVFInst[inst] = svfInst;
         setValueAttr(inst,svfInst);
@@ -346,7 +346,7 @@ public:
         return it->second;
     }
 
-    inline SVFInstruction* getSVFInstruction(const Instruction* inst) const
+    inline SVFLLVMValue* getSVFInstruction(const Instruction* inst) const
     {
         LLVMInst2SVFInstMap::const_iterator it = LLVMInst2SVFInst.find(inst);
         assert(it!=LLVMInst2SVFInst.end() && "SVF Instruction not found!");

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

@@ -454,9 +454,9 @@ protected:
     inline void addStoreEdge(NodeID src, NodeID dst)
     {
         ICFGNode* node;
-        if (const SVFInstruction* inst = SVFUtil::dyn_cast<SVFInstruction>(curVal))
+        if (const Instruction* inst = SVFUtil::dyn_cast<Instruction>(llvmModuleSet()->getLLVMValue(curVal)))
             node = llvmModuleSet()->getICFGNode(
-                       SVFUtil::cast<Instruction>(llvmModuleSet()->getLLVMValue(inst)));
+                       SVFUtil::cast<Instruction>(inst));
         else
             node = nullptr;
         if (StoreStmt* edge = pag->addStoreStmt(src, dst, node))

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

@@ -63,7 +63,6 @@ public:
     {
         SVFVal,
         SVFFunc,
-        SVFInst,
     };
 
 private:
@@ -375,47 +374,6 @@ public:
     }
 };
 
-class ICFGNode;
-class FunObjVar;
-
-class SVFInstruction : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    const SVFBasicBlock* bb;    /// The BasicBlock where this Instruction resides
-    bool terminator;    /// return true if this is a terminator instruction
-    bool ret;           /// return true if this is an return instruction of a function
-
-public:
-    /// Constructor without name, set name with setName()
-    SVFInstruction(const SVFType* ty, const SVFBasicBlock* b, bool tm,
-                   bool isRet, SVFValKind k = SVFInst);
-    SVFInstruction(void) = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFInst;
-    }
-
-    inline const SVFBasicBlock* getParent() const
-    {
-        return bb;
-    }
-
-    inline const FunObjVar* getFunction() const
-    {
-        return bb->getParent();
-    }
-
-    inline bool isRetInst() const
-    {
-        return ret;
-    }
-};
-
-
 /// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
 /// Converts an SVFValue to corresponding LLVM::Value, then get the string
 /// representation of it. Use it only when you are debugging. Don't use

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

@@ -57,7 +57,7 @@ public:
     typedef Map<const Function*, SVFFunction*> LLVMFun2SVFFunMap;
     typedef Map<const Function*, FunObjVar*> LLVMFun2FunObjVarMap;
     typedef Map<const BasicBlock*, SVFBasicBlock*> LLVMBB2SVFBBMap;
-    typedef Map<const Instruction*, SVFInstruction*> LLVMInst2SVFInstMap;
+    typedef Map<const Instruction*, SVFLLVMValue*> LLVMInst2SVFInstMap;
     typedef Map<const Argument*, SVFLLVMValue*> LLVMArgument2SVFArgumentMap;
     typedef Map<const Constant*, SVFLLVMValue*> LLVMConst2SVFConstMap;
     typedef Map<const Value*, SVFLLVMValue*> LLVMValue2SVFOtherValueMap;
@@ -233,7 +233,7 @@ public:
         SVFBaseNode2LLVMValue[svfBB] = bb;
     }
 
-    inline void addInstructionMap(const Instruction* inst, SVFInstruction* svfInst)
+    inline void addInstructionMap(const Instruction* inst, SVFLLVMValue* svfInst)
     {
         LLVMInst2SVFInst[inst] = svfInst;
         setValueAttr(inst,svfInst);
@@ -346,7 +346,7 @@ public:
         return it->second;
     }
 
-    inline SVFInstruction* getSVFInstruction(const Instruction* inst) const
+    inline SVFLLVMValue* getSVFInstruction(const Instruction* inst) const
     {
         LLVMInst2SVFInstMap::const_iterator it = LLVMInst2SVFInst.find(inst);
         assert(it!=LLVMInst2SVFInst.end() && "SVF Instruction not found!");

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

@@ -454,9 +454,9 @@ protected:
     inline void addStoreEdge(NodeID src, NodeID dst)
     {
         ICFGNode* node;
-        if (const SVFInstruction* inst = SVFUtil::dyn_cast<SVFInstruction>(curVal))
+        if (const Instruction* inst = SVFUtil::dyn_cast<Instruction>(llvmModuleSet()->getLLVMValue(curVal)))
             node = llvmModuleSet()->getICFGNode(
-                       SVFUtil::cast<Instruction>(llvmModuleSet()->getLLVMValue(inst)));
+                       SVFUtil::cast<Instruction>(inst));
         else
             node = nullptr;
         if (StoreStmt* edge = pag->addStoreStmt(src, dst, node))

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

@@ -63,7 +63,6 @@ public:
     {
         SVFVal,
         SVFFunc,
-        SVFInst,
     };
 
 private:
@@ -375,47 +374,6 @@ public:
     }
 };
 
-class ICFGNode;
-class FunObjVar;
-
-class SVFInstruction : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    const SVFBasicBlock* bb;    /// The BasicBlock where this Instruction resides
-    bool terminator;    /// return true if this is a terminator instruction
-    bool ret;           /// return true if this is an return instruction of a function
-
-public:
-    /// Constructor without name, set name with setName()
-    SVFInstruction(const SVFType* ty, const SVFBasicBlock* b, bool tm,
-                   bool isRet, SVFValKind k = SVFInst);
-    SVFInstruction(void) = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFInst;
-    }
-
-    inline const SVFBasicBlock* getParent() const
-    {
-        return bb;
-    }
-
-    inline const FunObjVar* getFunction() const
-    {
-        return bb->getParent();
-    }
-
-    inline bool isRetInst() const
-    {
-        return ret;
-    }
-};
-
-
 /// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
 /// Converts an SVFValue to corresponding LLVM::Value, then get the string
 /// representation of it. Use it only when you are debugging. Don't use

package/package.json

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