svf-lib 1.0.1036 → 1.0.1039

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

@@ -57,6 +57,7 @@ typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantExpr ConstantExpr;
 typedef llvm::ConstantDataArray ConstantDataArray;
 typedef llvm::ConstantData ConstantData;
+typedef llvm::ConstantArray ConstantArray;
 
 // LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;

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

@@ -5,7 +5,7 @@
 #include "Graphs/ICFG.h"
 #include "Graphs/ICFGNode.h"
 #include "Graphs/ICFGEdge.h"
-#include "SVF-FE/LLVMUtil.h"
+#include "Util/SVFUtil.h"
 
 namespace SVF
 {

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

@@ -45,19 +45,6 @@ namespace SVFUtil
 
 
 
-/// This function servers a allocation wrapper detector
-inline bool isAnAllocationWraper(const Instruction*)
-{
-    return false;
-}
-
-/// Return LLVM function if this value is
-inline const Function* getLLVMFunction(const Value* val)
-{
-    const Function *fun = SVFUtil::dyn_cast<Function>(val->stripPointerCasts());
-    return fun;
-}
-
 
 /// Check whether this value is a black hole
 inline bool isBlackholeSym(const Value *val)
@@ -65,24 +52,6 @@ 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.
-//@{
-inline bool isExtCall(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->is_ext(fun);
-}
-
-inline bool isExtCall(const CallSite cs)
-{
-    return isExtCall(getCallee(cs));
-}
-
-inline bool isExtCall(const Instruction *inst)
-{
-    return isExtCall(getCallee(inst));
-}
 //@}
 
 /// Whether an instruction is a return instruction
@@ -91,19 +60,6 @@ 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
-inline bool isHeapAllocExtFunViaRet(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_alloc(fun)
-                   || ExtAPI::getExtAPI()->is_realloc(fun));
-}
-inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
-}
-
 static inline Type *getPtrElementType(const PointerType* pty)
 {
 #if (LLVM_VERSION_MAJOR < 14)
@@ -114,139 +70,6 @@ static inline Type *getPtrElementType(const PointerType* pty)
 #endif
 }
 
