svf-tools 1.0.685 → 1.0.687

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.685",
+  "version": "1.0.687",
   "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/include/AbstractExecution/BoundedZ3Expr.h

@@ -179,6 +179,7 @@ public:
             return lhs;
         else
             assert(false && "undefined operation +oo + -oo");
+        abort();
     }
 
     friend BoundedZ3Expr operator-(const BoundedZ3Expr &lhs)
@@ -198,6 +199,7 @@ public:
             return lhs;
         else
             assert(false && "undefined operation +oo - +oo");
+        abort();
     }
 
     friend BoundedZ3Expr operator*(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -225,7 +227,7 @@ public:
         else
             // TODO: +oo/-oo L'Hôpital's rule?
             return eq(lhs, rhs) ? plus_infinity() : minus_infinity();
-
+        abort();
     }
 
     friend BoundedZ3Expr operator%(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)
@@ -241,6 +243,7 @@ public:
         else
             // TODO: +oo/-oo L'Hôpital's rule?
             return eq(lhs, rhs) ? plus_infinity() : minus_infinity();
+        abort();
     }
 
     friend BoundedZ3Expr operator^(const BoundedZ3Expr &lhs, const BoundedZ3Expr &rhs)

package/svf/include/AbstractExecution/NumericLiteral.h

@@ -140,6 +140,7 @@ public:
         else
         {
             assert(false && "other literal?");
+            abort();
         }
     }
 

package/svf/include/SVFIR/SVFIRRW.h

@@ -408,7 +408,7 @@ private:
     cJSON* toJson(const LocationSet& ls);
     cJSON* toJson(const SVFLoop* loop);
     cJSON* toJson(const MemObj* memObj);
-    cJSON* toJson(const ObjTypeInfo* objTypeInfo); // Ensures ownership
+    cJSON* toJson(const ObjTypeInfo* objTypeInfo); // Only owned by MemObj
     cJSON* toJson(const SVFLoopAndDomInfo* ldInfo); // Only owned by SVFFunction
     cJSON* toJson(const StInfo* type); // Ensure Only owned by SVFType
 

package/svf-llvm/lib/LLVMModule.cpp

