svf-lib 1.0.955 → 1.0.958

package/SVF-linux/include/MemoryModel/SymbolTableInfo.h

@@ -32,6 +32,7 @@
 
 
 #include "Util/SVFUtil.h"
+#include "SVF-FE/LLVMUtil.h"
 #include "MemoryModel/LocationSet.h"
 #include "Util/SVFModule.h"
 namespace SVF
@@ -163,8 +164,6 @@ public:
     // @{
     static bool isNullPtrSym(const Value *val);
 
-    static bool isBlackholeSym(const Value *val);
-
     bool isConstantObjSym(const Value *val);
 
     static inline bool isBlkPtr(NodeID id)
@@ -232,7 +231,7 @@ public:
 
         if(isNullPtrSym(val))
             return nullPtrSymID();
-        else if(isBlackholeSym(val))
+        else if (SVFUtil::isBlackholeSym(val))
             return blkPtrSymID();
         else
         {
@@ -244,7 +243,7 @@ public:
 
     inline bool hasValSym(const Value* val)
     {
-        if (isNullPtrSym(val) || isBlackholeSym(val))
+        if (isNullPtrSym(val) || SVFUtil::isBlackholeSym(val))
             return true;
         else
             return (valSymMap.find(val) != valSymMap.end());

package/SVF-linux/include/SVF-FE/BasicTypes.h

@@ -27,10 +27,14 @@ typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantExpr ConstantExpr;
 
 // LLVM Instructions
+typedef llvm::AllocaInst AllocaInst;
 typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
 typedef llvm::AtomicRMWInst AtomicRMWInst;
 typedef llvm::BitCastInst BitCastInst;
+typedef llvm::BranchInst BranchInst;
+typedef llvm::SwitchInst SwitchInst;
 typedef llvm::CallBrInst CallBrInst;
+typedef llvm::ReturnInst ReturnInst;
 typedef llvm::CastInst CastInst;
 typedef llvm::CmpInst CmpInst;
 typedef llvm::ExtractValueInst  ExtractValueInst;
@@ -54,5 +58,6 @@ typedef llvm::VAEndInst VAEndInst;
 typedef llvm::VAStartInst VAStartInst;
 typedef llvm::BinaryOperator BinaryOperator;
 typedef llvm::UnaryOperator UnaryOperator;
+typedef llvm::UndefValue UndefValue;
 
 #endif  // SVF_FE_BASIC_TYPES_H

package/SVF-linux/include/SVF-FE/LLVMUtil.h

@@ -59,6 +59,13 @@ inline const Function* getLLVMFunction(const Value* val)
 }
 
 
+/// Check whether this value is a black hole
+inline bool isBlackholeSym(const Value *val)
+{
+    return (SVFUtil::isa<UndefValue>(val));
+}
+
+
 /// Return true if the call is an external call (external library in function summary table)
 /// If the libary function is redefined in the application code (e.g., memcpy), it will return false and will not be treated as an external call.
 //@{
@@ -78,6 +85,12 @@ inline bool isExtCall(const Instruction *inst)
 }
 //@}
 
+/// Whether an instruction is a return instruction
+inline bool isReturn(const Instruction* inst)
+{
+    return SVFUtil::isa<ReturnInst>(inst);
+}
+
 /// Return true if the call is a heap allocator/reallocator
 //@{
 /// note that these two functions are not suppose to be used externally

package/SVF-linux/include/Util/BasicTypes.h

@@ -123,14 +123,9 @@ typedef llvm::MDNode MDNode;
 
 
 /// LLVM Instructions
-typedef llvm::AllocaInst AllocaInst;
 typedef llvm::CallInst CallInst;
 typedef llvm::StoreInst StoreInst;
 typedef llvm::LoadInst LoadInst;
-typedef llvm::ReturnInst ReturnInst;
-typedef llvm::BranchInst BranchInst;
-typedef llvm::SwitchInst SwitchInst;
-typedef llvm::UndefValue UndefValue;
 
 #if (LLVM_VERSION_MAJOR >= 9)
 typedef llvm::FunctionCallee FunctionCallee;

package/SVF-linux/include/Util/SVFUtil.h

@@ -209,11 +209,6 @@ inline bool isNonInstricCallSite(const Instruction* inst)
         return false;
     return isCallSite(inst);
 }
-/// Whether an instruction is a return instruction
-inline bool isReturn(const Instruction* inst)
-{
-    return SVFUtil::isa<ReturnInst>(inst);
-}
 
 /// Return LLVM callsite given a instruction
 inline CallSite getLLVMCallSite(const Instruction* inst)

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

