svf-lib 1.0.947 → 1.0.950

package/SVF-linux/include/DDA/DDAPass.h

@@ -34,12 +34,6 @@ public:
     DDAPass() : _pta(nullptr), _client(nullptr) {}
     ~DDAPass();
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,	const Value* V2);
 

package/SVF-linux/include/Graphs/VFGNode.h

@@ -336,11 +336,7 @@ private:
 
 public:
     /// Constructor
-    CmpVFGNode(NodeID id,const PAGNode* r): VFGNode(id,Cmp), res(r)
-    {
-        const CmpInst* cmp = SVFUtil::dyn_cast<CmpInst>(r->getValue());
-        assert(cmp && "not a compare operator?");
-    }
+    CmpVFGNode(NodeID id,const PAGNode* r): VFGNode(id,Cmp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const CmpVFGNode *)
@@ -411,11 +407,7 @@ private:
 
 public:
     /// Constructor
-    BinaryOPVFGNode(NodeID id,const PAGNode* r): VFGNode(id,BinaryOp), res(r)
-    {
-        const BinaryOperator* binary = SVFUtil::dyn_cast<BinaryOperator>(r->getValue());
-        assert(binary && "not a binary operator?");
-    }
+    BinaryOPVFGNode(NodeID id,const PAGNode* r): VFGNode(id,BinaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const BinaryOPVFGNode *)
@@ -485,10 +477,7 @@ private:
 
 public:
     /// Constructor
-	UnaryOPVFGNode(NodeID id, const PAGNode *r) : VFGNode(id, UnaryOp), res(r) {
-		const Value *val = r->getValue();
-		assert(SVFUtil::isa<UnaryOperator>(val) && "not a unary instruction ?");
-	}
+    UnaryOPVFGNode(NodeID id, const PAGNode *r) : VFGNode(id, UnaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const UnaryOPVFGNode *)
@@ -556,10 +545,7 @@ private:
     const BranchStmt* brstmt;
 public:
     /// Constructor
-	BranchVFGNode(NodeID id, const BranchStmt* r) : VFGNode(id, Branch), brstmt(r) {
-		const Value *val = r->getValue();
-		assert((SVFUtil::isa<BranchInst>(val) || SVFUtil::isa<SwitchInst>(val)) && "not a BranchInst or a SwitchInst?");
-	}
+    BranchVFGNode(NodeID id, const BranchStmt* r) : VFGNode(id, Branch), brstmt(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const BranchVFGNode *)

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

@@ -239,10 +239,6 @@ public:
     /// Compute points-to results on-demand, overridden by derived classes
     virtual void computeDDAPts(NodeID) {}
 
-    /// Interface exposed to users of our pointer analysis, given Location infos
-    virtual AliasResult alias(const MemoryLocation &LocA,
-                              const MemoryLocation &LocB) = 0;
-
     /// Interface exposed to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,
                               const Value* V2) = 0;

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

@@ -217,10 +217,6 @@ private:
     PersistentPointsToCache<PointsTo> ptCache;
 
 public:
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual AliasResult alias(const MemoryLocation  &LocA,
-                              const MemoryLocation  &LocB);
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,
                               const Value* V2);
@@ -507,12 +503,6 @@ public:
         return objToNSRevPtsMap[obj];
     }
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation &LocA,
-                                     const MemoryLocation  &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual inline AliasResult alias(const Value* V1, const Value* V2)
     {

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

@@ -422,8 +422,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getConstantFieldIdx());
-        return "offset_" + llvm::utostr(getConstantFieldIdx());
+            return value->getName().str() + "_" + std::to_string(getConstantFieldIdx());
+        return "offset_" + std::to_string(getConstantFieldIdx());
     }
 
     inline const Type* getType() const
@@ -510,8 +510,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantFieldIdx());
-        return "offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
+            return value->getName().str() + "_" + std::to_string(ls.accumulateConstantFieldIdx());
+        return "offset_" + std::to_string(ls.accumulateConstantFieldIdx());
     }
 
     virtual const std::string toString() const;

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