@@ -157,7 +157,7 @@ void LLVMModuleSet::build()
 void LLVMModuleSet::createSVFDataStructure()
 {
 
-    for (Module& mod : modules)
+    for (const Module& mod : modules)
     {
         /// Function
         for (const Function& func : mod.functions())
@@ -325,49 +325,35 @@ void LLVMModuleSet::initDomTree(SVFFunction* svffun, const Function* fun)
     LLVMUtil::getFunReachableBBs(fun, reachableBBs);
     ld->setReachableBBs(reachableBBs);
 
-    for (Function::const_iterator bit = fun->begin(), ebit = fun->end(); bit != ebit; ++bit)
+    for (const BasicBlock &bb : fun->getBasicBlockList())
     {
-        const BasicBlock* bb = &*bit;
-        SVFBasicBlock* svf_bb = getSVFBasicBlock(bb);
-        if(DomTreeNode *dtNode = dt.getNode(const_cast<BasicBlock*>(bb)))
+        SVFBasicBlock* svfBB = getSVFBasicBlock(&bb);
+        if (DomTreeNode* dtNode = dt.getNode(&bb))
         {
-            DomTreeNode::iterator DI = dtNode->begin();
-            if (DI != dtNode->end())
+            SVFLoopAndDomInfo::BBSet& bbSet = ld->getDomTreeMap()[svfBB];
+            for (const auto domBB : *dtNode)
             {
-                for (DomTreeNode::iterator DI = dtNode->begin(), DE = dtNode->end(); DI != DE; ++DI)
-                {
-                    const SVFBasicBlock* dombb = getSVFBasicBlock((*DI)->getBlock());
-                    ld->getDomTreeMap()[svf_bb].insert(dombb);
-                }
-            }
-            else
-            {
-                ld->getDomTreeMap()[svf_bb] = Set<const SVFBasicBlock* >();
+                const auto* domSVFBB = getSVFBasicBlock(domBB->getBlock());
+                bbSet.insert(domSVFBB);
             }
         }
 
-        if(DomTreeNode * pdtNode = pdt.getNode(const_cast<BasicBlock*>(bb)))
+        if (DomTreeNode* pdtNode = pdt.getNode(&bb))
         {
-            DomTreeNode::iterator DI = pdtNode->begin();
-            if (DI != pdtNode->end())
+            SVFLoopAndDomInfo::BBSet& bbSet = ld->getPostDomTreeMap()[svfBB];
+            for (const auto domBB : *pdtNode)
             {
-                for (DomTreeNode::iterator DI = pdtNode->begin(), DE = pdtNode->end(); DI != DE; ++DI)
-                {
-                    const SVFBasicBlock* dombb = getSVFBasicBlock((*DI)->getBlock());
-                    ld->getPostDomTreeMap()[svf_bb].insert(dombb);
-                }
-            }
-            else
-            {
-                ld->getPostDomTreeMap()[svf_bb] = Set<const SVFBasicBlock* >();
+                const auto* domSVFBB = getSVFBasicBlock(domBB->getBlock());
+                bbSet.insert(domSVFBB);
             }
         }
-        if (const Loop *loop = loopInfo.getLoopFor(bb))
+
+        if (const Loop* loop = loopInfo.getLoopFor(&bb))
         {
-            for (BasicBlock* loopBlock:loop->getBlocks())
+            for (const BasicBlock* loopBlock : loop->getBlocks())
             {
                 const SVFBasicBlock* loopbb = getSVFBasicBlock(loopBlock);
-                ld->addToBB2LoopMap(svf_bb,loopbb);
+                ld->addToBB2LoopMap(svfBB, loopbb);
             }
         }
     }
@@ -782,13 +768,6 @@ void LLVMModuleSet::buildGlobalDefToRepMap()
             : (assert(!globals.empty() && "Empty global set"),
                *globals.begin());
 
-        for (Set<GlobalVariable*>::const_iterator sit = globals.begin(),
-                seit = globals.end(); sit != seit; ++sit)
-        {
-            GlobalVariable *cur = *sit;
-            GlobalDefToRepMap[cur] = rep;
-        }
-
         for (const GlobalVariable* cur : globals)
         {
             GlobalDefToRepMap[cur] = rep;

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1421,16 +1421,24 @@ void SVFIRBuilder::handleExtCall(CallBase* cs, const Function *callee)
                         const Value* src = cs->getArgOperand(1);
                         if(const GetElementPtrInst* gep = SVFUtil::dyn_cast<GetElementPtrInst>(src))
                             src = stripConstantCasts(gep->getPointerOperand());
-                        if(const GlobalVariable* glob = SVFUtil::dyn_cast<GlobalVariable>(src))
+
+                        auto getHookFn = [](const Value* src)->const Function*
+                        {
+                            if (!SVFUtil::isa<GlobalVariable>(src))
+                                return nullptr;
+
+                            auto *glob = SVFUtil::cast<GlobalVariable>(src);
+                            if (!glob->hasInitializer() || !SVFUtil::isa<ConstantDataArray>(glob->getInitializer()))
+                                return nullptr;
+
+                            auto *constarray = SVFUtil::cast<ConstantDataArray>(glob->getInitializer());
+                            return LLVMUtil::getProgFunction(constarray->getAsCString().str());
+                        };
+
+                        if (const Function *fn = getHookFn(src))
                         {
-                            if(const ConstantDataArray* constarray = SVFUtil::dyn_cast<ConstantDataArray>(glob->getInitializer()))
-                            {
-                                if(const Function* fun = LLVMUtil::getProgFunction(constarray->getAsCString().str()))
-                                {
-                                    NodeID srcNode = getValueNode(fun);
-                                    addCopyEdge(srcNode,  getValueNode(cs));
-                                }
-                            }
+                            NodeID srcNode = getValueNode(fn);
+                            addCopyEdge(srcNode,  getValueNode(cs));
                         }
                     }
                     else if (op.getOperator() == "Rb_tree_ops")