-/// interfaces to be used externally
-inline bool isHeapAllocExtCallViaRet(const CallSite cs)
-{
-    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
-    return isPtrTy && isHeapAllocExtFunViaRet(getCallee(cs));
-}
-
-inline bool isHeapAllocExtCallViaRet(const Instruction *inst)
-{
-    bool isPtrTy = inst->getType()->isPointerTy();
-    return isPtrTy && isHeapAllocExtFunViaRet(getCallee(inst));
-}
-
-inline bool isHeapAllocExtCallViaArg(const CallSite cs)
-{
-    return isHeapAllocExtFunViaArg(getCallee(cs));
-}
-
-inline bool isHeapAllocExtCallViaArg(const Instruction *inst)
-{
-    return isHeapAllocExtFunViaArg(getCallee(inst));
-}
-
-inline bool isHeapAllocExtCall(const CallSite cs)
-{
-    return isHeapAllocExtCallViaRet(cs) || isHeapAllocExtCallViaArg(cs);
-}
-
-inline bool isHeapAllocExtCall(const Instruction *inst)
-{
-    return isHeapAllocExtCallViaRet(inst) || isHeapAllocExtCallViaArg(inst);
-}
-//@}
-
-/// Get the position of argument that holds an allocated heap object.
-//@{
-inline int getHeapAllocHoldingArgPosition(const SVFFunction* fun)
-{
-    return ExtAPI::getExtAPI()->get_alloc_arg_pos(fun);
-}
-
-inline int getHeapAllocHoldingArgPosition(const CallSite cs)
-{
-    return getHeapAllocHoldingArgPosition(getCallee(cs));
-}
-
-inline int getHeapAllocHoldingArgPosition(const Instruction *inst)
-{
-    return getHeapAllocHoldingArgPosition(getCallee(inst));
-}
-//@}
-
-/// Return true if the call is a heap reallocator
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isReallocExtFun(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_realloc(fun));
-}
-
-inline bool isReallocExtCall(const CallSite cs)
-{
-    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
-    return isPtrTy && isReallocExtFun(getCallee(cs));
-}
-
-inline bool isReallocExtCall(const Instruction *inst)
-{
-    bool isPtrTy = inst->getType()->isPointerTy();
-    return isPtrTy && isReallocExtFun(getCallee(inst));
-}
-//@}
-
-/// Return true if the call is a heap dealloc or not
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isDeallocExtFun(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_dealloc(fun));
-}
-
-inline bool isDeallocExtCall(const CallSite cs)
-{
-    return isDeallocExtFun(getCallee(cs));
-}
-
-inline bool isDeallocExtCall(const Instruction *inst)
-{
-    return isDeallocExtFun(getCallee(inst));
-}
-//@}
-
-
-/// Return true if the call is a static global call
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isStaticExtFun(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->has_static(fun);
-}
-
-inline bool isStaticExtCall(const CallSite cs)
-{
-    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
-    return isPtrTy && isStaticExtFun(getCallee(cs));
-}
-
-inline bool isStaticExtCall(const Instruction *inst)
-{
-    bool isPtrTy = inst->getType()->isPointerTy();
-    return isPtrTy && isStaticExtFun(getCallee(inst));
-}
-//@}
-
-/// Return true if the call is a static global call
-//@{
-inline bool isHeapAllocOrStaticExtCall(const CallSite cs)
-{
-    return isStaticExtCall(cs) || isHeapAllocExtCall(cs);
-}
-
-inline bool isHeapAllocOrStaticExtCall(const Instruction *inst)
-{
-    return isStaticExtCall(inst) || isHeapAllocExtCall(inst);
-}
-//@}
-
-/// Return external call type
-inline ExtAPI::extf_t extCallTy(const SVFFunction* fun)
-{
-    return ExtAPI::getExtAPI()->get_type(fun);
-}
-
 /// Get the reference type of heap/static object from an allocation site.
 //@{
 inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
@@ -278,150 +101,9 @@ inline const PointerType *getRefTypeOfHeapAllocOrStatic(const Instruction *inst)
 }
 //@}
 
-/// Return true if this is a thread creation call
-///@{
-inline bool isThreadForkCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDFork(cs);
-}
-inline bool isThreadForkCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDFork(inst);
-}
-//@}
-
-/// Return true if this is a hare_parallel_for call
-///@{
-inline bool isHareParForCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isHareParFor(cs);
-}
-inline bool isHareParForCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isHareParFor(inst);
-}
-//@}
-
-/// Return true if this is a thread join call
-///@{
-inline bool isThreadJoinCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDJoin(cs);
-}
-inline bool isThreadJoinCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDJoin(inst);
-}
-//@}
-
-/// Return true if this is a thread exit call
-///@{
-inline bool isThreadExitCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDExit(cs);
-}
-inline bool isThreadExitCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDExit(inst);
-}
-//@}
-
-/// Return true if this is a lock acquire call
-///@{
-inline bool isLockAquireCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDAcquire(cs);
-}
-inline bool isLockAquireCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDAcquire(inst);
-}
-//@}
-
-/// Return true if this is a lock acquire call
-///@{
-inline bool isLockReleaseCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDRelease(cs);
-}
-inline bool isLockReleaseCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDRelease(inst);
-}
-//@}
-
-/// Return true if this is a barrier wait call
-//@{
-inline bool isBarrierWaitCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isTDBarWait(cs);
-}
-inline bool isBarrierWaitCall(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isTDBarWait(inst);
-}
-//@}
-
-/// Return thread fork function
-//@{
-inline const Value* getForkedFun(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getForkedFun(cs);
-}
-inline const Value* getForkedFun(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getForkedFun(inst);
-}
-//@}
-
-/// Return sole argument of the thread routine
-//@{
-inline const Value* getActualParmAtForkSite(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(cs);
-}
-inline const Value* getActualParmAtForkSite(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(inst);
-}
-//@}
-
-/// Return the task function of the parallel_for routine
-//@{
-inline const Value* getTaskFuncAtHareParForSite(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(cs);
-}
-inline const Value* getTaskFuncAtHareParForSite(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(inst);
-}
-//@}
-
-/// Return the task data argument of the parallel_for rountine
-//@{
-inline const Value* getTaskDataAtHareParForSite(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(cs);
-}
-inline const Value* getTaskDataAtHareParForSite(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(inst);
-}
-//@}
-
 /// Return true if this value refers to a object
 bool isObject (const Value * ref);
 