@@ -81,9 +81,6 @@ public:
     //@}
 
 private:
-    /// Data layout on a target machine
-    static DataLayout *dl;
-
     ValueToIDMapTy valSymMap;	///< map a value to its sym id
     ValueToIDMapTy objSymMap;	///< map a obj reference to its sym id
     FunToIDMapTy returnSymMap;		///< return  map
@@ -162,14 +159,6 @@ public:
         mod = m;
     }
 
-    /// Get target machine data layout
-    inline static DataLayout* getDataLayout(Module* mod)
-    {
-        if(dl==nullptr)
-            return dl = new DataLayout(mod);
-        return dl;
-    }
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);

package/SVF-linux/include/SABER/PathCondAllocator.h

@@ -32,6 +32,7 @@
 
 #include "Util/SVFModule.h"
 #include "SVF-FE/DataFlowUtil.h"
+#include "SVF-FE/BasicTypes.h"
 #include "Util/Conditions.h"
 #include "Util/WorkList.h"
 #include "Graphs/SVFG.h"

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

@@ -2,18 +2,57 @@
 #define SVF_FE_BASIC_TYPES_H
 
 #include <llvm/IR/Instructions.h>
+#include <llvm/IR/IntrinsicInst.h>
 #include <llvm/IR/Metadata.h>
+#include <llvm/IR/DataLayout.h>
+
+#include <llvm/Analysis/MemoryLocation.h>
 
 #include <llvm/Support/SourceMgr.h>
 
 typedef llvm::SMDiagnostic SMDiagnostic;
 
-typedef llvm::ExtractValueInst  ExtractValueInst;
-typedef llvm::ExtractElementInst ExtractElementInst;
 typedef llvm::MetadataAsValue MetadataAsValue;
 typedef llvm::BlockAddress BlockAddress;
 
+// LLVM data layout
+typedef llvm::StructLayout StructLayout;
+typedef llvm::ConstantStruct ConstantStruct;
+typedef llvm::MemoryLocation MemoryLocation;
+
+// LLVM Aliases and constants
 typedef llvm::ConstantAggregate ConstantAggregate;
 typedef llvm::ConstantAggregateZero ConstantAggregateZero;
+typedef llvm::ConstantDataSequential ConstantDataSequential;
+typedef llvm::ConstantExpr ConstantExpr;
+
+// LLVM Instructions
+typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
+typedef llvm::AtomicRMWInst AtomicRMWInst;
+typedef llvm::BitCastInst BitCastInst;
+typedef llvm::CallBrInst CallBrInst;
+typedef llvm::CastInst CastInst;
+typedef llvm::CmpInst CmpInst;
+typedef llvm::ExtractValueInst  ExtractValueInst;
+typedef llvm::ExtractElementInst ExtractElementInst;
+typedef llvm::GetElementPtrInst GetElementPtrInst;
+typedef llvm::InvokeInst InvokeInst;
+typedef llvm::ShuffleVectorInst ShuffleVectorInst;
+typedef llvm::PHINode PHINode;
+typedef llvm::IntToPtrInst IntToPtrInst;
+typedef llvm::InsertValueInst InsertValueInst;
+typedef llvm::FenceInst FenceInst;
+typedef llvm::FreezeInst FreezeInst;
+typedef llvm::UnreachableInst UnreachableInst;
+typedef llvm::InsertElementInst InsertElementInst;
+typedef llvm::LandingPadInst LandingPadInst;
+typedef llvm::ResumeInst ResumeInst;
+typedef llvm::SelectInst SelectInst;
+typedef llvm::VAArgInst VAArgInst;
+typedef llvm::VACopyInst VACopyInst;
+typedef llvm::VAEndInst VAEndInst;
+typedef llvm::VAStartInst VAStartInst;
+typedef llvm::BinaryOperator BinaryOperator;
+typedef llvm::UnaryOperator UnaryOperator;
 
 #endif  // SVF_FE_BASIC_TYPES_H

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

