svf-tools 1.0.348 → 1.0.352

package/lib/Util/PTAStat.cpp

@@ -48,7 +48,7 @@ const char* PTAStat:: TotalNumOfPointers = "TotalPointers";	///< SVFIR value nod
 const char* PTAStat:: TotalNumOfObjects = "TotalObjects";	///< Total SVFIR object node
 const char* PTAStat:: TotalNumOfFieldObjects = "TotalFieldObjects";	///< Total SVFIR field object node
 const char* PTAStat:: MaxStructSize = "MaxStructSize";	///< Max struct size (bytes)
-const char* PTAStat:: TotalNumOfEdges = "TotalPAGEdges";	///< Total SVFIR edge number
+const char* PTAStat:: TotalNumOfEdges = "TotalSVFStmts";	///< Total SVFIR edge number
 
 const char* PTAStat:: NumOfFunctionObjs = "FunctionObjs";	///< function numbers
 const char* PTAStat:: NumOfGlobalObjs = "GlobalObjs";	///< SVFIR global object node
@@ -198,17 +198,17 @@ void PTAStat::performStat()
     generalNumMap[TotalNumOfFieldObjects] = pag->getFieldObjNodeNum();
     generalNumMap[MaxStructSize] = SymbolTableInfo::SymbolInfo()->getMaxStructSize();
     generalNumMap[TotalNumOfEdges] = pag->getPAGEdgeNum();
-    generalNumMap["TotalPTAPAGEdges"] = pag->getPTAPAGEdgeNum();
+    generalNumMap["TotalPTASVFStmts"] = pag->getPTAPAGEdgeNum();
     generalNumMap[NumberOfFieldInsensitiveObj] = fiObjNumber;
     generalNumMap[NumberOfFieldSensitiveObj] = fsObjNumber;
 
-    generalNumMap[NumOfAddrs] = pag->getSVFStmtSet(PAGEdge::Addr).size();
-    generalNumMap[NumOfLoads] = pag->getSVFStmtSet(PAGEdge::Load).size();
-    generalNumMap[NumOfStores] = pag->getSVFStmtSet(PAGEdge::Store).size();
-    generalNumMap[NumOfCopys] =  pag->getSVFStmtSet(PAGEdge::Copy).size();
-    generalNumMap[NumOfGeps] =  pag->getSVFStmtSet(PAGEdge::NormalGep).size() + pag->getSVFStmtSet(PAGEdge::VariantGep).size();
-    generalNumMap[NumOfCalls] = pag->getSVFStmtSet(PAGEdge::Call).size();
-    generalNumMap[NumOfReturns] = pag->getSVFStmtSet(PAGEdge::Ret).size();
+    generalNumMap[NumOfAddrs] = pag->getSVFStmtSet(SVFStmt::Addr).size();
+    generalNumMap[NumOfLoads] = pag->getSVFStmtSet(SVFStmt::Load).size();
+    generalNumMap[NumOfStores] = pag->getSVFStmtSet(SVFStmt::Store).size();
+    generalNumMap[NumOfCopys] =  pag->getSVFStmtSet(SVFStmt::Copy).size();
+    generalNumMap[NumOfGeps] =  pag->getSVFStmtSet(SVFStmt::Gep).size();
+    generalNumMap[NumOfCalls] = pag->getSVFStmtSet(SVFStmt::Call).size();
+    generalNumMap[NumOfReturns] = pag->getSVFStmtSet(SVFStmt::Ret).size();
 
     generalNumMap[NumOfFunctionObjs] = numOfFunction;
     generalNumMap[NumOfGlobalObjs] = numOfGlobal;

package/lib/Util/TypeBasedHeapCloning.cpp

@@ -152,10 +152,10 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
     // totalOffset is the offset from the real base (i.e. base of base),
     // offset is the offset into base, whether it is a field itself or not.
-    unsigned totalOffset = offset;
+    s64_t totalOffset = offset;
     if (const GepObjVar *baseGep = SVFUtil::dyn_cast<GepObjVar>(baseNode))
     {
-        totalOffset += baseGep->getFieldOffset();
+        totalOffset += baseGep->getConstantFieldIdx();
     }
 
     const DIType *baseType = getType(base);