-/// Return true if the value refers to constant data, e.g., i32 0
-inline bool isConstantData(const Value* val)
-{
-    return SVFUtil::isa<ConstantData>(val)
-           || SVFUtil::isa<ConstantAggregate>(val)
-           || SVFUtil::isa<MetadataAsValue>(val)
-           || SVFUtil::isa<BlockAddress>(val);
-}
-
 /// Method for dead function, which does not have any possible caller
 /// function address is not taken and never be used in call or invoke instruction
 //@{
@@ -436,43 +118,6 @@ inline bool ArgInDeadFunction (const Value * val)
 }
 //@}
 
-/// Program entry function e.g. main
-//@{
-/// Return true if this is a program entry function (e.g. main)
-inline bool isProgEntryFunction (const SVFFunction * fun)
-{
-    return fun && fun->getName() == "main";
-}
-
-inline bool isProgEntryFunction (const Function * fun)
-{
-    return fun && fun->getName() == "main";
-}
-
-/// Get program entry function from module.
-inline const SVFFunction* getProgFunction(SVFModule* svfModule, const std::string& funName)
-{
-    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
-    {
-        const SVFFunction *fun = *it;
-        if (fun->getName()==funName)
-            return fun;
-    }
-    return nullptr;
-}
-
-/// Get program entry function from module.
-inline const SVFFunction* getProgEntryFunction(SVFModule* svfModule)
-{
-    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
-    {
-        const SVFFunction *fun = *it;
-        if (isProgEntryFunction(fun))
-            return (fun);
-    }
-    return nullptr;
-}
-
 /// Return true if this is an argument of a program entry function (e.g. main)
 inline bool ArgInProgEntryFunction (const Value * val)
 {
@@ -483,24 +128,6 @@ inline bool ArgInProgEntryFunction (const Value * val)
 bool isPtrInDeadFunction (const Value * value);
 //@}
 
-/// Return true if this is a program exit function call
-//@{
-inline bool isProgExitFunction (const SVFFunction * fun)
-{
-    return fun && (fun->getName() == "exit" ||
-                   fun->getName() == "__assert_rtn" ||
-                   fun->getName() == "__assert_fail" );
-}
-
-inline bool isProgExitCall(const CallSite cs)
-{
-    return isProgExitFunction(getCallee(cs));
-}
-
-inline bool isProgExitCall(const Instruction *inst)
-{
-    return isProgExitFunction(getCallee(inst));
-}
 //@}
 
 /// Function does not have any possible caller in the call graph
@@ -677,7 +304,6 @@ u32_t getTypeSizeInBytes(const Type* type);
 u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
 //@}
 
-const std::string type2String(const Type* type);
 
 } // End namespace SVFUtil
 

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

@@ -94,7 +94,6 @@ typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
 typedef llvm::ConstantInt ConstantInt;
 typedef llvm::ConstantPointerNull ConstantPointerNull;
-typedef llvm::ConstantArray ConstantArray;
 typedef llvm::GlobalAlias GlobalAlias;
 
 /// LLVM metadata

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

@@ -352,6 +352,385 @@ bool startAnalysisLimitTimer(unsigned timeLimit);
 /// timer or not (return value of startLimitTimer).
 void stopAnalysisLimitTimer(bool limitTimerSet);
 
