svf-tools 1.0.957 → 1.0.959

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.957",
+  "version": "1.0.959",
   "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-llvm/include/SVF-LLVM/LLVMUtil.h

@@ -366,54 +366,6 @@ std::string dumpType(const Type* type);
 
 std::string dumpValueAndDbgInfo(const Value* val);
 
-/**
- * See more: https://github.com/SVF-tools/SVF/pull/1191
- *
- * Given the code:
- *
- * switch (a) {
- *   case 0: printf("0\n"); break;
- *   case 1:
- *   case 2:
- *   case 3: printf("a >=1 && a <= 3\n"); break;
- *   case 4:
- *   case 6:
- *   case 7:  printf("a >= 4 && a <=7\n"); break;
- *   default: printf("a < 0 || a > 7"); break;
- * }
- *
- * Generate the IR:
- *
- * switch i32 %0, label %sw.default [
- *  i32 0, label %sw.bb
- *  i32 1, label %sw.bb1
- *  i32 2, label %sw.bb1
- *  i32 3, label %sw.bb1
- *  i32 4, label %sw.bb3
- *  i32 6, label %sw.bb3
- *  i32 7, label %sw.bb3
- * ]
- *
- * We can get every case basic block and related case value:
- * [
- *   {%sw.default, -1},
- *   {%sw.bb, 0},
- *   {%sw.bb1, 1},
- *   {%sw.bb1, 2},
- *   {%sw.bb1, 3},
- *   {%sw.bb3, 4},
- *   {%sw.bb3, 6},
- *   {%sw.bb3, 7},
- * ]
- * Note: default case value is nullptr
- */
-void getSuccBBandCondValPairVec(const SwitchInst &switchInst, SuccBBAndCondValPairVec &vec);
-
-/**
- * Note: default case value is nullptr
- */
-s64_t getCaseValue(const SwitchInst &switchInst, SuccBBAndCondValPair &succBB2CondVal);
-
 } // End namespace LLVMUtil
 
 } // End namespace SVF

package/svf-llvm/lib/ICFGBuilder.cpp

@@ -122,7 +122,7 @@ void ICFGBuilder::processFunBody(WorkList& worklist)
 
                 if (const BranchInst* br = SVFUtil::dyn_cast<BranchInst>(inst))
                 {
-                    assert(branchID <= 2 && "if/else has more than two branches?");
+                    assert(branchID <= 1 && "if/else has more than two branches?");
                     if(br->isConditional())
                         icfg->addConditionalIntraEdge(srcNode, dstNode, LLVMModuleSet::getLLVMModuleSet()->getSVFValue(br->getCondition()), 1 - branchID);
                     else

package/svf-llvm/lib/LLVMUtil.cpp

@@ -867,43 +867,6 @@ bool LLVMUtil::isConstantObjSym(const SVFValue* val)
 }
 
 
-void LLVMUtil::getSuccBBandCondValPairVec(const SwitchInst &switchInst, SuccBBAndCondValPairVec &vec)
-{
-    // get default successor basic block and default case value (nullptr)
-    vec.push_back({switchInst.getDefaultDest(), nullptr});
-
-    // get normal case value and it's successor basic block
-    for (const auto& cs : switchInst.cases())
-        vec.push_back({cs.getCaseSuccessor(), cs.getCaseValue()});
-}
-
-s64_t LLVMUtil::getCaseValue(const SwitchInst &switchInst, SuccBBAndCondValPair &succBB2CondVal)
-{
-    const BasicBlock* succBB = succBB2CondVal.first;
-    const ConstantInt* caseValue = succBB2CondVal.second;
-    s64_t val;
-    if (caseValue == nullptr || succBB == switchInst.getDefaultDest())
-    {
-        /// default case value is set to -1
-        val = -1;
-    }
-    else
-    {
-        /// get normal case value
-        if (caseValue->getBitWidth() <= 64)
-        {
-            val = caseValue->getSExtValue();
-        }
-        else
-        {
-            /// For larger number, we preserve case value just -1 now
-            /// see more: https://github.com/SVF-tools/SVF/pull/992
-            val = -1;
-        }
-    }
-    return val;
-}
-
 std::string LLVMUtil::dumpValue(const Value* val)
 {
     std::string str;

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -934,31 +934,82 @@ void SVFIRBuilder::visitBranchInst(BranchInst &inst)
     assert(inst.getNumSuccessors() <= 2 && "if/else has more than two branches?");
 
     BranchStmt::SuccAndCondPairVec successors;
-    for (u32_t i = 0; i < inst.getNumSuccessors(); ++i)
+    std::vector<const Instruction*> nextInsts;
+    LLVMUtil::getNextInsts(&inst, nextInsts);
+    u32_t branchID = 0;
+    for (const Instruction* succInst : nextInsts)
     {
-        const Instruction* succInst = &inst.getSuccessor(i)->front();
+        assert(branchID <= 1 && "if/else has more than two branches?");
         const SVFInstruction* svfSuccInst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(succInst);
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(svfSuccInst);
-        successors.push_back(std::make_pair(icfgNode, 1-i));
+        successors.push_back(std::make_pair(icfgNode, 1-branchID));
+        branchID++;
     }
-    addBranchStmt(brinst, cond,successors);
+    addBranchStmt(brinst, cond, successors);
 }
 
