svf-tools 1.0.410 → 1.0.413

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -302,7 +302,6 @@ bool BVDataPTAImpl::readFromFile(const string& filename)
 void BVDataPTAImpl::writeToModule()
 {
     auto irAnnotator = std::make_unique<IRAnnotator>();
-    auto mainModule = SVF::LLVMModuleSet::getLLVMModuleSet()->getMainLLVMModule();
 
     irAnnotator->processAndersenResults(pag, this, true);
 }

package/lib/MemoryModel/SVFIR.cpp

@@ -52,7 +52,7 @@ AddrStmt* SVFIR::addAddrStmt(NodeID src, NodeID dst)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Addr))
+    if(hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Addr))
         return nullptr;
     else
     {
@@ -70,7 +70,7 @@ CopyStmt* SVFIR::addCopyStmt(NodeID src, NodeID dst)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Copy))
+    if(hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Copy))
         return nullptr;
     else
     {
@@ -112,7 +112,7 @@ SelectStmt* SVFIR::addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond
     SVFVar* op2Node = getGNode(op2);
     SVFVar* dstNode = getGNode(res);
     SVFVar* condNode = getGNode(cond);
-    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::Select, op2Node))
+    if(hasLabeledEdge(op1Node, dstNode, SVFStmt::Select, op2Node))
         return nullptr;
     else
     {
@@ -132,7 +132,7 @@ CmpStmt* SVFIR::addCmpStmt(NodeID op1, NodeID op2, NodeID dst, u32_t predicate)
     SVFVar* op1Node = getGNode(op1);
     SVFVar* op2Node = getGNode(op2);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::Cmp, op2Node))
+    if(hasLabeledEdge(op1Node, dstNode, SVFStmt::Cmp, op2Node))
         return nullptr;
     else
     {
@@ -153,7 +153,7 @@ BinaryOPStmt* SVFIR::addBinaryOPStmt(NodeID op1, NodeID op2, NodeID dst, u32_t o
     SVFVar* op1Node = getGNode(op1);
     SVFVar* op2Node = getGNode(op2);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::BinaryOp, op2Node))