+/// 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.
+//@{
+inline bool isExtCall(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->is_ext(fun);
+}
+
+/// Return true if the call is a heap allocator/reallocator
+//@{
+/// note that these two functions are not suppose to be used externally
+inline bool isHeapAllocExtFunViaRet(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_alloc(fun)
+                   || ExtAPI::getExtAPI()->is_realloc(fun));
+}
+
+inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
+}
+
+/// Get the position of argument that holds an allocated heap object.
+//@{
+inline int getHeapAllocHoldingArgPosition(const SVFFunction* fun)
+{
+    return ExtAPI::getExtAPI()->get_alloc_arg_pos(fun);
+}
+
+/// Return true if the call is a heap reallocator
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isReallocExtFun(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_realloc(fun));
+}
+
+/// Return true if the call is a heap dealloc or not
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isDeallocExtFun(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_dealloc(fun));
+}
+
+/// Return true if the call is a static global call
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isStaticExtFun(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->has_static(fun);
+}
+
+/// Return external call type
+inline ExtAPI::extf_t extCallTy(const SVFFunction* fun)
+{
+    return ExtAPI::getExtAPI()->get_type(fun);
+}
+
+/// Program entry function e.g. main
+//@{
+/// Return true if this is a program entry function (e.g. main)
+inline bool isProgEntryFunction (const SVFFunction * fun)
+{
+    return fun && fun->getName() == "main";
+}
+
+
+/// Get program entry function from module.
+inline const SVFFunction* getProgFunction(SVFModule* svfModule, const std::string& funName)
+{
+    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
+    {
+        const SVFFunction *fun = *it;
+        if (fun->getName()==funName)
+            return fun;
+    }
+    return nullptr;
+}
+
+/// Get program entry function from module.
+inline const SVFFunction* getProgEntryFunction(SVFModule* svfModule)
+{
+    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
+    {
+        const SVFFunction *fun = *it;
+        if (isProgEntryFunction(fun))
+            return (fun);
+    }
+    return nullptr;
+}
+
+/// Return true if this is a program exit function call
+//@{
+inline bool isProgExitFunction (const SVFFunction * fun)
+{
+    return fun && (fun->getName() == "exit" ||
+                   fun->getName() == "__assert_rtn" ||
+                   fun->getName() == "__assert_fail" );
+}
+
+/// Return true if the value refers to constant data, e.g., i32 0
+inline bool isConstantData(const Value* val)
+{
+    return SVFUtil::isa<ConstantData>(val)
+           || SVFUtil::isa<ConstantAggregate>(val)
+           || SVFUtil::isa<MetadataAsValue>(val)
+           || SVFUtil::isa<BlockAddress>(val);
+}
+
+/// Return thread fork function
+//@{
+inline const Value* getForkedFun(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->getForkedFun(cs);
+}
+inline const Value* getForkedFun(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->getForkedFun(inst);
+}
+//@}
+
+const std::string type2String(const Type* type);
+
+/// This function servers a allocation wrapper detector
+inline bool isAnAllocationWraper(const Instruction*)
+{
+    return false;
+}
+
+/// Return LLVM function if this value is
+inline const Function* getLLVMFunction(const Value* val)
+{
+    const Function *fun = SVFUtil::dyn_cast<Function>(val->stripPointerCasts());
+    return fun;
+}
+
+inline bool isExtCall(const CallSite cs)
+{
+    return isExtCall(getCallee(cs));
+}
+
+inline bool isExtCall(const Instruction *inst)
+{
+    return isExtCall(getCallee(inst));
+}
+
+inline bool isHeapAllocExtCallViaArg(const CallSite cs)
+{
+    return isHeapAllocExtFunViaArg(getCallee(cs));
+}
+
+inline bool isHeapAllocExtCallViaArg(const Instruction *inst)
+{
+    return isHeapAllocExtFunViaArg(getCallee(inst));
+}
+
+/// interfaces to be used externally
+inline bool isHeapAllocExtCallViaRet(const CallSite cs)
+{
+    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
+    return isPtrTy && isHeapAllocExtFunViaRet(getCallee(cs));
+}
+
+inline bool isHeapAllocExtCallViaRet(const Instruction *inst)
+{
+    bool isPtrTy = inst->getType()->isPointerTy();
+    return isPtrTy && isHeapAllocExtFunViaRet(getCallee(inst));
+}
+
+inline bool isHeapAllocExtCall(const CallSite cs)
+{
+    return isHeapAllocExtCallViaRet(cs) || isHeapAllocExtCallViaArg(cs);
+}
+
+inline bool isHeapAllocExtCall(const Instruction *inst)
+{
+    return isHeapAllocExtCallViaRet(inst) || isHeapAllocExtCallViaArg(inst);
+}
+//@}
+
+inline int getHeapAllocHoldingArgPosition(const CallSite cs)
+{
+    return getHeapAllocHoldingArgPosition(getCallee(cs));
+}
+
+inline int getHeapAllocHoldingArgPosition(const Instruction *inst)
+{
+    return getHeapAllocHoldingArgPosition(getCallee(inst));
+}
+//@}
+
+inline bool isReallocExtCall(const CallSite cs)
+{
+    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
+    return isPtrTy && isReallocExtFun(getCallee(cs));
+}
+
+inline bool isReallocExtCall(const Instruction *inst)
+{
+    bool isPtrTy = inst->getType()->isPointerTy();
+    return isPtrTy && isReallocExtFun(getCallee(inst));
+}
+//@}
+
+inline bool isDeallocExtCall(const CallSite cs)
+{
+    return isDeallocExtFun(getCallee(cs));
+}
+
+inline bool isDeallocExtCall(const Instruction *inst)
+{
+    return isDeallocExtFun(getCallee(inst));
+}
+//@}
+
+inline bool isStaticExtCall(const CallSite cs)
+{
+    bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
+    return isPtrTy && isStaticExtFun(getCallee(cs));
+}
+
+inline bool isStaticExtCall(const Instruction *inst)
+{
+    bool isPtrTy = inst->getType()->isPointerTy();
+    return isPtrTy && isStaticExtFun(getCallee(inst));
+}
+//@}
+
+/// Return true if the call is a static global call
+//@{
+inline bool isHeapAllocOrStaticExtCall(const CallSite cs)
+{
+    return isStaticExtCall(cs) || isHeapAllocExtCall(cs);
+}
+
+inline bool isHeapAllocOrStaticExtCall(const Instruction *inst)
+{
+    return isStaticExtCall(inst) || isHeapAllocExtCall(inst);
+}
+//@}
+
+/// Return true if this is a thread creation call
+///@{
+inline bool isThreadForkCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDFork(cs);
+}
+inline bool isThreadForkCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDFork(inst);
+}
+//@}
+
+/// Return true if this is a hare_parallel_for call
+///@{
+inline bool isHareParForCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isHareParFor(cs);
+}
+inline bool isHareParForCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isHareParFor(inst);
+}
+//@}
+
+/// Return true if this is a thread join call
+///@{
+inline bool isThreadJoinCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDJoin(cs);
+}
+inline bool isThreadJoinCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDJoin(inst);
+}
+//@}
+
+/// Return true if this is a thread exit call
+///@{
+inline bool isThreadExitCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDExit(cs);
+}
+inline bool isThreadExitCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDExit(inst);
+}
+//@}
+
+/// Return true if this is a lock acquire call
+///@{
+inline bool isLockAquireCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDAcquire(cs);
+}
+inline bool isLockAquireCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDAcquire(inst);
+}
+//@}
+
+/// Return true if this is a lock acquire call
+///@{
+inline bool isLockReleaseCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDRelease(cs);
+}
+inline bool isLockReleaseCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDRelease(inst);
+}
+//@}
+
+/// Return true if this is a barrier wait call
+//@{
+inline bool isBarrierWaitCall(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->isTDBarWait(cs);
+}
+inline bool isBarrierWaitCall(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->isTDBarWait(inst);
+}
+//@}
+
+/// Return sole argument of the thread routine
+//@{
+inline const Value* getActualParmAtForkSite(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(cs);
+}
+inline const Value* getActualParmAtForkSite(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(inst);
+}
+//@}
+
+/// Return the task function of the parallel_for routine
+//@{
+inline const Value* getTaskFuncAtHareParForSite(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(cs);
+}
+inline const Value* getTaskFuncAtHareParForSite(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(inst);
+}
+//@}
+
+/// Return the task data argument of the parallel_for rountine
+//@{
+inline const Value* getTaskDataAtHareParForSite(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(cs);
+}
+inline const Value* getTaskDataAtHareParForSite(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(inst);
+}
+//@}
+
+inline bool isProgEntryFunction (const Function * fun)
+{
+    return fun && fun->getName() == "main";
+}
+
+
+inline bool isProgExitCall(const CallSite cs)
+{
+    return isProgExitFunction(getCallee(cs));
+}
+
+inline bool isProgExitCall(const Instruction *inst)
+{
+    return isProgExitFunction(getCallee(inst));
+}
+
+
 } // End namespace SVFUtil
 
 } // End namespace SVF

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

@@ -57,6 +57,7 @@ typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantExpr ConstantExpr;
 typedef llvm::ConstantDataArray ConstantDataArray;
 typedef llvm::ConstantData ConstantData;
+typedef llvm::ConstantArray ConstantArray;
 
 // LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;

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

@@ -5,7 +5,7 @@
 #include "Graphs/ICFG.h"
 #include "Graphs/ICFGNode.h"
 #include "Graphs/ICFGEdge.h"
-#include "SVF-FE/LLVMUtil.h"
+#include "Util/SVFUtil.h"
 
 namespace SVF
 {

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

@@ -66,14 +66,6 @@ inline bool isBlackholeSym(const Value *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.
-//@{
-inline bool isExtCall(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->is_ext(fun);
-}
-
 inline bool isExtCall(const CallSite cs)
 {
     return isExtCall(getCallee(cs));
@@ -91,19 +83,6 @@ 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
-inline bool isHeapAllocExtFunViaRet(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_alloc(fun)
-                   || ExtAPI::getExtAPI()->is_realloc(fun));
-}
-inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
-}
-
 static inline Type *getPtrElementType(const PointerType* pty)
 {
 #if (LLVM_VERSION_MAJOR < 14)
@@ -148,13 +127,6 @@ inline bool isHeapAllocExtCall(const Instruction *inst)
 }
 //@}
 
-/// Get the position of argument that holds an allocated heap object.
-//@{
-inline int getHeapAllocHoldingArgPosition(const SVFFunction* fun)
-{
-    return ExtAPI::getExtAPI()->get_alloc_arg_pos(fun);
-}
-
 inline int getHeapAllocHoldingArgPosition(const CallSite cs)
 {
     return getHeapAllocHoldingArgPosition(getCallee(cs));
@@ -166,14 +138,6 @@ inline int getHeapAllocHoldingArgPosition(const Instruction *inst)
 }
 //@}
 
-/// Return true if the call is a heap reallocator
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isReallocExtFun(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_realloc(fun));
-}
-
 inline bool isReallocExtCall(const CallSite cs)
 {
     bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
@@ -187,14 +151,6 @@ inline bool isReallocExtCall(const Instruction *inst)
 }
 //@}
 