@@ -189,7 +189,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
         if (GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
         {
-            if (gepNode->getFieldOffset() == totalOffset)
+            if (gepNode->getConstantFieldIdx() == totalOffset)
             {
                 geps.set(gep);
             }
@@ -211,7 +211,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
         // No gep node has even be created, so create one.
         NodeID newGep;
         LocationSet newLS;
-        // fldIdx is what is returned by getFieldOffset.
+        // fldIdx is what is returned by getConstantFieldIdx.
         newLS.setFldIdx(totalOffset);
 
         if (isClone(base))
@@ -414,7 +414,7 @@ NodeID TypeBasedHeapCloning::cloneObject(NodeID o, const DIType *type, bool)
     const PAGNode *obj = ppag->getGNode(o);
     if (const GepObjVar *gepObj = SVFUtil::dyn_cast<GepObjVar>(obj))
     {
-        const NodeBS &clones = getGepObjClones(gepObj->getBaseNode(), gepObj->getFieldOffset());
+        const NodeBS &clones = getGepObjClones(gepObj->getBaseNode(), gepObj->getConstantFieldIdx());
         // TODO: a bit of repetition.
         for (NodeID clone : clones)
         {
@@ -427,7 +427,7 @@ NodeID TypeBasedHeapCloning::cloneObject(NodeID o, const DIType *type, bool)
         clone = addCloneGepObjNode(gepObj->getMemObj(), gepObj->getLocationSet());
 
         // The base needs to know about the new clone.
-        addGepToObj(clone, gepObj->getBaseNode(), gepObj->getFieldOffset());
+        addGepToObj(clone, gepObj->getBaseNode(), gepObj->getConstantFieldIdx());
 
         addClone(o, clone);
         addClone(getOriginalObj(o), clone);

package/lib/WPA/Andersen.cpp

@@ -38,21 +38,21 @@ using namespace SVF;
 using namespace SVFUtil;
 
 
-Size_t AndersenBase::numOfProcessedAddr = 0;
-Size_t AndersenBase::numOfProcessedCopy = 0;
-Size_t AndersenBase::numOfProcessedGep = 0;
-Size_t AndersenBase::numOfProcessedLoad = 0;
-Size_t AndersenBase::numOfProcessedStore = 0;
-Size_t AndersenBase::numOfSfrs = 0;
-Size_t AndersenBase::numOfFieldExpand = 0;
-
-Size_t AndersenBase::numOfSCCDetection = 0;
+u32_t AndersenBase::numOfProcessedAddr = 0;
+u32_t AndersenBase::numOfProcessedCopy = 0;
+u32_t AndersenBase::numOfProcessedGep = 0;
+u32_t AndersenBase::numOfProcessedLoad = 0;
+u32_t AndersenBase::numOfProcessedStore = 0;
+u32_t AndersenBase::numOfSfrs = 0;
+u32_t AndersenBase::numOfFieldExpand = 0;
+
+u32_t AndersenBase::numOfSCCDetection = 0;
 double AndersenBase::timeOfSCCDetection = 0;
 double AndersenBase::timeOfSCCMerges = 0;
 double AndersenBase::timeOfCollapse = 0;
 
-Size_t AndersenBase::AveragePointsToSetSize = 0;
-Size_t AndersenBase::MaxPointsToSetSize = 0;
+u32_t AndersenBase::AveragePointsToSetSize = 0;
+u32_t AndersenBase::MaxPointsToSetSize = 0;
 double AndersenBase::timeOfProcessCopyGep = 0;
 double AndersenBase::timeOfProcessLoadStore = 0;
 double AndersenBase::timeOfUpdateCallGraph = 0;
@@ -875,13 +875,13 @@ void Andersen::dumpTopLevelPtsTo()
             {
                 outs() << "\t\tPointsTo: { ";
 
-                multiset<Size_t> line;
+                multiset<u32_t> line;
                 for (PointsTo::iterator it = pts.begin(), eit = pts.end();
                         it != eit; ++it)
                 {
                     line.insert(*it);
                 }
-                for (multiset<Size_t>::const_iterator it = line.begin(); it != line.end(); ++it)
+                for (multiset<u32_t>::const_iterator it = line.begin(); it != line.end(); ++it)
                     outs() << *it << " ";
                 outs() << "}\n\n";
             }

package/lib/WPA/AndersenSFR.cpp

@@ -96,7 +96,7 @@ bool AndersenSFR::processGepPts(PointsTo& pts, const GepCGEdge* edge)
             for (NodeID ptd : srcInits)
                 sortSrcInits.insert(ptd);
 
-            Size_t offset = SVFUtil::dyn_cast<NormalGepCGEdge>(edge)->getFieldOffset();
+            s64_t offset = SVFUtil::dyn_cast<NormalGepCGEdge>(edge)->getConstantFieldIdx();
             fieldExpand(sortSrcInits, offset, dst->strides, tmpDstPts);
         }
 
@@ -116,7 +116,7 @@ bool AndersenSFR::processGepPts(PointsTo& pts, const GepCGEdge* edge)
 /*!
  *
  */
-void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides, PointsTo& expandPts)
+void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides, PointsTo& expandPts)
 {
     numOfFieldExpand++;
 
@@ -131,16 +131,16 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
         {
             PAGNode* initPN = pag->getGNode(init);
             const MemObj* obj = pag->getBaseObj(init);
-            const Size_t maxLimit = obj->getMaxFieldOffsetLimit();
-            Size_t initOffset;
+            const u32_t maxLimit = obj->getMaxFieldOffsetLimit();
+            s64_t initOffset;
             if (GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(initPN))
-                initOffset = gepNode->getFieldOffset();
+                initOffset = gepNode->getConstantFieldIdx();
             else if (SVFUtil::isa<FIObjVar>(initPN) || SVFUtil::isa<DummyObjVar>(initPN))
                 initOffset = 0;
             else
                 assert(false && "Not an object node!!");
 
-            Set<Size_t> offsets;
+            Set<s64_t> offsets;
             offsets.insert(offset);
 
             // calculate offsets
@@ -151,7 +151,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
                 for (auto _f : offsets)
                     for (auto _s : strides)
                     {
-                        Size_t _f1 = _f + _s;
+                        s64_t _f1 = _f + _s;
                         loopFlag = (offsets.find(_f1) == offsets.end()) && (initOffset + _f1 < maxLimit);
                         if (loopFlag)
                             offsets.insert(_f1);
@@ -159,7 +159,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
             }
 
             // get gep objs
-            for (Size_t _f : offsets)
+            for (s64_t _f : offsets)
             {
                 NodeID gepId = consCG->getGepObjVar(init, LocationSet(_f));
                 initials.erase(gepId);  // gep id in initials should be removed to avoid redundant derivation

package/lib/WPA/AndersenStat.cpp

@@ -228,8 +228,8 @@ void AndersenStat::statNullPtr()
         PAGNode* pagNode = iter->second;
         if (pagNode->isTopLevelPtr() == false)
             continue;
-        PAGEdge::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
-        PAGEdge::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
+        SVFStmt::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(SVFStmt::Store);
+        SVFStmt::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(SVFStmt::Load);
         if (inComingStore.empty()==false || outGoingLoad.empty()==false)
         {
             ///TODO: change the condition here to fetch the points-to set

package/lib/WPA/CSC.cpp

@@ -73,7 +73,7 @@ void CSC::find(NodeStack& candidates)
 /*!
  *
  */
-void CSC::visit(NodeID nodeId, Size_t _w)
+void CSC::visit(NodeID nodeId, s64_t _w)
 {
 //    pwcReps[nodeId] = _scc->repNode(nodeId);
     setVisited(nodeId);
@@ -85,9 +85,9 @@ void CSC::visit(NodeID nodeId, Size_t _w)
     ConstraintNode* node = _consG->getConstraintNode(nodeId);
     for (ConstraintNode::const_iterator eit = node->directOutEdgeBegin(); eit != node->directOutEdgeEnd(); ++eit)
     {
-        Size_t offset;
+        s64_t offset;
         if (NormalGepCGEdge* gepCGEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(*eit))
-            offset = gepCGEdge->getFieldOffset();
+            offset = gepCGEdge->getConstantFieldIdx();
         else
             offset = 0;
         NodeID dstId = (*eit)->getDstID();
@@ -107,8 +107,8 @@ void CSC::visit(NodeID nodeId, Size_t _w)
         if (_consG->hasEdge(node, backNode, ConstraintEdge::NormalGep))
         {
             NormalGepCGEdge* normalGep = SVFUtil::dyn_cast<NormalGepCGEdge>(_consG->getEdge(node, backNode, ConstraintEdge::NormalGep));
-            Size_t _w = normalGep->getFieldOffset();
-            Size_t _l = _D[nodeId] +_w - _D[backNodeId];
+            s64_t _w = normalGep->getConstantFieldIdx();
+            s64_t _l = _D[nodeId] +_w - _D[backNodeId];
             backNode->strides.set(_l);
             for (auto cNodeId : _C)
                 _consG->getConstraintNode(cNodeId)->strides.set(_l);
@@ -116,7 +116,7 @@ void CSC::visit(NodeID nodeId, Size_t _w)
         else if (_consG->hasEdge(node, backNode, ConstraintEdge::VariantGep) ||
                  _consG->hasEdge(node, backNode, ConstraintEdge::Copy))
         {
-            Size_t _l = _D[nodeId] - _D[backNodeId];
+            s64_t _l = _D[nodeId] - _D[backNodeId];
             backNode->strides.set(_l);
             for (auto cNodeId : _C)
                 _consG->getConstraintNode(cNodeId)->strides.set(_l);

package/lib/WPA/FlowSensitive.cpp

@@ -472,7 +472,8 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
     const PointsTo& srcPts = getPts(edge->getPAGSrcNodeID());
 
     PointsTo tmpDstPts;
-    if (SVFUtil::isa<VariantGepStmt>(edge->getPAGEdge()))
+    const GepStmt* gepStmt = SVFUtil::cast<GepStmt>(edge->getPAGEdge());
+    if (gepStmt->isVariantFieldGep())
     {
         for (NodeID o : srcPts)
         {
@@ -486,7 +487,7 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
             tmpDstPts.set(getFIObjVar(o));
         }
     }
-    else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(edge->getPAGEdge()))
+    else 
     {
         for (NodeID o : srcPts)
         {
@@ -496,14 +497,10 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
                 continue;
             }
 
-            NodeID fieldSrcPtdNode = getGepObjVar(o, normalGep->getLocationSet());
+            NodeID fieldSrcPtdNode = getGepObjVar(o, gepStmt->getLocationSet());
             tmpDstPts.set(fieldSrcPtdNode);
         }
     }
-    else
-    {
-        assert(false && "FlowSensitive::processGep: New type GEP edge type?");
-    }
 
     if (unionPts(edge->getPAGDstNodeID(), tmpDstPts))
         changed = true;

package/lib/WPA/FlowSensitiveStat.cpp

@@ -276,8 +276,8 @@ void FlowSensitiveStat::statNullPtr()
     {
         NodeID pagNodeId = iter->first;
         PAGNode* pagNode = iter->second;
-        PAGEdge::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
-        PAGEdge::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
+        SVFStmt::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(SVFStmt::Store);
+        SVFStmt::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(SVFStmt::Load);
         if (inComingStore.empty()==false || outGoingLoad.empty()==false)
         {
             ///TODO: change the condition here to fetch the points-to set

package/lib/WPA/FlowSensitiveTBHC.cpp

@@ -146,7 +146,7 @@ bool FlowSensitiveTBHC::propAlongIndirectEdge(const IndirectSVFGEdge* edge)
         if (GepObjVar *gep = SVFUtil::dyn_cast<GepObjVar>(pag->getGNode(o)))
         {
             // Want the geps which are at the same "level" as this one (same mem obj, same offset).
-            const NodeBS &geps = getGepObjsFromMemObj(gep->getMemObj(), gep->getFieldOffset());
+            const NodeBS &geps = getGepObjsFromMemObj(gep->getMemObj(), gep->getConstantFieldIdx());
             for (NodeID g : geps)
             {
                 const DIType *gepType = getType(g);
@@ -299,7 +299,8 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
         }
         else
         {
-            if (SVFUtil::isa<VariantGepStmt>(gep->getPAGEdge()))
+            const GepStmt* gepStmt = SVFUtil::cast<GepStmt>(gep->getPAGEdge());
+            if (gepStmt->isVariantFieldGep())
             {
                 setObjFieldInsensitive(oq);
                 tmpDstPts.set(oq);
@@ -314,7 +315,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                     }
                 }
             }
-            else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(gep->getPAGEdge()))
+            else
             {
                 const DIType *baseType = getType(oq);
 
@@ -328,7 +329,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                 }
 
                 if (DCHGraph::isAgg(baseType) && baseType->getTag() != dwarf::DW_TAG_array_type
-                        && normalGep->getFieldOffset() >= dchg->getNumFields(baseType))
+                        && 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
@@ -342,7 +343,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                 else
                 {
                     // Operate on the field and all its clones.
-                    const NodeBS fieldClones = getGepObjClones(oq, normalGep->getFieldOffset());
+                    const NodeBS fieldClones = getGepObjClones(oq, gepStmt->getConstantFieldIdx());
                     for (NodeID fc : fieldClones)
                     {
                         gepToSVFGRetrievers[getOriginalObj(fc)].set(gep->getId());
@@ -350,10 +351,6 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                     }
                 }
             }
-            else
-            {
-                assert(false && "FSTBHC: new gep edge?");
-            }
         }
     }
 

package/lib/WPA/TypeAnalysis.cpp

@@ -104,7 +104,7 @@ void TypeAnalysis::dumpCHAStats()
         return;
     }
 
-    s32_t pure_abstract_class_num = 0,
+    s64_t pure_abstract_class_num = 0,
           multi_inheritance_class_num = 0;
     for (CHGraph::const_iterator it = chgraph->begin(), eit = chgraph->end();
             it != eit; ++it)
@@ -127,7 +127,7 @@ void TypeAnalysis::dumpCHAStats()
      * vtbl max vfunction
      * pure abstract class
      */
-    s32_t vtblnum = 0,
+    s64_t vtblnum = 0,
           vfunc_total = 0,
           vtbl_max = 0,
           pure_abstract = 0;
@@ -139,7 +139,7 @@ void TypeAnalysis::dumpCHAStats()
         if (node->isPureAbstract())
             pure_abstract++;
 
-        s32_t vfuncs_size = 0;
+        s64_t vfuncs_size = 0;
         const vector<CHNode::FuncVector>& vecs = node->getVirtualFunctionVectors();
         for (vector<CHNode::FuncVector>::const_iterator vit = vecs.begin(),
                 veit = vecs.end(); vit != veit; ++vit)

package/package.json

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