@@ -617,6 +617,13 @@ inline const ConstantExpr *isUnaryConstantExpr(const Value *val)
 }
 //@}
 
+inline static DataLayout* getDataLayout(Module* mod)
+{
+    static DataLayout *dl = nullptr;
+    if (dl == nullptr) dl = new DataLayout(mod);
+    return dl;
+}
+
 /// Get the next instructions following control flow
 void getNextInsts(const Instruction* curInst, std::vector<const Instruction*>& instList);
 

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

@@ -34,7 +34,6 @@
 #include "SVF-FE/GEPTypeBridgeIterator.h"
 #include "Graphs/GraphPrinter.h"
 #include "Util/Casting.h"
-#include <llvm/ADT/SmallVector.h>		// for small vector
 #include <llvm/ADT/SparseBitVector.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/InstVisitor.h>	// for instruction visitor
@@ -106,20 +105,12 @@ typedef llvm::VectorType VectorType;
 
 /// LLVM data layout
 typedef llvm::DataLayout DataLayout;
-typedef llvm::StructLayout StructLayout;
-typedef llvm::SmallVector<BasicBlock*, 8> SmallBBVector;
-typedef llvm::ConstantStruct ConstantStruct;
-typedef llvm::MemoryLocation MemoryLocation;
 
 /// LLVM Aliases and constants
 typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
 typedef llvm::ConstantData ConstantData;
-typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantInt ConstantInt;
-typedef llvm::ConstantFP ConstantFP;
-typedef llvm::ConstantTokenNone ConstantTokenNone;
-typedef llvm::ConstantExpr ConstantExpr;
 typedef llvm::ConstantPointerNull ConstantPointerNull;
 typedef llvm::ConstantArray ConstantArray;
 typedef llvm::GlobalAlias GlobalAlias;
@@ -134,38 +125,12 @@ typedef llvm::MDNode MDNode;
 /// LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;
 typedef llvm::CallInst CallInst;
-typedef llvm::InvokeInst InvokeInst;
-typedef llvm::CallBrInst CallBrInst;
 typedef llvm::StoreInst StoreInst;
 typedef llvm::LoadInst LoadInst;
-typedef llvm::PHINode PHINode;
-typedef llvm::GetElementPtrInst GetElementPtrInst;
-typedef llvm::CastInst CastInst;
-typedef llvm::BitCastInst BitCastInst;
 typedef llvm::ReturnInst ReturnInst;
-typedef llvm::SelectInst SelectInst;
-typedef llvm::IntToPtrInst IntToPtrInst;
-typedef llvm::CmpInst CmpInst;
 typedef llvm::BranchInst BranchInst;
 typedef llvm::SwitchInst SwitchInst;
-typedef llvm::InsertValueInst InsertValueInst;
-typedef llvm::BinaryOperator BinaryOperator;
-typedef llvm::UnaryOperator UnaryOperator;
-typedef llvm::PtrToIntInst PtrToIntInst;
-typedef llvm::VAArgInst VAArgInst;
-typedef llvm::InsertElementInst InsertElementInst;
-typedef llvm::ShuffleVectorInst ShuffleVectorInst;
-typedef llvm::LandingPadInst LandingPadInst;
-typedef llvm::ResumeInst ResumeInst;
-typedef llvm::UnreachableInst UnreachableInst;
-typedef llvm::FenceInst FenceInst;
-typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
-typedef llvm::AtomicRMWInst AtomicRMWInst;
 typedef llvm::UndefValue UndefValue;
-typedef llvm::VACopyInst VACopyInst;
-typedef llvm::VAEndInst VAEndInst;
-typedef llvm::VAStartInst VAStartInst;
-typedef llvm::FreezeInst FreezeInst;
 
 #if (LLVM_VERSION_MAJOR >= 9)
 typedef llvm::FunctionCallee FunctionCallee;

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