-/// Return true if the call is a heap dealloc or not
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isDeallocExtFun(const SVFFunction* fun)
-{
-    return fun && (ExtAPI::getExtAPI()->is_dealloc(fun));
-}
-
 inline bool isDeallocExtCall(const CallSite cs)
 {
     return isDeallocExtFun(getCallee(cs));
@@ -206,15 +162,6 @@ inline bool isDeallocExtCall(const Instruction *inst)
 }
 //@}
 
-
-/// Return true if the call is a static global call
-//@{
-/// note that this function is not suppose to be used externally
-inline bool isStaticExtFun(const SVFFunction* fun)
-{
-    return fun && ExtAPI::getExtAPI()->has_static(fun);
-}
-
 inline bool isStaticExtCall(const CallSite cs)
 {
     bool isPtrTy = cs.getInstruction()->getType()->isPointerTy();
@@ -241,12 +188,6 @@ inline bool isHeapAllocOrStaticExtCall(const Instruction *inst)
 }
 //@}
 
-/// Return external call type
-inline ExtAPI::extf_t extCallTy(const SVFFunction* fun)
-{
-    return ExtAPI::getExtAPI()->get_type(fun);
-}
-
 /// Get the reference type of heap/static object from an allocation site.
 //@{
 inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
@@ -362,18 +303,6 @@ inline bool isBarrierWaitCall(const Instruction *inst)
 }
 //@}
 
