svf-tools 1.0.342 → 1.0.346

package/lib/Util/NodeIDAllocator.cpp

@@ -54,6 +54,10 @@ namespace SVF
             // We allocate objects from 0(-ish, considering the special nodes) to # of objects.
             id = numObjects;
         }
+        else if (strategy == Strategy::REVERSE_DENSE)
+        {
+            id = UINT_MAX - numObjects;
+        }
         else if (strategy == Strategy::SEQ)
         {
             // Everything is sequential and intermixed.
@@ -87,6 +91,10 @@ namespace SVF
             // Nothing different to the other case.
             id =  numObjects;
         }
+        else if (strategy == Strategy::REVERSE_DENSE)
+        {
+            id = UINT_MAX - numObjects;
+        }
         else if (strategy == Strategy::SEQ)
         {
             // Everything is sequential and intermixed.
@@ -128,6 +136,10 @@ namespace SVF
             //       of NodeID (though it is already in use elsewhere).
             id = UINT_MAX - numValues;
         }
+        else if (strategy == Strategy::REVERSE_DENSE)
+        {
+            id = numValues;
+        }
         else if (strategy == Strategy::SEQ)
         {
             // Everything is sequential and intermixed.

package/lib/Util/Options.cpp

@@ -25,7 +25,8 @@ namespace SVF
         llvm::cl::init(NodeIDAllocator::Strategy::SEQ),
         llvm::cl::desc("Method of allocating (LLVM) values and memory objects as node IDs"),
         llvm::cl::values(
-            clEnumValN(NodeIDAllocator::Strategy::DENSE, "dense", "allocate objects together and values together, separately"),
+            clEnumValN(NodeIDAllocator::Strategy::DENSE, "dense", "allocate objects together [0-n] and values together [m-MAX], separately"),
+            clEnumValN(NodeIDAllocator::Strategy::DENSE, "reverse-dense", "like dense but flipped, objects are [m-MAX], values are [0-n]"),
             clEnumValN(NodeIDAllocator::Strategy::SEQ, "seq", "allocate values and objects sequentially, intermixed (default)"),
             clEnumValN(NodeIDAllocator::Strategy::DEBUG, "debug", "allocate value and objects sequentially, intermixed, except GEP objects as offsets")));
 

package/lib/Util/TypeBasedHeapCloning.cpp