@@ -31,6 +31,10 @@
 #ifndef INCLUDE_UTIL_SVFBASICTYPES_H_
 #define INCLUDE_UTIL_SVFBASICTYPES_H_
 
+// TODO: these are just for SmallBBVector.
+#include <llvm/IR/BasicBlock.h>
+#include <llvm/ADT/SmallVector.h>
+
 #include <llvm/ADT/SparseBitVector.h>	// for points-to
 #include <llvm/Support/CommandLine.h>	// for command line options
 #include <llvm/ADT/StringMap.h>	// for StringMap
@@ -108,9 +112,7 @@ template<typename Key, typename Value, typename Compare = std::less<Key>,
          typename Allocator = std::allocator<std::pair<const Key, Value>>>
 using OrderedMap = std::map<Key, Value, Compare, Allocator>;
 
-template <typename T, unsigned N>
-using SmallVector = llvm::SmallVector<T, N>;
-
+typedef llvm::SmallVector<llvm::BasicBlock*, 8> SmallBBVector;
 typedef std::pair<NodeID, NodeID> NodePair;
 typedef OrderedSet<NodeID> OrderedNodeSet;
 typedef Set<NodeID> NodeSet;
@@ -121,10 +123,8 @@ typedef std::vector<EdgeID> EdgeVector;
 typedef std::stack<NodeID> NodeStack;
 typedef std::list<NodeID> NodeList;
 typedef std::deque<NodeID> NodeDeque;
-typedef SmallVector<u32_t,16> SmallVector16;
-typedef SmallVector<u32_t,8> SmallVector8;
 typedef NodeSet EdgeSet;
-typedef SmallVector16 CallStrCxt;
+typedef std::vector<u32_t> CallStrCxt;
 typedef llvm::StringMap<u32_t> StringMap;
 
 typedef unsigned Version;
@@ -290,27 +290,6 @@ template <> struct std::hash<SVF::NodePair> {
     }
 };
 
-/// Specialise hash for SmallVectors.
-template <typename T, unsigned N>
-struct std::hash<SVF::SmallVector<T, N>>
-{
-    size_t operator()(const SVF::SmallVector<T, N> &sv) const {
-        if (sv.empty()) return 0;
-        if (sv.size() == 1) return sv[0];
-
-        // Iterate and accumulate the hash.
-        size_t hash = 0;
-        SVF::Hash<std::pair<T, size_t>> hts;
-        std::hash<T> ht;
-        for (const T &t : sv)
-        {
-            hash = hts(std::make_pair(ht(t), hash));
-        }
-
-        return hash;
-    }
-};
-
 /// Specialise hash for SparseBitVectors.
 template <unsigned N>
 struct std::hash<llvm::SparseBitVector<N>>

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

@@ -192,7 +192,7 @@ inline bool isIntrinsicInst(const Instruction* inst)
 /// Whether an instruction is a call or invoke instruction
 inline bool isCallSite(const Instruction* inst)
 {
-    return SVFUtil::isa<CallInst>(inst) || SVFUtil::isa<InvokeInst>(inst) || SVFUtil::isa<CallBrInst>(inst);
+    return SVFUtil::isa<CallBase>(inst);
 }
 /// Whether an instruction is a call or invoke instruction
 inline bool isCallSite(const Value* val)

package/SVF-linux/include/WPA/WPAPass.h

@@ -75,12 +75,6 @@ public:
     /// Destructor
     virtual ~WPAPass();
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation  &LocA, const MemoryLocation  &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,	const Value* V2);
 

package/SVF-osx/include/DDA/DDAPass.h

@@ -34,12 +34,6 @@ public:
     DDAPass() : _pta(nullptr), _client(nullptr) {}
     ~DDAPass();
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,	const Value* V2);
 