-/// Return thread fork function
-//@{
-inline const Value* getForkedFun(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getForkedFun(cs);
-}
-inline const Value* getForkedFun(const Instruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getForkedFun(inst);
-}
-//@}
-
 /// Return sole argument of the thread routine
 //@{
 inline const Value* getActualParmAtForkSite(const CallSite cs)
@@ -413,15 +342,6 @@ inline const Value* getTaskDataAtHareParForSite(const Instruction *inst)
 /// Return true if this value refers to a object
 bool isObject (const Value * ref);
 
-/// Return true if the value refers to constant data, e.g., i32 0
-inline bool isConstantData(const Value* val)
-{
-    return SVFUtil::isa<ConstantData>(val)
-           || SVFUtil::isa<ConstantAggregate>(val)
-           || SVFUtil::isa<MetadataAsValue>(val)
-           || SVFUtil::isa<BlockAddress>(val);
-}
-
 /// Method for dead function, which does not have any possible caller
 /// function address is not taken and never be used in call or invoke instruction
 //@{
@@ -436,43 +356,11 @@ inline bool ArgInDeadFunction (const Value * val)
 }
 //@}
 
-/// Program entry function e.g. main
-//@{
-/// Return true if this is a program entry function (e.g. main)
-inline bool isProgEntryFunction (const SVFFunction * fun)
-{
-    return fun && fun->getName() == "main";
-}
-
 inline bool isProgEntryFunction (const Function * fun)
 {
     return fun && fun->getName() == "main";
 }
 