+
+/**
+ * See more: https://github.com/SVF-tools/SVF/pull/1191
+ *
+ * Given the code:
+ *
+ * switch (a) {
+ *   case 0: printf("0\n"); break;
+ *   case 1:
+ *   case 2:
+ *   case 3: printf("a >=1 && a <= 3\n"); break;
+ *   case 4:
+ *   case 6:
+ *   case 7:  printf("a >= 4 && a <=7\n"); break;
+ *   default: printf("a < 0 || a > 7"); break;
+ * }
+ *
+ * Generate the IR:
+ *
+ * switch i32 %0, label %sw.default [
+ *  i32 0, label %sw.bb
+ *  i32 1, label %sw.bb1
+ *  i32 2, label %sw.bb1
+ *  i32 3, label %sw.bb1
+ *  i32 4, label %sw.bb3
+ *  i32 6, label %sw.bb3
+ *  i32 7, label %sw.bb3
+ * ]
+ *
+ * We can get every case basic block and related case value:
+ * [
+ *   {%sw.default, -1},
+ *   {%sw.bb, 0},
+ *   {%sw.bb1, 1},
+ *   {%sw.bb1, 2},
+ *   {%sw.bb1, 3},
+ *   {%sw.bb3, 4},
+ *   {%sw.bb3, 6},
+ *   {%sw.bb3, 7},
+ * ]
+ * Note: default case value is nullptr
+ */
+/// For larger number, we preserve case value just -1 now
+/// see more: https://github.com/SVF-tools/SVF/pull/992
+
+/// The following implementation follows ICFGBuilder::processFunBody
 void SVFIRBuilder::visitSwitchInst(SwitchInst &inst)
 {
     NodeID brinst = getValueNode(&inst);
     NodeID cond = getValueNode(inst.getCondition());
 
     BranchStmt::SuccAndCondPairVec successors;
-
-    // get case successor basic block and related case value
-    SuccBBAndCondValPairVec succBB2CondValPairVec;
-    LLVMUtil::getSuccBBandCondValPairVec(inst, succBB2CondValPairVec);
-    for (auto &succBB2CaseValue : succBB2CondValPairVec)
+    std::vector<const Instruction*> nextInsts;
+    LLVMUtil::getNextInsts(&inst, nextInsts);
+    for (const Instruction* succInst : nextInsts)
     {
-        s64_t val = LLVMUtil::getCaseValue(inst, succBB2CaseValue);
-        const BasicBlock *succBB = succBB2CaseValue.first;
-        const Instruction* succInst = &succBB->front();
+        /// branch condition value
+        const ConstantInt* condVal = inst.findCaseDest(const_cast<BasicBlock*>(succInst->getParent()));
+        /// default case is set to -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));
@@ -966,6 +1017,7 @@ void SVFIRBuilder::visitSwitchInst(SwitchInst &inst)
     addBranchStmt(brinst, cond, successors);
 }
 
+
 ///   %ap = alloca %struct.va_list
 ///  %ap2 = bitcast %struct.va_list* %ap to i8*
 /// ; Read a single integer argument from %ap2