svf-tools 1.0.675 → 1.0.677

package/README.md

@@ -42,7 +42,7 @@
 
 <br />
 
-#### We are looking for self-motivated PhD students and we welcome industry collaboration/sponsorship to improve SVF (Please contact yulei.sui@uts.edu.au if you are interested)
+#### We are looking for self-motivated PhD students and we welcome industry collaboration/sponsorship to improve SVF (Please contact y.sui@unsw.edu.au if you are interested)
 
 <br />
 <p>We release SVF source code in the hope of benefiting others. You are kindly asked to acknowledge usage of the tool by citing some of our publications listed http://svf-tools.github.io/SVF, especially the following two: </p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.675",
+  "version": "1.0.677",
   "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/svf/lib/SABER/SaberSVFGBuilder.cpp

@@ -261,27 +261,23 @@ void SaberSVFGBuilder::rmIncomingEdgeForSUStore(BVDataPTAImpl* pta)
 
         if(const StoreSVFGNode* stmtNode = SVFUtil::dyn_cast<StoreSVFGNode>(node))
         {
-            for(const SVFStmt* svfstmt : pta->getPAG()->getSVFStmtList(stmtNode->getICFGNode()))
+            if(SVFUtil::isa<StoreStmt>(stmtNode->getPAGEdge()))
             {
-                if(SVFUtil::isa<StoreStmt>(svfstmt))
+                NodeID singleton;
+                if(isStrongUpdate(node, singleton, pta))
                 {
-                    NodeID singleton;
-                    if(isStrongUpdate(node, singleton, pta))
+                    Set<SVFGEdge*> toRemove;
+                    for (SVFGNode::const_iterator it2 = node->InEdgeBegin(), eit2 = node->InEdgeEnd(); it2 != eit2; ++it2)
                     {
-                        Set<SVFGEdge*> toRemove;
-                        for (SVFGNode::const_iterator it2 = node->InEdgeBegin(), eit2 = node->InEdgeEnd(); it2 != eit2; ++it2)
+                        if ((*it2)->isIndirectVFGEdge())
                         {
-                            if ((*it2)->isIndirectVFGEdge())
-                            {
-                                toRemove.insert(*it2);
-                            }
-                        }
-                        for (SVFGEdge* edge: toRemove)
-                        {
-                            svfg->removeSVFGEdge(edge);
+                            toRemove.insert(*it2);
                         }
                     }
-
+                    for (SVFGEdge* edge: toRemove)
+                    {
+                        svfg->removeSVFGEdge(edge);
+                    }
                 }
             }
         }

package/svf-llvm/include/SVF-LLVM/LLVMLoopAnalysis.h

@@ -47,8 +47,7 @@ public:
     virtual ~LLVMLoopAnalysis() = default;
 
     /// Build llvm loops based on LoopInfo analysis
-    virtual void buildLLVMLoops(SVFModule *mod, std::vector<const Loop *> &llvmLoops,
-                                llvm::LoopInfoBase<llvm::BasicBlock, llvm::Loop> * loopInfo);
+    virtual void buildLLVMLoops(SVFModule *mod, ICFG* icfg);
 
     /// Start from here
     virtual void build(ICFG *icfg);

package/svf-llvm/lib/LLVMLoopAnalysis.cpp

@@ -44,7 +44,7 @@ using namespace SVFUtil;
  * @param mod SVF module
  * @param llvmLoops output llvm loops
  */
-void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, std::vector<const Loop *> &llvmLoops, llvm::LoopInfoBase<llvm::BasicBlock, llvm::Loop> * loopInfo)
+void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, ICFG* icfg)
 {
     llvm::DominatorTree DT = llvm::DominatorTree();
     std::vector<const Loop *> loop_stack;
@@ -57,8 +57,10 @@ void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, std::vector<const Loop *>
             // do not analyze external call
             if (SVFUtil::isExtCall(svffun)) continue;
             DT.recalculate(const_cast<Function&>(*func));
-            loopInfo->analyze(DT);
-            for (const auto &loop: *loopInfo)
+            llvm::LoopInfoBase<llvm::BasicBlock, llvm::Loop> loopInfo;
+            std::vector<const Loop*> llvmLoops;
+            loopInfo.analyze(DT);
+            for (const auto &loop: loopInfo)
             {
                 loop_stack.push_back(loop);
             }
@@ -73,6 +75,7 @@ void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, std::vector<const Loop *>
                     loop_stack.push_back(subloop);
                 }
             }
+            buildSVFLoops(icfg, llvmLoops);
         }
     }
 }
@@ -84,9 +87,7 @@ void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, std::vector<const Loop *>
 void LLVMLoopAnalysis::build(ICFG *icfg)
 {
     std::vector<const Loop *> llvmLoops;
-    llvm::LoopInfoBase<llvm::BasicBlock, llvm::Loop> loopInfo;
-    buildLLVMLoops(PAG::getPAG()->getModule(), llvmLoops, &loopInfo);
-    buildSVFLoops(icfg, llvmLoops);
+    buildLLVMLoops(PAG::getPAG()->getModule(), icfg);
 }
 
 /*!