-/// Get program entry function from module.
-inline const SVFFunction* getProgFunction(SVFModule* svfModule, const std::string& funName)
-{
-    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
-    {
-        const SVFFunction *fun = *it;
-        if (fun->getName()==funName)
-            return fun;
-    }
-    return nullptr;
-}
-
-/// Get program entry function from module.
-inline const SVFFunction* getProgEntryFunction(SVFModule* svfModule)
-{
-    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
-    {
-        const SVFFunction *fun = *it;
-        if (isProgEntryFunction(fun))
-            return (fun);
-    }
-    return nullptr;
-}
-
 /// Return true if this is an argument of a program entry function (e.g. main)
 inline bool ArgInProgEntryFunction (const Value * val)
 {
@@ -483,15 +371,6 @@ inline bool ArgInProgEntryFunction (const Value * val)
 bool isPtrInDeadFunction (const Value * value);
 //@}
 
-/// Return true if this is a program exit function call
-//@{
-inline bool isProgExitFunction (const SVFFunction * fun)
-{
-    return fun && (fun->getName() == "exit" ||
-                   fun->getName() == "__assert_rtn" ||
-                   fun->getName() == "__assert_fail" );
-}
-
 inline bool isProgExitCall(const CallSite cs)
 {
     return isProgExitFunction(getCallee(cs));
@@ -677,7 +556,6 @@ u32_t getTypeSizeInBytes(const Type* type);
 u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
 //@}
 
-const std::string type2String(const Type* type);
 
 } // End namespace SVFUtil
 

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

@@ -94,7 +94,6 @@ typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
 typedef llvm::ConstantInt ConstantInt;
 typedef llvm::ConstantPointerNull ConstantPointerNull;
-typedef llvm::ConstantArray ConstantArray;
 typedef llvm::GlobalAlias GlobalAlias;
 
 /// LLVM metadata

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

@@ -352,6 +352,130 @@ bool startAnalysisLimitTimer(unsigned timeLimit);
 /// timer or not (return value of startLimitTimer).
 void stopAnalysisLimitTimer(bool limitTimerSet);
 
+/// 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.
+//@{
+inline bool isExtCall(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->is_ext(fun);
+}
+
+/// Return true if the call is a heap allocator/reallocator
+//@{
+/// note that these two functions are not suppose to be used externally
+inline bool isHeapAllocExtFunViaRet(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_alloc(fun)
+                   || ExtAPI::getExtAPI()->is_realloc(fun));
+}
+
+inline bool isHeapAllocExtFunViaArg(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->is_arg_alloc(fun);
+}
+
+/// Get the position of argument that holds an allocated heap object.
+//@{
+inline int getHeapAllocHoldingArgPosition(const SVFFunction* fun)
+{
+    return ExtAPI::getExtAPI()->get_alloc_arg_pos(fun);
+}
+
+/// Return true if the call is a heap reallocator
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isReallocExtFun(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_realloc(fun));
+}
+
+/// Return true if the call is a heap dealloc or not
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isDeallocExtFun(const SVFFunction* fun)
+{
+    return fun && (ExtAPI::getExtAPI()->is_dealloc(fun));
+}
+
+/// Return true if the call is a static global call
+//@{
+/// note that this function is not suppose to be used externally
+inline bool isStaticExtFun(const SVFFunction* fun)
+{
+    return fun && ExtAPI::getExtAPI()->has_static(fun);
+}
+
+/// Return external call type
+inline ExtAPI::extf_t extCallTy(const SVFFunction* fun)
+{
+    return ExtAPI::getExtAPI()->get_type(fun);
+}
+
+/// Program entry function e.g. main
+//@{
+/// Return true if this is a program entry function (e.g. main)
+inline bool isProgEntryFunction (const SVFFunction * fun)
+{
+    return fun && fun->getName() == "main";
+}
+
+
+/// Get program entry function from module.
+inline const SVFFunction* getProgFunction(SVFModule* svfModule, const std::string& funName)
+{
+    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
+    {
+        const SVFFunction *fun = *it;
+        if (fun->getName()==funName)
+            return fun;
+    }
+    return nullptr;
+}
+
+/// Get program entry function from module.
+inline const SVFFunction* getProgEntryFunction(SVFModule* svfModule)
+{
+    for (SVFModule::const_iterator it = svfModule->begin(), eit = svfModule->end(); it != eit; ++it)
+    {
+        const SVFFunction *fun = *it;
+        if (isProgEntryFunction(fun))
+            return (fun);
+    }
+    return nullptr;
+}
+
+/// Return true if this is a program exit function call
+//@{
+inline bool isProgExitFunction (const SVFFunction * fun)
+{
+    return fun && (fun->getName() == "exit" ||
+                   fun->getName() == "__assert_rtn" ||
+                   fun->getName() == "__assert_fail" );
+}
+
+/// Return true if the value refers to constant data, e.g., i32 0
+inline bool isConstantData(const Value* val)
+{
+    return SVFUtil::isa<ConstantData>(val)
+           || SVFUtil::isa<ConstantAggregate>(val)
+           || SVFUtil::isa<MetadataAsValue>(val)
+           || SVFUtil::isa<BlockAddress>(val);
+}
+
+/// Return thread fork function
+//@{
+inline const Value* getForkedFun(const CallSite cs)
+{
+    return ThreadAPI::getThreadAPI()->getForkedFun(cs);
+}
+inline const Value* getForkedFun(const Instruction *inst)
+{
+    return ThreadAPI::getThreadAPI()->getForkedFun(inst);
+}
+//@}
+
+const std::string type2String(const Type* type);
+
 } // End namespace SVFUtil
 
 } // End namespace SVF

package/package.json

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