package/SVF-osx/include/Graphs/VFGNode.h

@@ -336,11 +336,7 @@ private:
 
 public:
     /// Constructor
-    CmpVFGNode(NodeID id,const PAGNode* r): VFGNode(id,Cmp), res(r)
-    {
-        const CmpInst* cmp = SVFUtil::dyn_cast<CmpInst>(r->getValue());
-        assert(cmp && "not a compare operator?");
-    }
+    CmpVFGNode(NodeID id,const PAGNode* r): VFGNode(id,Cmp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const CmpVFGNode *)
@@ -411,11 +407,7 @@ private:
 
 public:
     /// Constructor
-    BinaryOPVFGNode(NodeID id,const PAGNode* r): VFGNode(id,BinaryOp), res(r)
-    {
-        const BinaryOperator* binary = SVFUtil::dyn_cast<BinaryOperator>(r->getValue());
-        assert(binary && "not a binary operator?");
-    }
+    BinaryOPVFGNode(NodeID id,const PAGNode* r): VFGNode(id,BinaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const BinaryOPVFGNode *)
@@ -485,10 +477,7 @@ private:
 
 public:
     /// Constructor
-	UnaryOPVFGNode(NodeID id, const PAGNode *r) : VFGNode(id, UnaryOp), res(r) {
-		const Value *val = r->getValue();
-		assert(SVFUtil::isa<UnaryOperator>(val) && "not a unary instruction ?");
-	}
+    UnaryOPVFGNode(NodeID id, const PAGNode *r) : VFGNode(id, UnaryOp), res(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const UnaryOPVFGNode *)
@@ -556,10 +545,7 @@ private:
     const BranchStmt* brstmt;
 public:
     /// Constructor
-	BranchVFGNode(NodeID id, const BranchStmt* r) : VFGNode(id, Branch), brstmt(r) {
-		const Value *val = r->getValue();
-		assert((SVFUtil::isa<BranchInst>(val) || SVFUtil::isa<SwitchInst>(val)) && "not a BranchInst or a SwitchInst?");
-	}
+    BranchVFGNode(NodeID id, const BranchStmt* r) : VFGNode(id, Branch), brstmt(r) { }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const BranchVFGNode *)

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

@@ -239,10 +239,6 @@ public:
     /// Compute points-to results on-demand, overridden by derived classes
     virtual void computeDDAPts(NodeID) {}
 
-    /// Interface exposed to users of our pointer analysis, given Location infos
-    virtual AliasResult alias(const MemoryLocation &LocA,
-                              const MemoryLocation &LocB) = 0;
-
     /// Interface exposed to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,
                               const Value* V2) = 0;

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

@@ -217,10 +217,6 @@ private:
     PersistentPointsToCache<PointsTo> ptCache;
 
 public:
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual AliasResult alias(const MemoryLocation  &LocA,
-                              const MemoryLocation  &LocB);
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,
                               const Value* V2);
@@ -507,12 +503,6 @@ public:
         return objToNSRevPtsMap[obj];
     }
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation &LocA,
-                                     const MemoryLocation  &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual inline AliasResult alias(const Value* V1, const Value* V2)
     {

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

@@ -422,8 +422,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getConstantFieldIdx());
-        return "offset_" + llvm::utostr(getConstantFieldIdx());
+            return value->getName().str() + "_" + std::to_string(getConstantFieldIdx());
+        return "offset_" + std::to_string(getConstantFieldIdx());
     }
 
     inline const Type* getType() const
@@ -510,8 +510,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantFieldIdx());
-        return "offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
+            return value->getName().str() + "_" + std::to_string(ls.accumulateConstantFieldIdx());
+        return "offset_" + std::to_string(ls.accumulateConstantFieldIdx());
     }
 
     virtual const std::string toString() const;

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

@@ -81,9 +81,6 @@ public:
     //@}
 
 private:
-    /// Data layout on a target machine
-    static DataLayout *dl;
-
     ValueToIDMapTy valSymMap;	///< map a value to its sym id
     ValueToIDMapTy objSymMap;	///< map a obj reference to its sym id
     FunToIDMapTy returnSymMap;		///< return  map
@@ -162,14 +159,6 @@ public:
         mod = m;
     }
 
-    /// Get target machine data layout
-    inline static DataLayout* getDataLayout(Module* mod)
-    {
-        if(dl==nullptr)
-            return dl = new DataLayout(mod);
-        return dl;
-    }
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);

package/SVF-osx/include/SABER/PathCondAllocator.h

@@ -32,6 +32,7 @@
 
 #include "Util/SVFModule.h"
 #include "SVF-FE/DataFlowUtil.h"
+#include "SVF-FE/BasicTypes.h"
 #include "Util/Conditions.h"
 #include "Util/WorkList.h"
 #include "Graphs/SVFG.h"

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

@@ -2,18 +2,57 @@
 #define SVF_FE_BASIC_TYPES_H
 
 #include <llvm/IR/Instructions.h>
+#include <llvm/IR/IntrinsicInst.h>
 #include <llvm/IR/Metadata.h>
+#include <llvm/IR/DataLayout.h>
+
+#include <llvm/Analysis/MemoryLocation.h>
 
 #include <llvm/Support/SourceMgr.h>
 
 typedef llvm::SMDiagnostic SMDiagnostic;
 
-typedef llvm::ExtractValueInst  ExtractValueInst;
-typedef llvm::ExtractElementInst ExtractElementInst;
 typedef llvm::MetadataAsValue MetadataAsValue;
 typedef llvm::BlockAddress BlockAddress;
 
+// LLVM data layout
+typedef llvm::StructLayout StructLayout;
+typedef llvm::ConstantStruct ConstantStruct;
+typedef llvm::MemoryLocation MemoryLocation;
+
+// LLVM Aliases and constants
 typedef llvm::ConstantAggregate ConstantAggregate;
 typedef llvm::ConstantAggregateZero ConstantAggregateZero;
+typedef llvm::ConstantDataSequential ConstantDataSequential;
+typedef llvm::ConstantExpr ConstantExpr;
+
+// LLVM Instructions
+typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
+typedef llvm::AtomicRMWInst AtomicRMWInst;
+typedef llvm::BitCastInst BitCastInst;
+typedef llvm::CallBrInst CallBrInst;
+typedef llvm::CastInst CastInst;
+typedef llvm::CmpInst CmpInst;
+typedef llvm::ExtractValueInst  ExtractValueInst;
+typedef llvm::ExtractElementInst ExtractElementInst;
+typedef llvm::GetElementPtrInst GetElementPtrInst;
+typedef llvm::InvokeInst InvokeInst;
+typedef llvm::ShuffleVectorInst ShuffleVectorInst;
+typedef llvm::PHINode PHINode;
+typedef llvm::IntToPtrInst IntToPtrInst;
+typedef llvm::InsertValueInst InsertValueInst;
+typedef llvm::FenceInst FenceInst;
+typedef llvm::FreezeInst FreezeInst;
+typedef llvm::UnreachableInst UnreachableInst;
+typedef llvm::InsertElementInst InsertElementInst;
+typedef llvm::LandingPadInst LandingPadInst;
+typedef llvm::ResumeInst ResumeInst;
+typedef llvm::SelectInst SelectInst;
+typedef llvm::VAArgInst VAArgInst;
+typedef llvm::VACopyInst VACopyInst;
+typedef llvm::VAEndInst VAEndInst;
+typedef llvm::VAStartInst VAStartInst;
+typedef llvm::BinaryOperator BinaryOperator;
+typedef llvm::UnaryOperator UnaryOperator;
 
 #endif  // SVF_FE_BASIC_TYPES_H

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

@@ -617,6 +617,13 @@ inline const ConstantExpr *isUnaryConstantExpr(const Value *val)
 }
 //@}
 
+inline static DataLayout* getDataLayout(Module* mod)
+{
+    static DataLayout *dl = nullptr;
+    if (dl == nullptr) dl = new DataLayout(mod);
+    return dl;
+}
+
 /// Get the next instructions following control flow
 void getNextInsts(const Instruction* curInst, std::vector<const Instruction*>& instList);
 

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

@@ -34,7 +34,6 @@
 #include "SVF-FE/GEPTypeBridgeIterator.h"
 #include "Graphs/GraphPrinter.h"
 #include "Util/Casting.h"
-#include <llvm/ADT/SmallVector.h>		// for small vector
 #include <llvm/ADT/SparseBitVector.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/InstVisitor.h>	// for instruction visitor
@@ -106,20 +105,12 @@ typedef llvm::VectorType VectorType;
 
 /// LLVM data layout
 typedef llvm::DataLayout DataLayout;
-typedef llvm::StructLayout StructLayout;
-typedef llvm::SmallVector<BasicBlock*, 8> SmallBBVector;
-typedef llvm::ConstantStruct ConstantStruct;
-typedef llvm::MemoryLocation MemoryLocation;
 
 /// LLVM Aliases and constants
 typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
 typedef llvm::ConstantData ConstantData;
-typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantInt ConstantInt;
-typedef llvm::ConstantFP ConstantFP;
-typedef llvm::ConstantTokenNone ConstantTokenNone;
-typedef llvm::ConstantExpr ConstantExpr;
 typedef llvm::ConstantPointerNull ConstantPointerNull;
 typedef llvm::ConstantArray ConstantArray;
 typedef llvm::GlobalAlias GlobalAlias;
@@ -134,38 +125,12 @@ typedef llvm::MDNode MDNode;
 /// LLVM Instructions
 typedef llvm::AllocaInst AllocaInst;
 typedef llvm::CallInst CallInst;
-typedef llvm::InvokeInst InvokeInst;
-typedef llvm::CallBrInst CallBrInst;
 typedef llvm::StoreInst StoreInst;
 typedef llvm::LoadInst LoadInst;
-typedef llvm::PHINode PHINode;
-typedef llvm::GetElementPtrInst GetElementPtrInst;
-typedef llvm::CastInst CastInst;
-typedef llvm::BitCastInst BitCastInst;
 typedef llvm::ReturnInst ReturnInst;
-typedef llvm::SelectInst SelectInst;
-typedef llvm::IntToPtrInst IntToPtrInst;
-typedef llvm::CmpInst CmpInst;
 typedef llvm::BranchInst BranchInst;
 typedef llvm::SwitchInst SwitchInst;
-typedef llvm::InsertValueInst InsertValueInst;
-typedef llvm::BinaryOperator BinaryOperator;
-typedef llvm::UnaryOperator UnaryOperator;
-typedef llvm::PtrToIntInst PtrToIntInst;
-typedef llvm::VAArgInst VAArgInst;
-typedef llvm::InsertElementInst InsertElementInst;
-typedef llvm::ShuffleVectorInst ShuffleVectorInst;
-typedef llvm::LandingPadInst LandingPadInst;
-typedef llvm::ResumeInst ResumeInst;
-typedef llvm::UnreachableInst UnreachableInst;
-typedef llvm::FenceInst FenceInst;
-typedef llvm::AtomicCmpXchgInst AtomicCmpXchgInst;
-typedef llvm::AtomicRMWInst AtomicRMWInst;
 typedef llvm::UndefValue UndefValue;
-typedef llvm::VACopyInst VACopyInst;
-typedef llvm::VAEndInst VAEndInst;
-typedef llvm::VAStartInst VAStartInst;
-typedef llvm::FreezeInst FreezeInst;
 
 #if (LLVM_VERSION_MAJOR >= 9)
 typedef llvm::FunctionCallee FunctionCallee;

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

