svf-tools 1.0.331 → 1.0.335

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -195,7 +195,7 @@ LocationSet SymbolTableInfo::getModulusOffset(const MemObj* obj, const LocationS
     /// of current struct. Make the offset positive so we can still get a node within current
     /// struct to represent this obj.
 
-    Size_t offset = ls.accumulateConstantOffset();
+    Size_t offset = ls.accumulateConstantFieldIdx();
     if(offset < 0)
     {
         writeWrnMsg("try to create a gep node with negative offset.");
@@ -582,7 +582,7 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
             //       as we simply return new offset by mod operation without checking its
             //       correctness in LocSymTableInfo::getModulusOffset(). So the following
             //       assertion may fail. Try to refine the new memory model.
-            //assert(ls.getOffset() == 0 && "cannot get a field from a non-struct type");
+            //assert(ls.getFieldOffset() == 0 && "cannot get a field from a non-struct type");
             return (hasPtrObj() == false);
         }
     }

package/lib/SVF-FE/DCHG.cpp

@@ -103,7 +103,7 @@ void DCHGraph::handleDIDerivedType(const DIDerivedType *derivedType)
         assert(SVFUtil::isa<DIType>(derivedType->getScope()) && "inheriting from non-type?");
         DCHEdge *edge = addEdge(SVFUtil::dyn_cast<DIType>(derivedType->getScope()),
                                 derivedType->getBaseType(), DCHEdge::INHERITANCE);
-        // If the offset does not exist (for primary base), getOffset should return 0.
+        // If the offset does not exist (for primary base), getFieldOffset should return 0.
         edge->setOffset(derivedType->getOffsetInBits());
         break;
     }

package/lib/SVF-FE/Graph2Json.cpp

@@ -53,7 +53,7 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
                 if(edge->getEdgeKind()==PAGEdge::NormalGep)
                 {
                     const NormalGepStmt* gepEdge = SVFUtil::cast<NormalGepStmt>(edge);
-                    edge_obj["offset"] = gepEdge->getOffset();
+                    edge_obj["offset"] = gepEdge->getFieldOffset();
                 }
                 llvm::json::Value edge_value = llvm::json::Object{edge_obj};
                 PAGEdge_array.push_back(edge_value);

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -263,7 +263,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
                 assert(0);
             }
             //add the translated offset
-            ls.setFldIdx(ls.accumulateConstantOffset() + so[idx]);
+            ls.setFldIdx(ls.accumulateConstantFieldIdx() + so[idx]);
         }
     }
     return true;
@@ -1289,7 +1289,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 // We have vArg3 points to the entry of _Rb_tree_node_base { color; parent; left; right; }.
                 // Now we calculate the offset from base to vArg3
                 NodeID vnArg3 = pag->getValueNode(vArg3);
-                Size_t offset = pag->getLocationSetFromBaseNode(vnArg3).accumulateConstantOffset();
+                Size_t offset = pag->getLocationSetFromBaseNode(vnArg3).accumulateConstantFieldIdx();
 
                 // We get all flattened fields of base
                 vector<LocationSet> fields;
@@ -1313,7 +1313,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
 
                 Value *vArg = cs.getArgument(0);
                 NodeID vnArg = pag->getValueNode(vArg);
-                Size_t offset = pag->getLocationSetFromBaseNode(vnArg).accumulateConstantOffset();
+                Size_t offset = pag->getLocationSetFromBaseNode(vnArg).accumulateConstantFieldIdx();
 
                 // We get all fields
                 vector<LocationSet> fields;
@@ -1613,7 +1613,7 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
     }
 
     pag->addToSVFStmtList(icfgNode,edge);
-    icfgNode->addPAGEdge(edge);
+    icfgNode->addSVFStmt(edge);
 }
 
 

package/lib/Util/TypeBasedHeapCloning.cpp

@@ -155,7 +155,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
     unsigned totalOffset = offset;
     if (const GepObjVar *baseGep = SVFUtil::dyn_cast<GepObjVar>(baseNode))
     {
-        totalOffset += baseGep->getOffset();
+        totalOffset += baseGep->getFieldOffset();
     }
 
     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->getOffset() == totalOffset)
+            if (gepNode->getFieldOffset() == 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 getOffset.
+        // fldIdx is what is returned by getFieldOffset.
         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->getOffset());
+        const NodeBS &clones = getGepObjClones(gepObj->getBaseNode(), gepObj->getFieldOffset());
         // 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->getOffset());
+        addGepToObj(clone, gepObj->getBaseNode(), gepObj->getFieldOffset());
 
         addClone(o, clone);
         addClone(getOriginalObj(o), clone);

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)->getOffset();
+            Size_t offset = SVFUtil::dyn_cast<NormalGepCGEdge>(edge)->getFieldOffset();
             fieldExpand(sortSrcInits, offset, dst->strides, tmpDstPts);
         }
 
@@ -134,7 +134,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
             const Size_t maxLimit = obj->getMaxFieldOffsetLimit();
             Size_t initOffset;
             if (GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(initPN))
-                initOffset = gepNode->getOffset();
+                initOffset = gepNode->getFieldOffset();
             else if (SVFUtil::isa<FIObjVar>(initPN) || SVFUtil::isa<DummyObjVar>(initPN))
                 initOffset = 0;
             else

package/lib/WPA/CSC.cpp

@@ -87,7 +87,7 @@ void CSC::visit(NodeID nodeId, Size_t _w)
     {
         Size_t offset;
         if (NormalGepCGEdge* gepCGEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(*eit))
-            offset = gepCGEdge->getOffset();
+            offset = gepCGEdge->getFieldOffset();
         else
             offset = 0;
         NodeID dstId = (*eit)->getDstID();
@@ -107,7 +107,7 @@ 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->getOffset();
+            Size_t _w = normalGep->getFieldOffset();
             Size_t _l = _D[nodeId] +_w - _D[backNodeId];
             backNode->strides.set(_l);
             for (auto cNodeId : _C)

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->getOffset());
+            const NodeBS &geps = getGepObjsFromMemObj(gep->getMemObj(), gep->getFieldOffset());
             for (NodeID g : geps)
             {
                 const DIType *gepType = getType(g);
@@ -328,7 +328,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                 }
 
                 if (DCHGraph::isAgg(baseType) && baseType->getTag() != dwarf::DW_TAG_array_type
-                        && normalGep->getOffset() >= dchg->getNumFields(baseType))
+                        && normalGep->getFieldOffset() >= 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 +342,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                 else
                 {
                     // Operate on the field and all its clones.
-                    const NodeBS fieldClones = getGepObjClones(oq, normalGep->getOffset());
+                    const NodeBS fieldClones = getGepObjClones(oq, normalGep->getFieldOffset());
                     for (NodeID fc : fieldClones)
                     {
                         gepToSVFGRetrievers[getOriginalObj(fc)].set(gep->getId());

package/package.json

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