+    if(hasLabeledEdge(op1Node, dstNode, SVFStmt::BinaryOp, op2Node))
         return nullptr;
     else
     {
@@ -172,7 +172,7 @@ UnaryOPStmt* SVFIR::addUnaryOPStmt(NodeID src, NodeID dst, u32_t opcode)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::UnaryOp))
+    if(hasNonlabeledEdge(srcNode,dstNode, SVFStmt::UnaryOp))
         return nullptr;
     else
     {
@@ -190,7 +190,7 @@ BranchStmt* SVFIR::addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccA
 {
     SVFVar* brNode = getGNode(br);
     SVFVar* condNode = getGNode(cond);
-    if(SVFStmt* edge = hasNonlabeledEdge(condNode,brNode, SVFStmt::Branch))
+    if(hasNonlabeledEdge(condNode,brNode, SVFStmt::Branch))
         return nullptr;
     else
     {
@@ -208,7 +208,7 @@ LoadStmt* SVFIR::addLoadStmt(NodeID src, NodeID dst)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Load))
+    if(hasNonlabeledEdge(srcNode,dstNode, SVFStmt::Load))
         return nullptr;
     else
     {
@@ -227,7 +227,7 @@ StoreStmt* SVFIR::addStoreStmt(NodeID src, NodeID dst, const IntraICFGNode* curV
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(srcNode,dstNode, SVFStmt::Store, curVal))
+    if(hasLabeledEdge(srcNode,dstNode, SVFStmt::Store, curVal))
         return nullptr;
     else
     {
@@ -245,7 +245,7 @@ CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs, const F
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(srcNode,dstNode, SVFStmt::Call, cs))
+    if(hasLabeledEdge(srcNode,dstNode, SVFStmt::Call, cs))
         return nullptr;
     else
     {
@@ -263,7 +263,7 @@ RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs, const Fun
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(srcNode,dstNode, SVFStmt::Ret, cs))
+    if(hasLabeledEdge(srcNode,dstNode, SVFStmt::Ret, cs))
         return nullptr;
     else
     {
@@ -292,7 +292,7 @@ TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs,
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(srcNode,dstNode, SVFStmt::ThreadFork, cs))
+    if(hasLabeledEdge(srcNode,dstNode, SVFStmt::ThreadFork, cs))
         return nullptr;
     else
     {
@@ -310,7 +310,7 @@ TDJoinPE* SVFIR::addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs,
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasLabeledEdge(srcNode,dstNode, SVFStmt::ThreadJoin, cs))
+    if(hasLabeledEdge(srcNode,dstNode, SVFStmt::ThreadJoin, cs))
         return nullptr;
     else
     {
@@ -351,7 +351,7 @@ GepStmt* SVFIR::addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
     const LocationSet& baseLS = getLocationSetFromBaseNode(src);
     SVFVar* baseNode = getGNode(getBaseValVar(src));
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
+    if(hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
         return nullptr;
     else
     {
@@ -371,7 +371,7 @@ GepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
     const LocationSet& baseLS = getLocationSetFromBaseNode(src);
     SVFVar* baseNode = getGNode(getBaseValVar(src));
     SVFVar* dstNode = getGNode(dst);
-    if(SVFStmt* edge = hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
+    if(hasNonlabeledEdge(baseNode, dstNode, SVFStmt::Gep))
         return nullptr;
     else
     {

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -631,7 +631,7 @@ void MemObj::setFieldSensitive()
  * Constructor of a memory object
  */
 MemObj::MemObj(SymID id, ObjTypeInfo* ti, const Value *val) :
-    symId(id), refVal(val), typeInfo(ti)
+    typeInfo(ti), refVal(val), symId(id)
 {
 }
 

package/lib/SVF-FE/LLVMUtil.cpp

@@ -388,7 +388,7 @@ void SVFUtil::processArguments(int argc, char **argv, int &arg_num, char **arg_v
                                std::vector<std::string> &moduleNameVec)
 {
     bool first_ir_file = true;
-    for (u32_t i = 0; i < argc; ++i)
+    for (int i = 0; i < argc; ++i)
     {
         std::string argument(argv[i]);
         if (SVFUtil::isIRFile(argument))

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -238,7 +238,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
     llvm::APInt byteOffset(dataLayout->getIndexSizeInBits(gepOp->getPointerAddressSpace()),0,true);
     if(gepOp && dataLayout && gepOp->accumulateConstantOffset(*dataLayout,byteOffset))
     {
-        s32_t bo = byteOffset.getSExtValue();
+        //s32_t bo = byteOffset.getSExtValue();
     }
 
     for (bridge_gep_iterator gi = bridge_gep_begin(*V), ge = bridge_gep_end(*V);
@@ -1331,9 +1331,9 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
 
                 // We summarize the side effects: arg3->parent = arg1, arg3->left = arg1, arg3->right = arg1
                 // Note that arg0 is aligned with "offset".
-                for (int i = offset + 1; i <= offset + 3; ++i)
+                for (s32_t i = offset + 1; i <= offset + 3; ++i)
                 {
-                    if(i >= fields.size())
+                    if((u32_t)i >= fields.size())
                         break;
                     const Type* elementType = SymbolTableInfo::SymbolInfo()->getFlatternedElemType(type, fields[i].accumulateConstantFieldIdx());
                     NodeID vnD = getGepValVar(vArg3, fields[i], elementType);
@@ -1358,9 +1358,9 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
 
                 // We summarize the side effects: ret = arg->parent, ret = arg->left, ret = arg->right
                 // Note that arg0 is aligned with "offset".
-                for (int i = offset + 1; i <= offset + 3; ++i)
+                for (s32_t i = offset + 1; i <= offset + 3; ++i)
                 {
-                    if(i >= fields.size())
+                    if((u32_t)i >= fields.size())
                         break;
                     const Type* elementType = SymbolTableInfo::SymbolInfo()->getFlatternedElemType(type, fields[i].accumulateConstantFieldIdx());
                     NodeID vnS = getGepValVar(vArg, fields[i], elementType);

package/lib/Util/CoreBitVector.cpp

@@ -197,7 +197,7 @@ bool CoreBitVector::operator|=(const CoreBitVector &rhs)
 
     // Can start counting from 0 because we took the addresses of both
     // word vectors at the correct index.
-    #pragma omp simd
+    // #pragma omp simd
     for (size_t i = 0 ; i < length; ++i)
     {
         const Word oldWord = thisWords[i];

package/lib/Util/NodeIDAllocator.cpp

@@ -191,7 +191,6 @@ namespace SVF
         assert(Options::NodeAllocStrat == Strategy::DENSE && "Clusterer::cluster: only dense allocation clustering currently supported");
 
         Map<std::string, std::string> overallStats;
-        double totalTime = 0.0;
         double fastClusterTime = 0.0;
         double distanceMatrixTime = 0.0;
         double dendrogramTraversalTime = 0.0;

package/lib/WPA/AndersenSFR.cpp

@@ -80,7 +80,7 @@ bool AndersenSFR::mergeSrcToTgt(NodeID nodeId, NodeID newRepId)
 /*!
  * Propagate point-to set via a gep edge, using SFR
  */
-bool AndersenSFR::processGepPts(PointsTo& pts, const GepCGEdge* edge)
+bool AndersenSFR::processGepPts(const PointsTo& pts, const GepCGEdge* edge)
 {
     ConstraintNode* dst = edge->getDstNode();
     NodeID dstId = dst->getId();
@@ -152,7 +152,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides,
                     for (auto _s : strides)
                     {
                         s32_t _f1 = _f + _s;
-                        loopFlag = (offsets.find(_f1) == offsets.end()) && (initOffset + _f1 < maxLimit);
+                        loopFlag = (offsets.find(_f1) == offsets.end()) && ( (u32_t)(initOffset + _f1) < maxLimit);
                         if (loopFlag)
                             offsets.insert(_f1);
                     }

package/lib/WPA/FlowSensitiveTBHC.cpp

@@ -329,7 +329,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                 }
 
                 if (DCHGraph::isAgg(baseType) && baseType->getTag() != dwarf::DW_TAG_array_type
-                        && gepStmt->getConstantFieldIdx() >= dchg->getNumFields(baseType))
+                        && ((u32_t)gepStmt->getConstantFieldIdx() >= dchg->getNumFields(baseType)))
                 {
                     // If the field offset is too high for this object, it is killed. It seems that a
                     // clone was made on this GEP but this is not the base (e.g. base->f1->f2), and SVF

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -306,7 +306,7 @@ void VersionedFlowSensitive::meldLabel(void)
             Map<MeldVersion, Version> mvv;
             std::vector<Version> sccToVersion(numSCCs, invalidVersion);
             Version curVersion = 0;
-            for (int scc = 0; scc < sccToMeldVersion.size(); ++scc)
+            for (u32_t scc = 0; scc < sccToMeldVersion.size(); ++scc)
             {
                 const MeldVersion &mv = sccToMeldVersion[scc];
                 Map<MeldVersion, Version>::const_iterator foundVersion = mvv.find(mv);
@@ -318,7 +318,7 @@ void VersionedFlowSensitive::meldLabel(void)
 
             // Same for storesYieldedMeldVersion.
             Map<NodeID, Version> storesYieldedVersion;
-            for (const std::pair<NodeID, MeldVersion> &nmv : storesYieldedMeldVersion)
+            for (auto const& nmv : storesYieldedMeldVersion)
             {
                 const NodeID n = nmv.first;
                 const MeldVersion &mv = nmv.second;
@@ -334,7 +334,7 @@ void VersionedFlowSensitive::meldLabel(void)
 
             // 6. From SCC reliance, determine version reliances.
             Map<Version, std::vector<Version>> &osVersionReliance = this->versionReliance.at(o);
-            for (int scc = 0; scc < numSCCs; ++scc)
+            for (u32_t scc = 0; scc < numSCCs; ++scc)
             {
                 if (sccReliance[scc].empty()) continue;
 
@@ -818,7 +818,7 @@ void VersionedFlowSensitive::dumpReliances(void) const
     {
         NodeID o = ovrv.first;
         SVFUtil::outs() << "  Object " << o << "\n";
-        for (const Map<Version, std::vector<Version>>::value_type vrv : ovrv.second)
+        for (const Map<Version, std::vector<Version>>::value_type& vrv : ovrv.second)
         {
             Version v = vrv.first;
             SVFUtil::outs() << "    Version " << v << " is a reliance for: ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.410",
+  "version": "1.0.413",
   "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": {

package/tools/Example/svf-ex.cpp

@@ -88,8 +88,8 @@ void traverseOnICFG(ICFG* icfg, const Instruction* inst)
     while (!worklist.empty())
     {
         const ICFGNode* vNode = worklist.pop();
-        for (ICFGNode::const_iterator it = iNode->OutEdgeBegin(), eit =
-                    iNode->OutEdgeEnd(); it != eit; ++it)
+        for (ICFGNode::const_iterator it = vNode->OutEdgeBegin(), eit =
+                    vNode->OutEdgeEnd(); it != eit; ++it)
         {
             ICFGEdge* edge = *it;
             ICFGNode* succNode = edge->getDstNode();
@@ -135,7 +135,7 @@ void traverseOnVFG(const SVFG* vfg, Value* val)
     /// Collect all LLVM Values
     for(Set<const VFGNode*>::const_iterator it = visited.begin(), eit = visited.end(); it!=eit; ++it)
     {
-        const VFGNode* node = *it;
+        // const VFGNode* node = *it;
         /// can only query VFGNode involving top-level pointers (starting with % or @ in LLVM IR)
         /// PAGNode* pNode = vfg->getLHSTopLevPtr(node);
         /// Value* val = pNode->getValue();
@@ -178,6 +178,7 @@ int main(int argc, char ** argv)
 
     /// ICFG
     ICFG* icfg = pag->getICFG();
+    icfg->dump("icfg");
 
     /// Value-Flow Graph (VFG)
     VFG* vfg = new VFG(callgraph);