svf-tools 1.0.424 → 1.0.427

package/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/include/Util/CoreBitVector.h

@@ -172,7 +172,7 @@ public:
         const CoreBitVectorIterator operator++(int);
 
         /// Dereference: *it.
-        const u32_t operator*(void) const;
+        u32_t operator*(void) const;
 
         /// Equality: *this == rhs.
         bool operator==(const CoreBitVectorIterator &rhs) const;

package/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/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/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/lib/DDA/DDAPass.cpp

@@ -32,7 +32,7 @@ DDAPass::~DDAPass()
 void DDAPass::runOnModule(SVFModule* module)
 {
     /// initialization for llvm alias analyzer
-    //InitializeAliasAnalysis(this, SymbolTableInfo::getDataLayout(&module));
+    //InitializeAliasAnalysis(this, getDataLayout(&module));
 
     selectClient(module);
 

package/lib/MTA/LockResultValidator.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "Util/Options.h"
+#include "SVF-FE/BasicTypes.h"
 #include <string>
 #include <sstream>
 #include "MTA/LockResultValidator.h"

package/lib/MTA/MHP.cpp

@@ -12,6 +12,7 @@
 #include "MTA/MTAResultValidator.h"
 #include "Util/SVFUtil.h"
 #include "MemoryModel/PTAStat.h"
+#include "SVF-FE/BasicTypes.h"
 
 using namespace SVF;
 using namespace SVFUtil;

package/lib/MTA/MTAResultValidator.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Util/Options.h"
+#include "SVF-FE/BasicTypes.h"
 #include <string>
 #include <sstream>
 

package/lib/MTA/PCG.cpp

@@ -204,7 +204,7 @@ void PCG::identifyFollowers()
                 const Instruction* inst = &*it;
                 // mark the callee of this callsite as follower
                 // if this is an call/invoke instruction but not a spawn site
-                if ((SVFUtil::isa<CallInst>(inst) || SVFUtil::isa<InvokeInst>(inst)) && !isSpawnsite(inst))
+                if ((SVFUtil::isa<CallBase>(inst)) && !isSpawnsite(inst))
                 {
                 	CallICFGNode* cbn = getCallICFGNode(inst);
                     if (callgraph->hasCallGraphEdge(cbn))

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -445,15 +445,6 @@ void BVDataPTAImpl::normalizePointsTo() {
     }
 }
 
-/*!
- * Return alias results based on our points-to/alias analysis
- */
-AliasResult BVDataPTAImpl::alias(const MemoryLocation &LocA,
-                                 const MemoryLocation &LocB)
-{
-    return alias(LocA.Ptr, LocB.Ptr);
-}
-
 /*!
  * Return alias results based on our points-to/alias analysis
  */

package/lib/MemoryModel/PointsTo.cpp

@@ -385,7 +385,7 @@ PointsTo::PointsToIterator::PointsToIterator(const PointsTo *pt, bool end)
     {
         new (&bvIt) BitVector::iterator(end ? pt->bv.end() : pt->bv.begin());
     }
-    else 
+    else
     {
         assert(false && "PointsToIterator::PointsToIterator: unknown type");
         abort();
@@ -495,7 +495,7 @@ const PointsTo::PointsToIterator PointsTo::PointsToIterator::operator++(int)
     return old;
 }
 
-const NodeID PointsTo::PointsToIterator::operator*(void) const
+NodeID PointsTo::PointsToIterator::operator*(void) const
 {
     assert(!atEnd() && "PointsToIterator: dereferencing end!");
     if (pt->type == Type::CBV) return pt->getExternalNode(*cbvIt);

package/lib/MemoryModel/SVFVariables.cpp

@@ -126,7 +126,7 @@ const std::string ObjVar::toString() const {
 const std::string GepValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepValVar ID: " << getId() << " with offset_" + llvm::utostr(getConstantFieldIdx());
+    rawstr << "GepValVar ID: " << getId() << " with offset_" + std::to_string(getConstantFieldIdx());
     if (Options::ShowSVFIRValue) {
         rawstr << "\n";
         rawstr << value2String(value);
@@ -137,7 +137,7 @@ const std::string GepValVar::toString() const {
 const std::string GepObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepObjVar ID: " << getId() << " with offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
+    rawstr << "GepObjVar ID: " << getId() << " with offset_" + std::to_string(ls.accumulateConstantFieldIdx());
     if (Options::ShowSVFIRValue) {
         rawstr << "\n";
         rawstr << value2String(value);

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -39,7 +39,6 @@ using namespace std;
 using namespace SVF;
 using namespace SVFUtil;
 
-DataLayout* SymbolTableInfo::dl = nullptr;
 SymbolTableInfo* SymbolTableInfo::symInfo = nullptr;
 
 
@@ -304,10 +303,6 @@ void SymbolTableInfo::destroy()
             delete iter->second;
     }
 
-    if(dl){
-        delete dl;
-        dl = nullptr;
-    }
     if(mod){
         delete mod;
         mod = nullptr;

package/lib/SABER/PathCondAllocator.cpp

@@ -397,7 +397,7 @@ void PathCondAllocator::collectBBCallingProgExit(const BasicBlock & bb)
     for(BasicBlock::const_iterator it = bb.begin(), eit = bb.end(); it!=eit; it++)
     {
         const Instruction* inst = &*it;
-        if(SVFUtil::isa<CallInst>(inst) || SVFUtil::isa<InvokeInst>(inst))
+        if(SVFUtil::isa<CallBase>(inst))
             if(SVFUtil::isProgExitCall(inst))
             {
                 funToExitBBsMap[bb.getParent()].insert(&bb);

package/lib/SVF-FE/BreakConstantExpr.cpp

@@ -50,6 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/InstIterator.h"
 
+#include "SVF-FE/BasicTypes.h"
 #include "SVF-FE/BreakConstantExpr.h"
 
 #include <iostream>

package/lib/SVF-FE/LLVMUtil.cpp

@@ -411,12 +411,13 @@ void SVFUtil::processArguments(int argc, char **argv, int &arg_num, char **arg_v
     }
 }
 
+
 u32_t SVFUtil::getTypeSizeInBytes(const Type* type)
 {
 
     // if the type has size then simply return it, otherwise just return 0
     if(type->isSized())
-        return SymbolTableInfo::getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule())->getTypeStoreSize(const_cast<Type*>(type));
+        return getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule())->getTypeStoreSize(const_cast<Type*>(type));
     else
         return 0;
 }
@@ -424,7 +425,7 @@ u32_t SVFUtil::getTypeSizeInBytes(const Type* type)
 u32_t SVFUtil::getTypeSizeInBytes(const StructType *sty, u32_t field_idx)
 {
 
-    const StructLayout *stTySL = SymbolTableInfo::getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule())->getStructLayout( const_cast<StructType *>(sty) );
+    const StructLayout *stTySL = getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule())->getStructLayout( const_cast<StructType *>(sty) );
     /// if this struct type does not have any element, i.e., opaque
     if(sty->isOpaque())
         return 0;

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -234,7 +234,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
     assert(V);
 
     const llvm::GEPOperator *gepOp = SVFUtil::dyn_cast<const llvm::GEPOperator>(V);
-    DataLayout * dataLayout = SymbolTableInfo::getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule());
+    DataLayout * dataLayout = getDataLayout(LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule());
     llvm::APInt byteOffset(dataLayout->getIndexSizeInBits(gepOp->getPointerAddressSpace()),0,true);
     if(gepOp && dataLayout && gepOp->accumulateConstantOffset(*dataLayout,byteOffset))
     {

package/lib/Util/CoreBitVector.cpp

@@ -422,7 +422,7 @@ const CoreBitVector::CoreBitVectorIterator CoreBitVector::CoreBitVectorIterator:
     return old;
 }
 
-const u32_t CoreBitVector::CoreBitVectorIterator::operator*(void) const
+u32_t CoreBitVector::CoreBitVectorIterator::operator*(void) const
 {
     assert(!atEnd() && "CoreBitVectorIterator::*: dereferencing end!");
     size_t wordsIndex = wordIt - cbv->words.begin();

package/lib/Util/PTAStat.cpp

@@ -224,7 +224,7 @@ void PTAStat::performStat()
     generalNumMap[NumOfIndirectCallSites] = pag->getIndirectCallsites().size();
     generalNumMap["TotalCallSite"] = pag->getCallSiteSet().size();
     generalNumMap["LocalVarInRecur"] = localVarInRecursion.count();
-    bitcastInstStat();
+    // REFACTOR-TODO bitcastInstStat();
     branchStat();
 
     printStat("General Stats");
@@ -323,6 +323,7 @@ void PTAStat::printStat(string statname)
 }
 
 
+/* REFACTOR-TODO
 void PTAStat::bitcastInstStat()
 {
     SVFModule* module = pta->getModule();
@@ -350,6 +351,7 @@ void PTAStat::bitcastInstStat()
 
     generalNumMap["BitCastNumber"] = numberOfBitCast;
 }
+*/
 
 void PTAStat::branchStat()
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.424",
+  "version": "1.0.427",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {