svf-tools 1.0.655 → 1.0.657

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.655",
+  "version": "1.0.657",
   "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/Graphs/ICFGEdge.h

@@ -139,13 +139,13 @@ public:
         return conditionVar;
     }
 
-    s32_t getSuccessorCondValue() const
+    s64_t getSuccessorCondValue() const
     {
         assert(getCondition() && "this is not a conditional branch edge");
         return branchCondVal;
     }
 
-    void setBranchCondition(const SVFValue* c, s32_t bVal)
+    void setBranchCondition(const SVFValue* c, s64_t bVal)
     {
         conditionVar = c;
         branchCondVal = bVal;
@@ -159,7 +159,7 @@ private:
     /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
     /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
     const SVFValue* conditionVar;
-    s32_t branchCondVal;
+    s64_t branchCondVal;
 };
 
 /*!

package/svf/include/SVFIR/SVFStatements.h

@@ -1048,7 +1048,7 @@ public:
     {
         return successors.at(i).first;
     }
-    s32_t getSuccessorCondValue (u32_t i) const
+    s64_t getSuccessorCondValue (u32_t i) const
     {
         return successors.at(i).second;
     }

package/svf/lib/AbstractExecution/SVFIR2ItvExeState.cpp

@@ -550,8 +550,15 @@ void SVFIR2ItvExeState::translateLoad(const LoadStmt *load)
     {
         VAddrs &addrs = getVAddrs(rhs);
         assert(!getVAddrs(rhs).empty());
-        _es[lhs] = IntervalValue::bottom();
-        getVAddrs(lhs).setBottom();
+        for (const auto &addr: addrs)
+        {
+            u32_t objId = getInternalID(addr);
+            if (inLocToIValTable(objId))
+                _es[lhs] = IntervalValue::bottom();
+            else if (inLocToAddrsTable(objId))
+                getVAddrs(lhs).setBottom();
+            break;
+        }
         for (const auto &addr: addrs)
         {
             u32_t objId = getInternalID(addr);

package/svf-llvm/lib/ICFGBuilder.cpp

@@ -134,7 +134,9 @@ void ICFGBuilder::processFunBody(WorkList& worklist)
                     /// branch condition value
                     const ConstantInt* condVal = const_cast<SwitchInst*>(si)->findCaseDest(const_cast<BasicBlock*>(succ->getParent()));
                     /// default case is set to -1;
-                    s32_t val = condVal ? condVal->getSExtValue() : -1;
+                    s64_t val = -1;
+                    if (condVal && condVal->getBitWidth() <= 64)
+                        val = condVal->getSExtValue();
                     icfg->addConditionalIntraEdge(srcNode, dstNode, LLVMModuleSet::getLLVMModuleSet()->getSVFValue(si->getCondition()),val);
                 }
                 else

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -937,7 +937,9 @@ void SVFIRBuilder::visitSwitchInst(SwitchInst &inst)
         const Instruction* succInst = &inst.getSuccessor(i)->front();
         const ConstantInt* condVal = inst.findCaseDest(inst.getSuccessor(i));
         /// default case is set to -1;
-        s32_t val = condVal ? condVal->getSExtValue() : -1;
+        s64_t val = -1;
+        if (condVal && condVal->getBitWidth() <= 64)
+            val = condVal->getSExtValue();
         const SVFInstruction* svfSuccInst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(succInst);
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(svfSuccInst);
         successors.push_back(std::make_pair(icfgNode,val));