@@ -31,6 +31,10 @@
 #ifndef INCLUDE_UTIL_SVFBASICTYPES_H_
 #define INCLUDE_UTIL_SVFBASICTYPES_H_
 
+// TODO: these are just for SmallBBVector.
+#include <llvm/IR/BasicBlock.h>
+#include <llvm/ADT/SmallVector.h>
+
 #include <llvm/ADT/SparseBitVector.h>	// for points-to
 #include <llvm/Support/CommandLine.h>	// for command line options
 #include <llvm/ADT/StringMap.h>	// for StringMap
@@ -108,9 +112,7 @@ template<typename Key, typename Value, typename Compare = std::less<Key>,
          typename Allocator = std::allocator<std::pair<const Key, Value>>>
 using OrderedMap = std::map<Key, Value, Compare, Allocator>;
 
-template <typename T, unsigned N>
-using SmallVector = llvm::SmallVector<T, N>;
-
+typedef llvm::SmallVector<llvm::BasicBlock*, 8> SmallBBVector;
 typedef std::pair<NodeID, NodeID> NodePair;
 typedef OrderedSet<NodeID> OrderedNodeSet;
 typedef Set<NodeID> NodeSet;
@@ -121,10 +123,8 @@ typedef std::vector<EdgeID> EdgeVector;
 typedef std::stack<NodeID> NodeStack;
 typedef std::list<NodeID> NodeList;
 typedef std::deque<NodeID> NodeDeque;
-typedef SmallVector<u32_t,16> SmallVector16;
-typedef SmallVector<u32_t,8> SmallVector8;
 typedef NodeSet EdgeSet;
-typedef SmallVector16 CallStrCxt;
+typedef std::vector<u32_t> CallStrCxt;
 typedef llvm::StringMap<u32_t> StringMap;
 
 typedef unsigned Version;
@@ -290,27 +290,6 @@ template <> struct std::hash<SVF::NodePair> {
     }
 };
 
-/// Specialise hash for SmallVectors.
-template <typename T, unsigned N>
-struct std::hash<SVF::SmallVector<T, N>>
-{
-    size_t operator()(const SVF::SmallVector<T, N> &sv) const {
-        if (sv.empty()) return 0;
-        if (sv.size() == 1) return sv[0];
-
-        // Iterate and accumulate the hash.
-        size_t hash = 0;
-        SVF::Hash<std::pair<T, size_t>> hts;
-        std::hash<T> ht;
-        for (const T &t : sv)
-        {
-            hash = hts(std::make_pair(ht(t), hash));
-        }
-
-        return hash;
-    }
-};
-
 /// Specialise hash for SparseBitVectors.
 template <unsigned N>
 struct std::hash<llvm::SparseBitVector<N>>

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

@@ -192,7 +192,7 @@ inline bool isIntrinsicInst(const Instruction* inst)
 /// Whether an instruction is a call or invoke instruction
 inline bool isCallSite(const Instruction* inst)
 {
-    return SVFUtil::isa<CallInst>(inst) || SVFUtil::isa<InvokeInst>(inst) || SVFUtil::isa<CallBrInst>(inst);
+    return SVFUtil::isa<CallBase>(inst);
 }
 /// Whether an instruction is a call or invoke instruction
 inline bool isCallSite(const Value* val)

package/SVF-osx/include/WPA/WPAPass.h

@@ -75,12 +75,6 @@ public:
     /// Destructor
     virtual ~WPAPass();
 
-    /// Interface expose to users of our pointer analysis, given Location infos
-    virtual inline AliasResult alias(const MemoryLocation  &LocA, const MemoryLocation  &LocB)
-    {
-        return alias(LocA.Ptr, LocB.Ptr);
-    }
-
     /// Interface expose to users of our pointer analysis, given Value infos
     virtual AliasResult alias(const Value* V1,	const Value* V2);
 

package/package.json

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