@@ -32,6 +32,7 @@
 
 
 #include "Util/SVFUtil.h"
+#include "SVF-FE/LLVMUtil.h"
 #include "MemoryModel/LocationSet.h"
 #include "Util/SVFModule.h"
 namespace SVF
@@ -163,8 +164,6 @@ public:
     // @{
     static bool isNullPtrSym(const Value *val);
 
-    static bool isBlackholeSym(const Value *val);
-
     bool isConstantObjSym(const Value *val);
 
     static inline bool isBlkPtr(NodeID id)
@@ -232,7 +231,7 @@ public:
 
         if(isNullPtrSym(val))
             return nullPtrSymID();
-        else if(isBlackholeSym(val))
+        else if (SVFUtil::isBlackholeSym(val))
             return blkPtrSymID();
         else
         {
@@ -244,7 +243,7 @@ public:
 
     inline bool hasValSym(const Value* val)
     {
-        if (isNullPtrSym(val) || isBlackholeSym(val))
+        if (isNullPtrSym(val) || SVFUtil::isBlackholeSym(val))
             return true;
         else
             return (valSymMap.find(val) != valSymMap.end());

package/SVF-osx/include/SVF-FE/BasicTypes.h

@@ -27,10 +27,14 @@ typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantExpr ConstantExpr;
 
 // LLVM Instructions
+typedef llvm::AllocaInst AllocaInst;
 typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
 typedef llvm::AtomicRMWInst AtomicRMWInst;
 typedef llvm::BitCastInst BitCastInst;
+typedef llvm::BranchInst BranchInst;
+typedef llvm::SwitchInst SwitchInst;
 typedef llvm::CallBrInst CallBrInst;
+typedef llvm::ReturnInst ReturnInst;
 typedef llvm::CastInst CastInst;
 typedef llvm::CmpInst CmpInst;
 typedef llvm::ExtractValueInst  ExtractValueInst;
@@ -54,5 +58,6 @@ typedef llvm::VAEndInst VAEndInst;
 typedef llvm::VAStartInst VAStartInst;
 typedef llvm::BinaryOperator BinaryOperator;
 typedef llvm::UnaryOperator UnaryOperator;
+typedef llvm::UndefValue UndefValue;
 
 #endif  // SVF_FE_BASIC_TYPES_H

package/SVF-osx/include/SVF-FE/LLVMUtil.h

@@ -59,6 +59,13 @@ inline const Function* getLLVMFunction(const Value* val)
 }
 
 
+/// Check whether this value is a black hole
+inline bool isBlackholeSym(const Value *val)
+{
+    return (SVFUtil::isa<UndefValue>(val));
+}
+
+
 /// Return true if the call is an external call (external library in function summary table)
 /// If the libary function is redefined in the application code (e.g., memcpy), it will return false and will not be treated as an external call.
 //@{
@@ -78,6 +85,12 @@ inline bool isExtCall(const Instruction *inst)
 }
 //@}
 
+/// Whether an instruction is a return instruction
+inline bool isReturn(const Instruction* inst)
+{
+    return SVFUtil::isa<ReturnInst>(inst);
+}
+
 /// Return true if the call is a heap allocator/reallocator
 //@{
 /// note that these two functions are not suppose to be used externally

package/SVF-osx/include/Util/BasicTypes.h

@@ -123,14 +123,9 @@ typedef llvm::MDNode MDNode;
 
 
 /// LLVM Instructions
-typedef llvm::AllocaInst AllocaInst;
 typedef llvm::CallInst CallInst;
 typedef llvm::StoreInst StoreInst;
 typedef llvm::LoadInst LoadInst;
-typedef llvm::ReturnInst ReturnInst;
-typedef llvm::BranchInst BranchInst;
-typedef llvm::SwitchInst SwitchInst;
-typedef llvm::UndefValue UndefValue;
 
 #if (LLVM_VERSION_MAJOR >= 9)
 typedef llvm::FunctionCallee FunctionCallee;

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

@@ -209,11 +209,6 @@ inline bool isNonInstricCallSite(const Instruction* inst)
         return false;
     return isCallSite(inst);
 }
-/// Whether an instruction is a return instruction
-inline bool isReturn(const Instruction* inst)
-{
-    return SVFUtil::isa<ReturnInst>(inst);
-}
 
 /// Return LLVM callsite given a instruction
 inline CallSite getLLVMCallSite(const Instruction* inst)

package/package.json

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