svf-tools 1.0.427 → 1.0.430

package/lib/SABER/PathCondAllocator.cpp

@@ -177,12 +177,12 @@ void PathCondAllocator::setBranchCond(const BasicBlock *bb, const BasicBlock *su
 /*!
  * Evaluate null like expression for source-sink related bug detection in SABER
  */
-PathCondAllocator::Condition* PathCondAllocator::evaluateTestNullLikeExpr(const BranchInst* brInst, const BasicBlock *succ)
+PathCondAllocator::Condition* PathCondAllocator::evaluateTestNullLikeExpr(const BranchStmt* branchStmt, const BasicBlock *succ)
 {
 
-    const BasicBlock* succ1 = brInst->getSuccessor(0);
+    const BasicBlock* succ1 = branchStmt->getSuccessor(0)->getBB();
 
-    if(isTestNullExpr(brInst->getCondition()))
+    if(isTestNullExpr(branchStmt->getCondition()->getValue()))
     {
         // succ is then branch
         if(succ1 == succ)
@@ -191,7 +191,7 @@ PathCondAllocator::Condition* PathCondAllocator::evaluateTestNullLikeExpr(const
         else
             return getTrueCond();
     }
-    if(isTestNotNullExpr(brInst->getCondition()))
+    if(isTestNotNullExpr(branchStmt->getCondition()->getValue()))
     {
         // succ is then branch
         if(succ1 == succ)
@@ -207,10 +207,10 @@ PathCondAllocator::Condition* PathCondAllocator::evaluateTestNullLikeExpr(const
 /*!
  * Evaluate condition for program exit (e.g., exit(0))
  */
-PathCondAllocator::Condition* PathCondAllocator::evaluateProgExit(const BranchInst* brInst, const BasicBlock *succ)
+PathCondAllocator::Condition* PathCondAllocator::evaluateProgExit(const BranchStmt* branchStmt, const BasicBlock *succ)
 {
-    const BasicBlock* succ1 = brInst->getSuccessor(0);
-    const BasicBlock* succ2 = brInst->getSuccessor(1);
+    const BasicBlock *succ1 = branchStmt->getSuccessor(0)->getBB();
+    const BasicBlock* succ2 = branchStmt->getSuccessor(1)->getBB();
 
     bool branch1 = isBBCallsProgExit(succ1);
     bool branch2 = isBBCallsProgExit(succ2);
@@ -299,26 +299,31 @@ PathCondAllocator::Condition* PathCondAllocator::evaluateBranchCond(const BasicB
         return getTrueCond();
     }
 
-    if(const BranchInst* brInst = SVFUtil::dyn_cast<BranchInst>(bb->getTerminator()))
-    {
-        assert(brInst->getNumSuccessors() == 2 && "not a two successors branch??");
-        const BasicBlock* succ1 = brInst->getSuccessor(0);
-        const BasicBlock* succ2 = brInst->getSuccessor(1);
-        assert((succ1 == succ || succ2 == succ) && "not a successor??");
-
-        Condition* evalLoopExit = evaluateLoopExitBranch(bb,succ);
-        if(evalLoopExit)
-            return evalLoopExit;
-
-        Condition* evalProgExit = evaluateProgExit(brInst,succ);
-        if(evalProgExit)
-            return evalProgExit;
-
-        Condition* evalTestNullLike = evaluateTestNullLikeExpr(brInst,succ);
-        if(evalTestNullLike)
-            return evalTestNullLike;
-
+    if (ICFGNode *icfgNode = getICFG()->getICFGNode(bb->getTerminator())) {
+        for (const auto &svfStmt: icfgNode->getSVFStmts()) {
+            if (const BranchStmt *branchStmt = SVFUtil::dyn_cast<BranchStmt>(svfStmt)) {
+                if(branchStmt->getNumSuccessors() == 2) {
+                    const BasicBlock* succ1 = branchStmt->getSuccessor(0)->getBB();
+                    const BasicBlock* succ2 = branchStmt->getSuccessor(1)->getBB();
+                    assert((succ1 == succ || succ2 == succ) && "not a successor??");
+
+                    Condition* evalLoopExit = evaluateLoopExitBranch(bb,succ);
+                    if(evalLoopExit)
+                        return evalLoopExit;
+
+                    Condition* evalProgExit = evaluateProgExit(branchStmt,succ);
+                    if(evalProgExit)
+                        return evalProgExit;
+
+                    Condition* evalTestNullLike = evaluateTestNullLikeExpr(branchStmt,succ);
+                    if(evalTestNullLike)
+                        return evalTestNullLike;
+                    break;
+                }
+            }
+        }
     }
+
     return getBranchCond(bb, succ);
 }
 

package/lib/SABER/ProgSlice.cpp

@@ -197,10 +197,13 @@ void ProgSlice::annotatePaths()
     {
         Condition* atom = pathAllocator->getCond(*it);
         const Instruction* tinst = pathAllocator->getCondInst(atom);
-        if(const BranchInst* br = SVFUtil::dyn_cast<BranchInst>(tinst))
-        {
-            annotator.annotateFeasibleBranch(br,0);
-            annotator.annotateFeasibleBranch(br,1);
+        if (ICFGNode *icfgNode = pathAllocator->getICFG()->getICFGNode(tinst)) {
+            for (const auto &svfStmt: icfgNode->getSVFStmts()) {
+                if (const BranchStmt *branchStmt = SVFUtil::dyn_cast<BranchStmt>(svfStmt)) {
+                    annotator.annotateFeasibleBranch(branchStmt,0);
+                    annotator.annotateFeasibleBranch(branchStmt,1);
+                }
+            }
         }
     }
 }

package/lib/SABER/SaberAnnotator.cpp

@@ -75,7 +75,7 @@ void SaberAnnotator::annotateSinks()
 /*!
  * Annotate branch instruction and its corresponding feasible path
  */
-void SaberAnnotator::annotateFeasibleBranch(const BranchInst *brInst, u32_t succPos)
+void SaberAnnotator::annotateFeasibleBranch(const BranchStmt *branchStmt, u32_t succPos)
 {
 
     assert((succPos == 0 || succPos == 1) && "branch instruction should only have two successors");
@@ -83,14 +83,14 @@ void SaberAnnotator::annotateFeasibleBranch(const BranchInst *brInst, u32_t succ
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << SB_FESIBLE << _curSlice->getSource()->getId();
-    BranchInst* br = const_cast<BranchInst*>(brInst);
-    addMDTag(br,br->getCondition(),rawstr.str());
+    addMDTag(const_cast<Instruction *>(branchStmt->getInst()),
+             const_cast<Value *>(branchStmt->getCondition()->getValue()), rawstr.str());
 }
 
 /*!
  * Annotate branch instruction and its corresponding infeasible path
  */
-void SaberAnnotator::annotateInfeasibleBranch(const BranchInst *brInst, u32_t succPos)
+void SaberAnnotator::annotateInfeasibleBranch(const BranchStmt *branchStmt, u32_t succPos)
 {
 
     assert((succPos == 0 || succPos == 1) && "branch instruction should only have two successors");
@@ -98,17 +98,17 @@ void SaberAnnotator::annotateInfeasibleBranch(const BranchInst *brInst, u32_t su
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << SB_INFESIBLE << _curSlice->getSource()->getId();
-    BranchInst* br = const_cast<BranchInst*>(brInst);
-    addMDTag(br,br->getCondition(),rawstr.str());
+    addMDTag(const_cast<Instruction *>(branchStmt->getInst()),
+             const_cast<Value *>(branchStmt->getCondition()->getValue()), rawstr.str());
 }
 
 
 /*!
  * Annotate switch instruction and its corresponding feasible path
  */
-void SaberAnnotator::annotateSwitch(SwitchInst *switchInst, u32_t succPos)
+void SaberAnnotator::annotateSwitch(const BranchStmt *swithStmt, u32_t succPos)
 {
-    assert(succPos < switchInst->getNumSuccessors() && "successor position not correct!");
+    assert(succPos < swithStmt->getNumSuccessors() && "successor position not correct!");
 }
 
 

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -204,7 +204,7 @@ void SymbolTableBuilder::collectSym(const Value *val)
     DBOUT(DMemModel, outs() << "collect sym from ##" << SVFUtil::value2String(val) << " \n");
 
     // special sym here
-    if (symInfo->isNullPtrSym(val) || symInfo->isBlackholeSym(val))
+    if (symInfo->isNullPtrSym(val) || SVFUtil::isBlackholeSym(val))
         return;
 
     //TODO handle constant expression value here??

package/package.json

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