@@ -565,7 +565,7 @@ void TypeBasedHeapCloning::validateTBHCTests(SVFModule*)
     for (u32_t i = 0; i < llvmModuleSet->getModuleNum(); ++i)
     {
         const SVFIR::CallSiteSet &callSites = ppag->getCallSiteSet();
-        for (const CallBlockNode *cbn : callSites)
+        for (const CallICFGNode *cbn : callSites)
         {
             const CallSite &cs = SVFUtil::getLLVMCallSite(cbn->getCallSite());
             const Function *fn = cs.getCalledFunction();

package/lib/WPA/Andersen.cpp

@@ -654,7 +654,7 @@ bool Andersen::updateCallGraph(const CallSiteToFunPtrMap& callsites)
 void Andersen::heapAllocatorViaIndCall(CallSite cs, NodePairSet &cpySrcNodes)
 {
     assert(SVFUtil::getCallee(cs) == nullptr && "not an indirect callsite?");
-    RetBlockNode* retBlockNode = pag->getICFG()->getRetBlockNode(cs.getInstruction());
+    RetICFGNode* retBlockNode = pag->getICFG()->getRetBlockNode(cs.getInstruction());
     const PAGNode* cs_return = pag->getCallSiteRet(retBlockNode);
     NodeID srcret;
     CallSite2DummyValPN::const_iterator it = callsite2DummyValPN.find(cs);
@@ -687,8 +687,8 @@ void Andersen::connectCaller2CalleeParams(CallSite cs, const SVFFunction* F, Nod
 
     DBOUT(DAndersen, outs() << "connect parameters from indirect callsite " << *cs.getInstruction() << " to callee " << *F << "\n");
 
-    CallBlockNode* callBlockNode = pag->getICFG()->getCallBlockNode(cs.getInstruction());
-    RetBlockNode* retBlockNode = pag->getICFG()->getRetBlockNode(cs.getInstruction());
+    CallICFGNode* callBlockNode = pag->getICFG()->getCallBlockNode(cs.getInstruction());
+    RetICFGNode* retBlockNode = pag->getICFG()->getRetBlockNode(cs.getInstruction());
 
     if(SVFUtil::isHeapAllocExtFunViaRet(F) && pag->callsiteHasRet(retBlockNode))
     {

package/lib/WPA/FlowSensitive.cpp

@@ -661,7 +661,7 @@ bool FlowSensitive::updateCallGraph(const CallSiteToFunPtrMap& callsites)
     const CallEdgeMap &andersCallEdgeMap = ander->getIndCallMap();
     for (typename CallEdgeMap::value_type &csfs : newEdges)
     {
-        const CallBlockNode *potentialCallSite = csfs.first;
+        const CallICFGNode *potentialCallSite = csfs.first;
         FunctionSet &potentialFunctionSet = csfs.second;
 
         // Check this callsite even calls anything per Andersen's.
@@ -709,7 +709,7 @@ void FlowSensitive::connectCallerAndCallee(const CallEdgeMap& newEdges, SVFGEdge
     CallEdgeMap::const_iterator eiter = newEdges.end();
     for (; iter != eiter; iter++)
     {
-        const CallBlockNode* cs = iter->first;
+        const CallICFGNode* cs = iter->first;
         const FunctionSet & functions = iter->second;
         for (FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
         {

package/lib/WPA/TypeAnalysis.cpp

@@ -79,7 +79,7 @@ void TypeAnalysis::callGraphSolveBasedOnCHA(const CallSiteToFunPtrMap& callsites
 {
     for(CallSiteToFunPtrMap::const_iterator iter = callsites.begin(), eiter = callsites.end(); iter!=eiter; ++iter)
     {
-        const CallBlockNode* cbn = iter->first;
+        const CallICFGNode* cbn = iter->first;
         CallSite cs = SVFUtil::getLLVMCallSite(cbn->getCallSite());
         if (isVirtualCallSite(cs))
         {

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -441,7 +441,7 @@ void VersionedFlowSensitive::buildDeltaMaps(void)
     deltaMap.resize(svfg->getTotalNodeNum(), false);
 
     // Call block nodes corresponding to all delta nodes.
-    Set<const CallBlockNode *> deltaCBNs;
+    Set<const CallICFGNode *> deltaCBNs;
 
     for (SVFG::const_iterator it = svfg->begin(); it != svfg->end(); ++it)
     {
@@ -463,10 +463,10 @@ void VersionedFlowSensitive::buildDeltaMaps(void)
             if (isDelta)
             {
                 // TODO: could we use deltaCBNs in the call above, avoiding this loop?
-                for (const CallBlockNode *cbn : callsites) deltaCBNs.insert(cbn);
+                for (const CallICFGNode *cbn : callsites) deltaCBNs.insert(cbn);
             }
         }
-        else if (const CallBlockNode *cbn = svfg->isCallSiteRetSVFGNode(s))
+        else if (const CallICFGNode *cbn = svfg->isCallSiteRetSVFGNode(s))
         {
             isDelta = cbn->isIndirectCall();
             if (isDelta) deltaCBNs.insert(cbn);
@@ -482,7 +482,7 @@ void VersionedFlowSensitive::buildDeltaMaps(void)
         const NodeID l = it->first;
         const SVFGNode *s = it->second;
 
-        if (const CallBlockNode *cbn = SVFUtil::dyn_cast<CallBlockNode>(s->getICFGNode()))
+        if (const CallICFGNode *cbn = SVFUtil::dyn_cast<CallICFGNode>(s->getICFGNode()))
         {
             if (deltaCBNs.find(cbn) != deltaCBNs.end()) deltaSourceMap[l] = true;
         }

package/lib/WPA/WPAPass.cpp

@@ -247,7 +247,7 @@ ModRefInfo WPAPass::getModRefInfo(const CallInst* callInst)
 {
     assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
-    const CallBlockNode* cbn = icfg->getCallBlockNode(callInst);
+    const CallICFGNode* cbn = icfg->getCallBlockNode(callInst);
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(cbn);
 }
 
@@ -258,7 +258,7 @@ ModRefInfo WPAPass::getModRefInfo(const CallInst* callInst, const Value* V)
 {
     assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
-    const CallBlockNode* cbn = icfg->getCallBlockNode(callInst);
+    const CallICFGNode* cbn = icfg->getCallBlockNode(callInst);
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(cbn, V);
 }
 
@@ -269,7 +269,7 @@ ModRefInfo WPAPass::getModRefInfo(const CallInst* callInst1, const CallInst* cal
 {
     assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
-    const CallBlockNode* cbn1 = icfg->getCallBlockNode(callInst1);
-    const CallBlockNode* cbn2 = icfg->getCallBlockNode(callInst2);
+    const CallICFGNode* cbn1 = icfg->getCallBlockNode(callInst1);
+    const CallICFGNode* cbn2 = icfg->getCallBlockNode(callInst2);
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(cbn1, cbn2);
 }

package/package.json

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